ChangeLogTag:Wed Dec 5 12:37:56 2001 Carlos O'Ryan <coryan@uci.edu>

18 files changed, 0 insertions, 1706 deletions

diff --git a/ace/CORBA_Handler.cpp b/ace/CORBA_Handler.cpp
deleted file mode 100644
index 9c19a38d52b..00000000000
--- a/ace/CORBA_Handler.cpp
+++ /dev/null
@@ -1,593 +0,0 @@
-// CORBA_Handler.cpp
-// $Id$
-
-#include "ace/CORBA_Handler.h"
-
-#include "ace/Object_Manager.h"
-#include "ace/Thread_Manager.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ace/CORBA_Handler.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(ace, CORBA_Handler, "$Id$")
-
-#if defined (ACE_HAS_ORBIX) && (ACE_HAS_ORBIX != 0)
-ACE_ALLOC_HOOK_DEFINE(ACE_ST_CORBA_Handler)
-ACE_ALLOC_HOOK_DEFINE(ACE_CORBA_Handler)
-
-void
-ACE_CORBA_Handler::dump (void) const
-{
-  ACE_TRACE ("ACE_CORBA_Handler::dump");
-
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\nreference_count_ = %d"), this->reference_count_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-}
-
-ACE_CORBA_Handler::ACE_CORBA_Handler (const ACE_CORBA_Handler &rhs)
-{
-  ACE_TRACE ("ACE_CORBA_Handler::ACE_CORBA_Handler");
-}
-
-const ACE_CORBA_Handler &
-ACE_CORBA_Handler::operator= (const ACE_CORBA_Handler &rhs)
-{
-  ACE_TRACE ("ACE_CORBA_Handler::operator=");
-  return *this;
-}
-
-void
-ACE_ST_CORBA_Handler::dump (void) const
-{
-  ACE_TRACE ("ACE_ST_CORBA_Handler::dump");
-
-  ACE_CORBA_Handler::dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("instance_ = %x"), this->instance_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\niteration_ = %d"), this->iterations_));
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-}
-
-ACE_CORBA_Handler::~ACE_CORBA_Handler (void)
-{
-  ACE_TRACE ("ACE_CORBA_Handler::~ACE_CORBA_Handler");
-}
-
-ACE_CORBA_Handler::ACE_CORBA_Handler (void)
-  : reference_count_ (0)
-{
-  ACE_TRACE ("ACE_CORBA_Handler::ACE_CORBA_Handler");
-  reactor (ACE_Reactor::instance ());
-}
-
-// Only one ST CORBA Handler per-process...
-/* static */ 
-ACE_ST_CORBA_Handler *ACE_ST_CORBA_Handler::instance_ = 0;
-
-#if defined (ACE_TAKEOVER_ORBIX_CALLBACKS)
-// Define the class statics
-int             ACE_ST_CORBA_Handler::set_callbacks_ = 0;
-OrbixIOCallback ACE_ST_CORBA_Handler::previous_orbix_open_callback_ = 0;
-OrbixIOCallback ACE_ST_CORBA_Handler::previous_orbix_close_callback_ = 0;
-#endif /* ACE_TAKEOVER_ORBIX_CALLBACKS */
-
-
-// Insert a descriptor into the ACE_Reactor that Orbix has just added.
-
-/* static */ 
-void 
-ACE_ST_CORBA_Handler::insert_handle (ACE_HANDLE handle)
-{
-  ACE_TRACE ("ACE_ST_CORBA_Handler::insert_handle");
-//  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("+++ inserting %d\n"), handle));
-
-#if defined (ACE_TAKEOVER_ORBIX_CALLBACKS)
-  if (ACE_ST_CORBA_Handler::previous_orbix_open_callback_ != 0)
-    ACE_ST_CORBA_Handler::previous_orbix_open_callback_ (handle);
-#endif /* ACE_TAKEOVER_ORBIX_CALLBACKS */
-
-  if (ACE_ST_CORBA_Handler::instance_ == 0)
-    return;
-
-  if (ACE_ST_CORBA_Handler::instance_->reactor() != 0)
-    ACE_ST_CORBA_Handler::instance_->reactor()->register_handler 
-      (handle, ACE_ST_CORBA_Handler::instance_, ACE_Event_Handler::READ_MASK);
-  else
-    ;
-//    ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("insert_handle: reactor NULL\n")));
-}
-
-// Remove a descriptor from the ACE_Reactor that Orbix has just deleted.
-
-/* static */ 
-void 
-ACE_ST_CORBA_Handler::remove_handle (ACE_HANDLE handle)
-{
-  ACE_TRACE ("ACE_ST_CORBA_Handler::remove_handle");
-//  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("--- removing %d\n"), handle));
-
-#if defined (ACE_TAKEOVER_ORBIX_CALLBACKS)
-  if (ACE_ST_CORBA_Handler::previous_orbix_close_callback_ != 0)
-    ACE_ST_CORBA_Handler::previous_orbix_close_callback_ (handle);
-#endif /* ACE_TAKEOVER_ORBIX_CALLBACKS */
-
-  if (ACE_ST_CORBA_Handler::instance_ == 0)
-    return;
-
-  if (ACE_ST_CORBA_Handler::instance_->reactor () != 0)
-    ACE_ST_CORBA_Handler::instance_->reactor ()->remove_handler
-      (handle, ACE_Event_Handler::READ_MASK | ACE_Event_Handler::DONT_CALL);
-  else
-    ;
-//    ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("remove_handle: reactor NULL\n")));
-}
-
-/* static */
-void ACE_ST_CORBA_Handler::instance_cleaner (void *object, void *param)
-{
-  ACE_UNUSED_ARG (param);
-  delete ACE_reinterpret_cast (ACE_ST_CORBA_Handler *, object);
-  return;
-}
-
-
-// Process the next Orbix event.
-
-int
-ACE_ST_CORBA_Handler::handle_input (ACE_HANDLE handle)
-{
-  ACE_TRACE ("ACE_ST_CORBA_Handler::handle_input");
-  //  ACE_DEBUG ((LM_DEBUG, "dispatching Orbix handle = %d in process
-  //  = %P\n", handle));
-
-  TRY {
-    // Loop up to <ACE_ST_CORBA_Handler::iterations_> dispatching the
-    // next event.  Note the trade off between efficiency and
-    // fairness...
-    
-    for (size_t i = 0; i < this->iterations_; i++)
-      if (ACE_CORBA_1 (Orbix.isEventPending) (IT_X))
-        // Process the next Orbix event (don't block).
-        ACE_CORBA_1 (Orbix.processNextEvent) (0, IT_X);
-      else
-        break;
-  } 
-  CATCHANY {
-    // an error occured calling processNextEvent () - output the
-    // error.
-    cerr << IT_X << endl;
-  } ENDTRY;
-  return 0;
-}
-
-int
-ACE_ST_CORBA_Handler::suspend (void)
-{
-  // Create an iterator.
-  ACE_Handle_Set set (ACE_CORBA_1 (Orbix.getFileDescriptors) ());
-  ACE_Handle_Set_Iterator orbix_descriptors (set);
-
-  // Suspend all the HANDLEs registered by Orbix. 
-  for (ACE_HANDLE h; 
-       (h = orbix_descriptors ()) != ACE_INVALID_HANDLE; 
-       ++orbix_descriptors)
-    this->reactor ()->suspend_handler (h);
-
-  return 0;
-}
-
-int
-ACE_ST_CORBA_Handler::resume (void)
-{
-  // Create an iterator.
-  ACE_Handle_Set set (ACE_CORBA_1 (Orbix.getFileDescriptors) ());
-  ACE_Handle_Set_Iterator orbix_descriptors (set);
-
-  // Resume all the HANDLEs registered by Orbix. 
-  for (ACE_HANDLE h; 
-       (h = orbix_descriptors ()) != ACE_INVALID_HANDLE; 
-       ++orbix_descriptors)
-    this->reactor ()->resume_handler (h);
-
-  return 0;
-}
-
-// Dummy constructor.
-ACE_ST_CORBA_Handler::ACE_ST_CORBA_Handler (void)
-{
-  ACE_TRACE ("ACE_ST_CORBA_Handler::ACE_ST_CORBA_Handler");
-
-  // This is set by default for backward compatibility. The user can
-  // use the set/get operations to change the iterations
-  this->iterations_ = 5;
-
-  // Set up the callbacks so that we get informed when Orbix changes
-  // its descriptors.
-  OrbixIOCallback old_open, old_close;
-
-  old_open = ACE_CORBA_1 (Orbix.registerIOCallback) ((OrbixIOCallback) &ACE_ST_CORBA_Handler::insert_handle, 
-                                                     FD_OPEN_CALLBACK);
-  old_close = ACE_CORBA_1 (Orbix.registerIOCallback) ((OrbixIOCallback) &ACE_ST_CORBA_Handler::remove_handle, 
-                                                      FD_CLOSE_CALLBACK);
-#if defined (ACE_TAKEOVER_ORBIX_CALLBACKS)
-  if (ACE_ST_CORBA_Handler::set_callbacks_ == 0)
-    {
-      ACE_ST_CORBA_Handler::previous_orbix_open_callback = old_open;
-      ACE_ST_CORBA_Handler::previous_orbix_close_callback = old_close;
-      ACE_ST_CORBA_Handler::set_callbacks_ = 1;
-    }
-#endif
-}      
-
-void
-ACE_ST_CORBA_Handler::get_orbix_descriptors (void)
-{
-  // Create an iterator.
-  ACE_Handle_Set set (ACE_CORBA_1 (Orbix.getFileDescriptors) ());
-  ACE_Handle_Set_Iterator orbix_descriptors (set);
-  
-  // Preinitialize anything that's already registered.
-  for (ACE_HANDLE h; 
-       (h = orbix_descriptors ()) != ACE_INVALID_HANDLE; 
-       ++orbix_descriptors)
-    ACE_ST_CORBA_Handler::insert_handle (h);
-}
-
-// Register <service_name> by doing a "putit" to register the
-// <service_name> using the <marker_name> at <service_location> with
-// orbixd.
-
-/* static */
-int
-ACE_CORBA_Handler::register_service (const char *service_name,
-                                     const char *marker_name,
-                                     const char *service_location)
-{
-  ACE_TRACE ("ACE_CORBA_Handler::register_service");
-  char buf[BUFSIZ * 2]; // I hope this is enough space...
-
-  // Be defensive here...
-  if (service_name == 0 || service_location == 0)
-    {
-      errno = EINVAL;
-      return -1;
-    }
-  else if (marker_name == 0)
-    ACE_OS::sprintf (buf, "putit %s %s", service_name, service_location);
-  else
-    ACE_OS::sprintf (buf, "putit -marker %s %s %s", 
-               marker_name, service_name, service_location);
-
-  return ACE_OS::system (buf); // Use system(3S) to execute Orbix putit.
-}
-
-// Register <service_name> by doing a "putit" to register
-// <service_name> using the <marker_name> with orbixd.
-
-/* static */
-int 
-ACE_CORBA_Handler::remove_service (const char *service_name,
-                                   const char *marker_name)
-{
-  ACE_TRACE ("ACE_CORBA_Handler::remove_service");
-  char buf[BUFSIZ * 2]; // I hope this is enough space!
-  if (service_name == 0)
-    {
-      errno = EINVAL;
-      return -1;
-    }
-  else if (marker_name == 0)
-    ACE_OS::sprintf (buf, "rmit %s\n", service_name);
-  else
-    ACE_OS::sprintf (buf, "rmit -marker %s %s\n", marker_name, service_name);
-  return ACE_OS::system (buf); // Use system(3S) to execute Orbix rmit.
-}
-
-ACE_ST_CORBA_Handler::~ACE_ST_CORBA_Handler (void)
-{
-  ACE_TRACE ("ACE_ST_CORBA_Handler::~ACE_ST_CORBA_Handler");
-  // Create an iterator.
-  ACE_Handle_Set set (ACE_CORBA_1 (Orbix.getFileDescriptors) ());
-  ACE_Handle_Set_Iterator orbix_descriptors (set);
-      
-  // Remove everything!
-
-  for (ACE_HANDLE h; 
-       (h = orbix_descriptors ()) != ACE_INVALID_HANDLE; 
-       ++orbix_descriptors)
-    ACE_ST_CORBA_Handler::remove_handle (h);
-
-  // Keep Orbix from calling us back and crashing the system!
-  ACE_CORBA_1 (Orbix.registerIOCallback) (0, FD_OPEN_CALLBACK);
-  ACE_CORBA_1 (Orbix.registerIOCallback) (0, FD_CLOSE_CALLBACK);
-  ACE_ST_CORBA_Handler::instance_ = 0;
-}
-
-// Decrement the reference count and free up all the resources if this
-// is the last service to be using the ACE_ST_CORBA_Handler...
-
-/* static */
-int 
-ACE_CORBA_Handler::deactivate_service (const char *service_name,
-                                       const char *marker_name)
-{
-  ACE_TRACE ("ACE_CORBA_Handler::deactivate_service");
-  if (service_name != 0
-      && this->remove_service (service_name, marker_name) == -1)
-    return -1;
-
-  int ref_count = this->reference_count_;
-
-  this->reference_count_--;
-
-  // Close everything down if the count drops to 0.
-  if (this->reference_count_ == 0)
-    // Commit suicide!
-    delete this;
-
-  if (ref_count < 0)
-    ;
-//    ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("warning, reference count == %d\n"),
-//               ref_count));
-  return 0;
-}
-
-/* static */ 
-ACE_CORBA_Handler *
-ACE_ST_CORBA_Handler::instance (void)
-{
-  ACE_TRACE ("ACE_ST_CORBA_Handler::instance");
-
-  // Note that this does not need a double-check since it should be
-  // called from a single-threaded environment.
-
-  if (ACE_ST_CORBA_Handler::instance_ == 0)
-    {
-      ACE_NEW_RETURN (ACE_ST_CORBA_Handler::instance_,
-                      ACE_ST_CORBA_Handler,
-                      0);
-      // Set up so that instance_cleaner() is called to destroy the instance
-      // at program shutdown when the static objects are destroyed.
-      // This should be _before_ the singleton reactor is destroyed since
-      // cleanup objects are destroyed in LIFO order, and if the reactor
-      // is not yet created, it will be by ACE_CORBA_Handler's constructor,
-      // executed during ACE_NEW_RETURN, above.
-      ACE_Object_Manager::at_exit (ACE_ST_CORBA_Handler::instance_,
-                                   &ACE_ST_CORBA_Handler::instance_cleaner,
-                                   0);
-
-      ACE_ST_CORBA_Handler::instance_->get_orbix_descriptors ();
-    }
-
-  return ACE_ST_CORBA_Handler::instance_;
-}
-
-// Activate and register <service_name> with the Orbix daemon.  If
-// <marker_name> and <service_location> are != 0 then do a "putit" to
-// register this service with orbixd.  This method also increments the
-// reference count of active services using the ACE_ST_CORBA_Handler.
-
-int
-ACE_CORBA_Handler::activate_service (const char *service_name, 
-                                     const char *marker_name, 
-                                     const char *service_location)
-{
-  ACE_TRACE ("ACE_CORBA_Handler::activate_service");
-  // Since the ACE_CORBA_Handler is a singleton, make sure not to
-  // allocate and initialize more than one copy.  By incrementing the
-  // reference count we ensure this.
-
-  this->reference_count_++;
-
-  if (service_name != 0 && service_location != 0
-      && this->register_service (service_name, marker_name, 
-                                 service_location) == -1)
-    return -1;
-
-  // Tell Orbix that we have completed the server's initialization.
-  // Note that we don't block by giving a timeout of 0...
-
-  TRY {
-    ACE_CORBA_1 (Orbix.impl_is_ready) ((char *) service_name, 0, IT_X);
-  } CATCHANY {
-    return -1;
-  } ENDTRY
-
-  return 0;
-}
-
-#if defined (ACE_HAS_MT_ORBIX) && (ACE_HAS_MT_ORBIX != 0)
-
-ACE_ALLOC_HOOK_DEFINE(ACE_MT_CORBA_Handler)
-
-void
-ACE_MT_CORBA_Handler::dump (void) const
-{
-  ACE_TRACE ("ACE_MT_CORBA_Handler::dump");
-  ACE_CORBA_Handler::dump ();
-  ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
-  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("instance_ = %x"), this->instance_));
-  ACE_DEBUG ((LM_DEBUG,  ACE_LIB_TEXT ("\nthr_mgr_ = %x"), this->thr_mgr_));
-  this->pipe_.dump ();
-  ACE_MT (ACE_Thread_Mutex *lock =
-    ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object
-      (ACE_Object_Manager::ACE_MT_CORBA_HANDLER_LOCK);
-    if (lock != 0) lock->dump ());
-
-  ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
-}
-
-// Only one MT CORBA Handler per-process...
-/* static */ 
-ACE_MT_CORBA_Handler *ACE_MT_CORBA_Handler::instance_ = 0;
-
-/* static */
-ACE_CORBA_Handler *
-ACE_MT_CORBA_Handler::instance (void)
-{
-  ACE_TRACE ("ACE_MT_CORBA_Handler::instance");
-
-  if (ACE_MT_CORBA_Handler::instance_ == 0)
-    {
-      ACE_MT (ACE_Thread_Mutex *lock =
-        ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object
-          (ACE_Object_Manager::ACE_MT_CORBA_HANDLER_LOCK);
-        ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, 0));
-
-      if (ACE_MT_CORBA_Handler::instance_ == 0)
-        ACE_NEW_RETURN (ACE_MT_CORBA_Handler::instance_,
-                        ACE_MT_CORBA_Handler, 0);
-    }
-
-  return ACE_MT_CORBA_Handler::instance_;
-}
-
-int
-ACE_MT_CORBA_Handler::suspend (void)
-{
-  // Suspend the event handler listening for new CORBA requests to
-  // dispatch.
-  this->reactor ()->suspend_handler (this->pipe_.read_handle ());
-
-  // Suspend the daemon thread.
-  this->thr_mgr ()->suspend_all ();
-  return 0;
-}
-
-int
-ACE_MT_CORBA_Handler::resume (void)
-{
-  // Resume the event handler listening for new CORBA requests to
-  // dispatch.
-  this->reactor ()->resume_handler (this->pipe_.read_handle ());
-
-  // Resume the daemon thread.
-  this->thr_mgr ()->resume_all ();
-  return 0;
-}
-
-ACE_MT_CORBA_Handler::ACE_MT_CORBA_Handler (void)
-{
-  ACE_TRACE ("ACE_MT_CORBA_Handler::ACE_MT_CORBA_Handler");
-  this->thr_mgr (ACE_Thread_Manager::instance ());
-
-  int result = 0;
-
-  if (this->pipe_.open () == -1)
-    result = -1;
-  // Register one end of the pipe with the reactor with a READ mask.
-  else if (this->reactor ()->register_handler
-      (this->pipe_.read_handle (), this, ACE_Event_Handler::READ_MASK) == -1) 
-    result = -1;
-  // Create a new thread that processes events for the Orbix event
-  // queue.
-  else if (this->thr_mgr ()->spawn (ACE_THR_FUNC (ACE_MT_CORBA_Handler::process_events),
-                                    0, THR_DETACHED | THR_NEW_LWP) == -1)
-    result = -1;
-  
-  if (result == -1)
-    {
-      delete ACE_MT_CORBA_Handler::instance_;
-      ACE_MT_CORBA_Handler::instance_ = 0;
-    }
-}
-
-void *
-ACE_MT_CORBA_Handler::process_events (void *)
-{
-  ACE_TRACE ("ACE_MT_CORBA_Handler::process_events");
-
-  // Special knowlege, we "know" that we are dealing with a singleton
-  // and that we are invoked in a context where the mutex controlling
-  // instance creation is held, so by the time we get the mutex
-  // the instance must exist.
-  if (ACE_MT_CORBA_Handler::instance_ == 0)
-    {
-      ACE_MT (ACE_Thread_Mutex *lock =
-        ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object
-          (ACE_Object_Manager::ACE_MT_CORBA_HANDLER_LOCK);
-        ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, *lock, 0));
-
-      ACE_ASSERT (ACE_MT_CORBA_Handler::instance_ != 0);
-    }
-
-  ACE_Thread_Control t (ACE_MT_CORBA_Handler::instance_->thr_mgr ());
-  
-  // This thread only processes events.
-  TRY {
-    // it is OK to block
-    ACE_CORBA_1 (Orbix.processEvents) (ACE_CORBA_1 (Orbix.INFINITE_TIMEOUT), IT_X);
-  } CATCHANY {
-    // An error occured calling processEvents () - output the error.
-    cerr << IT_X << endl;
-  } ENDTRY;
-
-  // Thread dies if we reach here : error occured in processEvents.
-  return 0;
-}
-
-int
-ACE_MT_CORBA_Handler::inRequestPreMarshal (ACE_CORBA_1 (Request) &req,
-                                           ACE_CORBA_1 (Environment) &IT_env)
-{
-  ACE_TRACE ("ACE_MT_CORBA_Handler::inRequestPreMarshal");
-
-  // Pump the request through the pipe.
-  u_long request_addr = (u_long) &req;
-
-  ssize_t result = ACE::send (this->pipe_.write_handle (),
-                              (const char *) &request_addr, 
-                              sizeof request_addr);
-
-  if (result != sizeof request_addr)
-    {
-      // Don't continue with request
-      return 0;
-    }
-
-  // Everything is fine: we have delegated the work to a different
-  // thread Tell Orbix we will dispatch the request later...
-  return -1;
-}
-
-int
-ACE_MT_CORBA_Handler::handle_input (ACE_HANDLE)
-{
-  ACE_TRACE ("ACE_MT_CORBA_Handler::handle_input");
-  ACE_CORBA_1 (Request) *req = 0;
-
-  u_long request_addr;
-
-  //  Read the request from the pipe.
-  ssize_t result = ACE::recv (this->pipe_.read_handle (),
-                              (char *) &request_addr, 
-                              sizeof request_addr);
-
-  if (result != sizeof request_addr)
-    // We are in trouble: bail out.
-    return -1;
-
-  req = (ACE_CORBA_1 (Request) *) request_addr;
-
-  // Tell Orbix to dispatch the request.
-  ACE_CORBA_1 (Orbix.continueThreadDispatch) (*req);
-  return 0;
-}
-
-ACE_MT_CORBA_Handler::~ACE_MT_CORBA_Handler (void)
-{
-  ACE_TRACE ("ACE_MT_CORBA_Handler::~ACE_MT_CORBA_Handler");
-
-  // Unregister one end of the pipe with the reactor 
-  this->reactor ()->remove_handler 
-    (this->pipe_.read_handle (),
-     ACE_Event_Handler::READ_MASK | ACE_Event_Handler::DONT_CALL);
-
-  this->pipe_.close ();
-
-  ACE_MT_CORBA_Handler::instance_ = 0;
-}
-#endif /* ACE_HAS_MT_ORBIX */
-#endif /* ACE_HAS_ORBIX */
diff --git a/ace/CORBA_Handler.h b/ace/CORBA_Handler.h
deleted file mode 100644
index 658567f5ddf..00000000000
--- a/ace/CORBA_Handler.h
+++ /dev/null
@@ -1,263 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    CORBA_Handler.h
- *
- *  $Id$
- *
- *  @author Douglas C. Schmidt (schmidt@cs.wustl.edu)
- *  @author Irfan Pyarali (irfan@cs.wustl.edu)
- */
-//=============================================================================
-
-
-#ifndef ACE_CORBA_HANDLER_H
-#define ACE_CORBA_HANDLER_H
-#include "ace/pre.h"
-
-#include "ace/Service_Config.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Pipe.h"
-
-#if (defined (ACE_HAS_ORBIX) && (ACE_HAS_ORBIX != 0)) || (defined (ACE_HAS_MT_ORBIX) && (ACE_HAS_MT_ORBIX != 0))
-#define EXCEPTIONS
-#define WANT_ORBIX_FDS
-#include /**/ <CORBA.h>
-// #include /**/ <daemon.hh>
-#undef EXCEPTIONS
-#undef WANT_ORBIX_FDS
-
-/**
- * @class ACE_CORBA_Handler
- *
- * @brief Handle Orbix requests in conjunction with ACE.
- *
- * Note, do *NOT* inherit from this class!  Instead, use the
- * <ACE_MT_CORBA_HAndler> and <ACE_ST_CORBA_Handler> as
- * Singletons.
- */
-class ACE_Export ACE_CORBA_Handler : public ACE_Service_Object
-{
-public:
-  // = Activation and deactivation methods.
-
-  /**
-   * Activate and register <service_name> with the Orbix daemon.  If
-   * <marker_name> and <service_location> are != 0 then do a "putit"
-   * to register this service with orbixd.  This method also
-   * increments the reference count of active services using the
-   * ACE_ST_CORBA_Handler.
-   */
-  virtual int activate_service (const char *service_name,
-                                const char *marker_name = 0,
-                                const char *service_location = 0);
-
-  /**
-   * Decrement the reference count and free up all the
-   * resources if this is the last service to be using
-   * the ACE_ST_CORBA_Handler...
-   */
-  virtual int deactivate_service (const char *service_name = 0,
-                                  const char *marker_name = 0);
-
-  /// Dump the state of an object.
-  void dump (void) const;
-
-  /// Declare the dynamic allocation hooks.
-  ACE_ALLOC_HOOK_DECLARE;
-
-protected:
-  /// Make this into an "abstract" class...
-  ACE_CORBA_Handler (void);
-
-  /// Note virtual destructor...
-  virtual ~ACE_CORBA_Handler (void);
-
-  /**
-   * Register <service_name> by doing a "putit" to register the
-   * <service_name> using the <marker_name> at <service_location> with
-   * orbixd.
-   */
-  virtual int register_service (const char *service_name,
-                                const char *marker_name,
-                                const char *service_location);
-
-  /// Register <service_name> by doing a "putit" to register
-  /// <service_name> using the <marker_name> with orbixd.
-  virtual int remove_service (const char *service_name,
-                              const char *marker_name = 0);
-
-  /// Keep track of the number of active CORBA_Handlers.
-  ssize_t reference_count_;
-
-private:
-  // = Disallow assignment and initialization.
-  ACE_CORBA_Handler (const ACE_CORBA_Handler &rhs);
-  const ACE_CORBA_Handler &operator= (const ACE_CORBA_Handler &rhs);
-};
-
-/**
- * @class ACE_ST_CORBA_Handler
- *
- * @brief Handle single-threaded Orbix requests in conjunction with the
- * <ACE_Reactor>.
- *
- * You should NOT use this class unless you've got a VERY old
- * version of Orbix that only supports single-threading.  If
- * you're using a more recent version of Orbix use the
- * <ACE_MT_CORBA_Handler>.
- */
-class ACE_Export ACE_ST_CORBA_Handler : public ACE_CORBA_Handler
-{
-public:
-  // = Singleton access point.
-  /// Returns a Singleton.
-  static ACE_CORBA_Handler *instance (void);
-
-  // = Demuxing hook.
-  /// Process the next Orbix event.
-  virtual int handle_input (ACE_HANDLE);
-
-  // = Dynamic linking hooks.
-  /// Atomically suspend all the threads associated with the <thr_mgr>.
-  virtual int suspend (void);
-
-  /// Atomically resume all the threads associated with the <thr_mgr>.
-  virtual int resume (void);
-
-  // = Iterations dictate # of <processNextEvent> calls per-callback.
-  /// Get the current iteration.
-  size_t iterations (void);
-
-  /// Set the current iteration.
-  void iterations (size_t);
-
-  /// Dump the state of an object.
-  void dump (void) const;
-
-  /// Declare the dynamic allocation hooks.
-  ACE_ALLOC_HOOK_DECLARE;
-
-protected:
-  /// Preinitialize any descriptors that Orbix is using.  This is
-  /// called in <instance>.
-  void get_orbix_descriptors (void);
-
-  /// Constructors (ensure Singleton...).
-  ACE_ST_CORBA_Handler (void);
-
-  /// Destructor cleans up resources.
-  virtual ~ACE_ST_CORBA_Handler (void);
-
-  /// Insert a descriptor into the ACE_Reactor that Orbix has just added.
-  static void insert_handle (ACE_HANDLE);
-
-  /// Remove a descriptor from the ACE_Reactor that Orbix has just deleted.
-  static void remove_handle (ACE_HANDLE);
-
-  /// Clean up the singleton at program rundown.
-  static void instance_cleaner (void *object, void *param);
-
-  /// ACE_ST_CORBA_Handler is a singleton object.
-  static ACE_ST_CORBA_Handler *instance_;
-
-  /// Number of iterations to process per <processNextEvent> call.
-  size_t iterations_;
-
-  // If the user has complete control of all Orbix callback processing and
-  // really, really knows how to handle all of the involved interworkings,
-  // they can set up to daisy-chain Orbix callbacks from this class to
-  // other handlers established outside the control of this class. This is
-  // an intrinsically dangerous thing to do, and is most often the wrong
-  // thing to do. But if you must, set ACE_TAKEOVER_ORBIX_CALLBACKS in the
-  // config.h file before including the platform's config file.
-# if defined (ACE_TAKEOVER_ORBIX_CALLBACKS)
-  static int set_callbacks_;
-  static OrbixIOCallback previous_orbix_open_callback_;
-  static OrbixIOCallback previous_orbix_close_callback_;
-# endif /* ACE_TAKEOVER_ORBIX_CALLBACKS */
-};
-
-#if defined (ACE_HAS_MT_ORBIX) && (ACE_HAS_MT_ORBIX != 0)
-
-/**
- * @class ACE_MT_CORBA_Handler
- *
- * @brief Handle multi-threaded Orbix requests in conjunction with the
- * <ACE_Reactor>.
- *
- * If you are using MT-Orbix (which has been the default Orbix
- * for years) you should use this class rather than
- * <ACE_ST_CORBA_Handler>.  See
- * www.cs.wustl.edu/~schmidt/COOTS-96.ps.gz
- * for an explanation of what this class does for Orbix.
- */
-class ACE_Export ACE_MT_CORBA_Handler : public ACE_CORBA_Handler, public ACE_CORBA_1 (ThreadFilter)
-{
-public:
-  // = Singleton access point.
-  /// Returns a Singleton.
-  static ACE_CORBA_Handler *instance (void);
-
-  // = Demuxing hook.
-  /// Process the next Orbix event.
-  virtual int handle_input (ACE_HANDLE);
-
-  // = Threading hook.
-  /// Set the Thread_Manager used by ACE_MT_CORBA_Handler
-  void thr_mgr (ACE_Thread_Manager *tm);
-
-  /// Get the Thread_Manager used by ACE_MT_CORBA_Handler
-  ACE_Thread_Manager *thr_mgr (void) const;
-
-  // = Dynamic linking hooks.
-  /// Atomically suspend all the threads associated with the <thr_mgr>.
-  virtual int suspend (void);
-
-  /// Atomically resume all the threads associated with the <thr_mgr>.
-  virtual int resume (void);
-
-  /// Dump the state of an object.
-  void dump (void) const;
-
-  /// Declare the dynamic allocation hooks.
-  ACE_ALLOC_HOOK_DECLARE;
-
-protected:
-  /// function executed by new thread
-  static void *process_events (void *);
-
-  /// Constructors (ensure Singleton...).
-  ACE_MT_CORBA_Handler (void);
-
-  /// Destructor cleans up resources.
-  virtual ~ACE_MT_CORBA_Handler (void);
-
-  /// Take the incoming request and pass it to <handle_input> through
-  /// the Reactor.
-  virtual int inRequestPreMarshal (ACE_CORBA_1 (Request) &r,
-                                   ACE_CORBA_1 (Environment) &IT_env = ACE_CORBA_1 (default_environment));
-
-  /// ACE_MT_CORBA_Handler is a singleton object.
-  static ACE_MT_CORBA_Handler *instance_;
-
-  /// Event demultiplexor used by ACE_ST_CORBA_Handler.
-  ACE_Thread_Manager *thr_mgr_;
-
-  /// Used to send CORBA::Requests through the server
-  ACE_Pipe pipe_;
-};
-#endif /* ACE_HAS_MT_ORBIX */
-
-#if defined (__ACE_INLINE__)
-#include "ace/CORBA_Handler.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* ACE_HAS_ORBIX */
-#include "ace/post.h"
-#endif /* ACE_CORBA_HANDLER_H */
diff --git a/ace/CORBA_Handler.i b/ace/CORBA_Handler.i
deleted file mode 100644
index a1f3bfbd774..00000000000
--- a/ace/CORBA_Handler.i
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// CORBA_Handler.i
-
-#if defined (ACE_HAS_ORBIX) && (ACE_HAS_ORBIX != 0)
-// = Set/get the number of iterations per processNextEvent() call.
-
-/* static */ 
-ACE_INLINE size_t 
-ACE_ST_CORBA_Handler::iterations (void)
-{
-  ACE_TRACE ("ACE_ST_CORBA_Handler::iterations");
-  return this->iterations_;
-}
-
-/* static */ 
-ACE_INLINE void
-ACE_ST_CORBA_Handler::iterations (size_t i)
-{
-  ACE_TRACE ("ACE_ST_CORBA_Handler::iterations");
-  this->iterations_ = i;
-}
-
-#if defined (ACE_HAS_MT_ORBIX) && (ACE_HAS_MT_ORBIX != 0)
-ACE_INLINE void
-ACE_MT_CORBA_Handler::thr_mgr (ACE_Thread_Manager *tm) 
-{
-  ACE_TRACE ("ACE_MT_CORBA_Handler::thr_mgr");
-  this->thr_mgr_ = tm;
-}
-
-ACE_INLINE ACE_Thread_Manager *
-ACE_MT_CORBA_Handler::thr_mgr (void) const
-{
-  ACE_TRACE ("ACE_MT_CORBA_Handler::thr_mgr");
-  return this->thr_mgr_;
-}
-#endif /* ACE_HAS_MT_ORBIX */
-#endif /* ACE_HAS_ORBIX */
diff --git a/ace/CORBA_Ref.cpp b/ace/CORBA_Ref.cpp
deleted file mode 100644
index cc3b23e0f06..00000000000
--- a/ace/CORBA_Ref.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// CORBA_Ref.cpp
-// $Id$
-
-#if !defined (ACE_CORBA_REF_C)
-#define ACE_CORBA_REF_C
-
-#include "ace/CORBA_Ref.h"
-#include "ace/Log_Msg.h"
-
-ACE_RCSID(ace, CORBA_Ref, "$Id$")
-
-template<class CORBA_REF>
-ACE_CORBA_Ref<CORBA_REF>::ACE_CORBA_Ref (void)
-  : ref_ (0)
-{
-  ACE_TRACE ("ACE_CORBA_Ref<CORBA_REF>::ACE_CORBA_Ref");
-}
-
-template<class CORBA_REF>
-ACE_CORBA_Ref<CORBA_REF>::ACE_CORBA_Ref (CORBA_REF *ref)
-{
-  ACE_TRACE ("ACE_CORBA_Ref<CORBA_REF>::ACE_CORBA_Ref");
-  if (ref != 0)
-    ref_ = ref->_duplicate ();
-  else
-    ref_ = 0;
-}
-
-template<class CORBA_REF> CORBA_REF *
-ACE_CORBA_Ref<CORBA_REF>::operator= (CORBA_REF *ref)
-{
-  ACE_TRACE ("ACE_CORBA_Ref<CORBA_REF>::operator=");
-  if (ref_ != 0)
-    ref_->_release ();
-  if (ref == 0)
-    {
-      ref_ = 0;
-      return 0;
-    }
-  else
-    return ref_ = ref->_duplicate ();
-}
-
-template<class CORBA_REF>
-ACE_CORBA_Ref<CORBA_REF>::operator CORBA_REF * (void) const
-{
-  ACE_TRACE ("ACE_CORBA_Ref<CORBA_REF>::operator CORBA_REF *");
-  ACE_ASSERT (ref_ != 0);
-  return ref_; 
-}
-
-template<class CORBA_REF> CORBA_REF *
-ACE_CORBA_Ref<CORBA_REF>::operator-> (void) const
-{
-  ACE_TRACE ("ACE_CORBA_Ref<CORBA_REF>::operator->");
-  ACE_ASSERT (ref_ != 0);
-  return ref_;
-}
-
-template<class CORBA_REF> int
-ACE_CORBA_Ref<CORBA_REF>::operator== (CORBA_REF *rhs) const
-{
-  ACE_TRACE ("ACE_CORBA_Ref<CORBA_REF>::operator==");
-  // pointer comparison.
-  return ref_ == rhs;
-}
-
-template<class CORBA_REF> int
-ACE_CORBA_Ref<CORBA_REF>::operator!= (CORBA_REF *rhs) const
-{
-  ACE_TRACE ("ACE_CORBA_Ref<CORBA_REF>::operator!=");
-  // pointer comparison.
-  return ref_ != rhs;
-}
-
-template<class CORBA_REF>
-ACE_CORBA_Ref<CORBA_REF>::~ACE_CORBA_Ref ()
-{
-  ACE_TRACE ("ACE_CORBA_Ref<CORBA_REF>::~ACE_CORBA_Ref");
-  if (ref_ != 0)
-    ref_->_release ();
-}
-
-#endif /* ACE_CORBA_REF_C */
diff --git a/ace/CORBA_Ref.h b/ace/CORBA_Ref.h
deleted file mode 100644
index 9010c8c82fd..00000000000
--- a/ace/CORBA_Ref.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    CORBA_Ref.h
- *
- *  $Id$
- *
- *  @author Irfan Pyarali (irfan@wuerl.wustl.edu)
- *  @author Tim Harrison (harrison@cs.wustl.edu)
- *
- *  A wrapper for helping with Orbix object references.
- *
- *
- */
-//=============================================================================
-
-
-#ifndef ACE_CORBA_REF_H
-#define ACE_CORBA_REF_H
-#include "ace/pre.h"
-
-#include "ace/ACE.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-/**
- * @class ACE_CORBA_Ref
- *
- * @brief A wrapper for helping with Orbix object references.
- *
- * <ACE_CORBA_Ref> is parameterized by the type of orbix object
- * reference to be used.  The construtor, operator=, and the
- * destructor of <ACE_CORBA_Ref> perform implicit duplicates and
- * releases in order to help make the use of Orbix object
- * references transparent.
- */
-template <class CORBA_REF>
-class ACE_CORBA_Ref
-{
-public:
-  /// Null construction.
-  ACE_CORBA_Ref (void);
-
-  /// Contruction with an orbix ref.
-  /// performs a <CORBA_REF::_duplicate>.
-  ACE_CORBA_Ref (CORBA_REF *ref);
-
-  /// Assignment performs a <CORBA_REF::_duplicate>.
-  CORBA_REF *operator= (CORBA_REF *ref);
-
-  /// Type operator
-  operator CORBA_REF *(void) const;
-
-  /// Smart pointer to forward all CORBA_REF calls to the underlying
-  /// Orbix reference.
-  CORBA_REF *operator-> (void) const;
-
-  /// Pointer comparison.
-  int operator== (CORBA_REF *) const;
-
-  /// Pointer comparison.
-  int operator!= (CORBA_REF *) const;
-
-  /// Destruction: calls <CORBA_REF::_release>.
-  ~ACE_CORBA_Ref (void);
-
-private:
-  CORBA_REF *ref_;
-};
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ace/CORBA_Ref.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("CORBA_Ref.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include "ace/post.h"
-#endif /* CORBA_REF_H */
diff --git a/ace/Makefile b/ace/Makefile
index 949ba7bc13c..e0414979956 100644
--- a/ace/Makefile
+++ b/ace/Makefile
@@ -224,8 +224,6 @@ TOKEN_FILES = \
   Token_Manager \
   Token_Request_Reply
 OTHER_FILES = \
-  CORBA_Handler \
-  CORBA_Ref \
   Local_Name_Space \
   Name_Proxy \
   Name_Request_Reply \
@@ -16709,176 +16707,6 @@ endif # GHS
  Time_Value.h \
  Token_Request_Reply.i
 
-.obj/CORBA_Handler.o .obj/CORBA_Handler.so .shobj/CORBA_Handler.o .shobj/CORBA_Handler.so: CORBA_Handler.cpp \
- CORBA_Handler.h \
- pre.h \
- Service_Config.h \
- Service_Object.h \
- Shared_Object.h \
- ACE.h \
- OS.h \
- config-all.h \
- config.h \
- config-linux.h \
- config-linux-common.h \
- config-g++-common.h \
- post.h \
- ACE_export.h \
- svc_export.h \
- ace_wchar.h \
- ace_wchar.inl \
- OS_Errno.h \
- OS_Export.h \
- OS_Errno.inl \
- OS_Dirent.h \
- OS_Dirent.inl \
- OS_String.h \
- OS_String.inl \
- OS_Memory.h \
- OS_Memory.inl \
- OS_TLI.h \
- OS_TLI.inl \
- Min_Max.h \
- streams.h \
- Basic_Types.h \
- Basic_Types.i \
- Trace.h \
- OS.i \
- Flag_Manip.h \
- Flag_Manip.i \
- Handle_Ops.h \
- Handle_Ops.i \
- Lib_Find.h \
- Lib_Find.i \
- Init_ACE.h \
- Init_ACE.i \
- Sock_Connect.h \
- Sock_Connect.i \
- ACE.i \
- Shared_Object.i \
- Event_Handler.h \
- Event_Handler.i \
- Service_Object.i \
- Signal.h \
- Synch.h \
- Synch.i \
- Synch_T.h \
- Synch_T.i \
- Thread.h \
- Thread_Adapter.h \
- Base_Thread_Adapter.h \
- OS_Log_Msg_Attributes.h \
- OS_Log_Msg_Attributes.inl \
- Base_Thread_Adapter.inl \
- Thread_Adapter.inl \
- Thread.i \
- Atomic_Op.i \
- Synch_T.cpp \
- Log_Msg.h \
- Log_Record.h \
- Log_Priority.h \
- Log_Record.i \
- Signal.i \
- Unbounded_Queue.h \
- Node.h \
- Node.cpp \
- Unbounded_Queue.inl \
- Unbounded_Queue.cpp \
- Malloc_Base.h \
- Unbounded_Set.h \
- Unbounded_Set.inl \
- Unbounded_Set.cpp \
- SString.h \
- SString.i \
- Service_Config.i \
- Reactor.h \
- Handle_Set.h \
- Handle_Set.i \
- Timer_Queue.h \
- Timer_Queue_T.h \
- Free_List.h \
- Free_List.i \
- Free_List.cpp \
- Test_and_Set.h \
- Test_and_Set.i \
- Test_and_Set.cpp \
- Timer_Queue_T.i \
- Timer_Queue_T.cpp \
- Reactor.i \
- Reactor_Impl.h \
- Svc_Conf_Tokens.h \
- Pipe.h \
- Pipe.i \
- Object_Manager.h \
- Object_Manager.i \
- Managed_Object.h \
- Managed_Object.i \
- Managed_Object.cpp \
- Thread_Manager.h \
- Containers.h \
- Containers.i \
- Containers_T.h \
- Array_Base.h \
- Array_Base.inl \
- Array_Base.cpp \
- Containers_T.i \
- Containers_T.cpp \
- Singleton.h \
- Singleton.i \
- Singleton.cpp \
- Thread_Manager.i
-
-.obj/CORBA_Ref.o .obj/CORBA_Ref.so .shobj/CORBA_Ref.o .shobj/CORBA_Ref.so: CORBA_Ref.cpp \
- CORBA_Ref.h \
- pre.h \
- ACE.h \
- OS.h \
- config-all.h \
- config.h \
- config-linux.h \
- config-linux-common.h \
- config-g++-common.h \
- post.h \
- ACE_export.h \
- svc_export.h \
- ace_wchar.h \
- ace_wchar.inl \
- OS_Errno.h \
- OS_Export.h \
- OS_Errno.inl \
- OS_Dirent.h \
- OS_Dirent.inl \
- OS_String.h \
- OS_String.inl \
- OS_Memory.h \
- OS_Memory.inl \
- OS_TLI.h \
- OS_TLI.inl \
- Min_Max.h \
- streams.h \
- Basic_Types.h \
- Basic_Types.i \
- Trace.h \
- OS.i \
- Flag_Manip.h \
- Flag_Manip.i \
- Handle_Ops.h \
- Handle_Ops.i \
- Lib_Find.h \
- Lib_Find.i \
- Init_ACE.h \
- Init_ACE.i \
- Sock_Connect.h \
- Sock_Connect.i \
- ACE.i \
- CORBA_Ref.cpp \
- Log_Msg.h \
- Log_Record.h \
- Log_Priority.h \
- Log_Record.i \
- OS_Log_Msg_Attributes.h \
- OS_Log_Msg_Attributes.inl
-
 .obj/Local_Name_Space.o .obj/Local_Name_Space.so .shobj/Local_Name_Space.o .shobj/Local_Name_Space.so: Local_Name_Space.cpp \
  ACE.h \
  pre.h \
diff --git a/ace/Makefile.am b/ace/Makefile.am
index 1a61be5fbfd..c1b9bc49bda 100644
--- a/ace/Makefile.am
+++ b/ace/Makefile.am
@@ -374,8 +374,6 @@ libACE_Timer_la_SOURCES = \
 EXTRA_libACE_Timer_la_SOURCES = gethrtime.cpp
 
 libACE_Other_la_SOURCES = \
-  CORBA_Handler.cpp \
-  CORBA_Ref.cpp \
   Local_Name_Space.cpp \
   Name_Proxy.cpp \
   Name_Request_Reply.cpp \
@@ -542,8 +540,6 @@ HEADER_FILES = \
   Bound_Ptr.h \
   CDR_Base.h \
   CDR_Stream.h \
-  CORBA_Handler.h \
-  CORBA_Ref.h \
   CORBA_macros.h \
   Cache_Map_Manager_T.h \
   Cached_Connect_Strategy_T.h \
@@ -836,7 +832,6 @@ INLINE_FILES = \
   Basic_Types.i \
   Bound_Ptr.i \
   CDR_Stream.i \
-  CORBA_Handler.i \
   Cache_Map_Manager_T.i \
   Caching_Strategies_T.i \
   Capabilities.i \
diff --git a/ace/Makefile.bor b/ace/Makefile.bor
index c05e187e571..cc7eb673387 100644
--- a/ace/Makefile.bor
+++ b/ace/Makefile.bor
@@ -41,8 +41,6 @@ OBJFILES = \
 	$(OBJDIR)\Configuration.obj \
 	$(OBJDIR)\Configuration_Import_Export.obj \
 	$(OBJDIR)\Containers.obj \
-	$(OBJDIR)\CORBA_Handler.obj \
-	$(OBJDIR)\CORBA_Ref.obj \
 	$(OBJDIR)\Date_Time.obj \
 	$(OBJDIR)\DEV.obj \
 	$(OBJDIR)\DEV_Addr.obj \
@@ -245,7 +243,6 @@ INCLUDES = \
 	Unbounded_Queue.cpp \
 	Auto_Ptr.cpp \
 	Connector.cpp \
-	CORBA_Ref.cpp \
 	Dynamic_Service.cpp \
 	Free_List.cpp \
 	Future.cpp \
diff --git a/ace/README b/ace/README
index 300bea1c3fb..3afe15a523b 100644
--- a/ace/README
+++ b/ace/README
@@ -403,8 +403,6 @@ ACE_HAS_OPTIMIZED_MESSAGE_QUEUE         Use the semaphore
                                         ACE_Message_Queue rather than
                                         the emulated condition
                                         variable (NT and VxWorks).
-ACE_HAS_ORBIX                           Platform has Orbix CORBA
-                                        implementation
 ACE_HAS_OSF_TIMOD_H                     Platform supports the OSF TLI
                                         timod STREAMS module
 ACE_HAS_PENTIUM                         Platform is an Intel Pentium
diff --git a/ace/ace-dll.icc b/ace/ace-dll.icc
index 534ee0efc3d..f43a5186871 100644
--- a/ace/ace-dll.icc
+++ b/ace/ace-dll.icc
@@ -89,9 +89,7 @@ option
                                               'Connector.h',
                                               'Containers.h',
                                               'Containers_T.h',
-                                              'CORBA_Handler.h',
                                               'CORBA_macros.h',
-                                              'CORBA_Ref.h',
                                               'Date_Time.h',
                                               'DEV.h',
                                               'DEV_Addr.h',
@@ -330,8 +328,6 @@ option
                  source type(cpp) "CDR_Stream.cpp"
                  source type(cpp) "Configuration.cpp"
                  source type(cpp) "Containers.cpp"
-                 source type(cpp) "CORBA_Handler.cpp"
-                 source type(cpp) "CORBA_Ref.cpp"
                  source type(cpp) "Date_Time.cpp"
                  source type(cpp) "DEV.cpp"
                  source type(cpp) "DEV_Addr.cpp"
diff --git a/ace/ace-lib.icc b/ace/ace-lib.icc
index b9d5717a6a8..7951e013873 100644
--- a/ace/ace-lib.icc
+++ b/ace/ace-lib.icc
@@ -37,8 +37,6 @@ option
                  source type(cpp) "CDR_Base.cpp"
                  source type(cpp) "CDR_Stream.cpp"
                  source type(cpp) "Containers.cpp"
-                 source type(cpp) "CORBA_Handler.cpp"
-                 source type(cpp) "CORBA_Ref.cpp"
                  source type(cpp) "Date_Time.cpp"
                  source type(cpp) "DEV.cpp"
                  source type(cpp) "DEV_Addr.cpp"
@@ -229,8 +227,6 @@ option
                  source type (cpp) "Containers.cpp"
                  source type (cpp) "Asynch_Acceptor.cpp"
                  source type (cpp) "Auto_Ptr.cpp"
-                 source type (cpp) "CORBA_Ref.cpp"
-                 source type (cpp) "Connector.cpp"
                  source type (cpp) "Containers_T.cpp"
                  source type (cpp) "Dump_T.cpp"
                  source type (cpp) "Env_Value_T.cpp"
diff --git a/ace/ace.icc b/ace/ace.icc
index 0d804e3dee9..77b66ee2250 100755
--- a/ace/ace.icc
+++ b/ace/ace.icc
@@ -447,8 +447,6 @@ group TOKEN_INCLUDES =
   "Token_Request_Reply.h"
 
 group OTHER_FILES =
-  "CORBA_Handler.cpp",
-  "CORBA_Ref.cpp",
   "Local_Name_Space.cpp",
   "Name_Proxy.cpp",
   "Name_Request_Reply.cpp",
@@ -458,8 +456,6 @@ group OTHER_FILES =
   "Remote_Name_Space.cpp"
 
 group OTHER_INCLUDES =
-  "CORBA_Handler.h",
-  "CORBA_Ref.h",
   "Local_Name_Space.h",
   "Name_Proxy.h",
   "Name_Request_Reply.h",
diff --git a/ace/config-hpux-9.x-orbix.h b/ace/config-hpux-9.x-orbix.h
deleted file mode 100644
index e81e1ceed89..00000000000
--- a/ace/config-hpux-9.x-orbix.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// The following configuration file is designed to work for HP
-// platforms running HP/UX 9.x.  Dave added Orbix stuff
-
-#ifndef ACE_CONFIG_H
-#define ACE_CONFIG_H
-#include "ace/pre.h"
-
-// Compiling for HPUX.
-#if !defined (HPUX)
-#define HPUX
-#endif /* HPUX */
-
-#if __cplusplus < 199707L
-#define ACE_HAS_BROKEN_HPUX_TEMPLATES
-#endif /* __cplusplus < 199707L */
-
-#define ACE_HAS_BROKEN_CONVERSIONS
-// Optimize ACE_Handle_Set for select().
-#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
-
-// They forgot a const in the prototype of const_timewait...
-#define ACE_LACKS_CONST_TIMESPEC_PTR
-
-// ************* HERE IS THE ORBIX STUFF - Dave 4/2/96
-#define ACE_HAS_ORBIX 1
-
-#define ACE_LACKS_SYSCALL
-#define ACE_LACKS_STRRECVFD
-
-// Compiler doesn't support static data member templates.
-#define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES
-
-// Platform supports System V IPC (most versions of UNIX, but not Win32)
-#define ACE_HAS_SYSV_IPC
-
-// Platform supports recvmsg and sendmsg.
-#define ACE_HAS_MSG
-
-// Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYSCALL_H
-
-// Fixes a problem with HP/UX not wrapping the mmap(2) header files
-// with extern "C".
-#define ACE_HAS_BROKEN_MMAP_H
-
-// Prototypes for both signal() and struct sigaction are consistent.
-#define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES
-
-// Compiler/platform has correctly prototyped header files.
-#define ACE_HAS_CPLUSPLUS_HEADERS
-
-// Header files lack t_errno for ACE_TLI.
-#define ACE_LACKS_T_ERRNO
-
-// Compiler/platform supports poll().
-#define ACE_HAS_POLL
-
-// Platform supports POSIX O_NONBLOCK semantics.
-#define ACE_HAS_POSIX_NONBLOCK
-
-// Compiler/platform defines the sig_atomic_t typedef
-#define ACE_HAS_SIG_ATOMIC_T
-
-// Compiler supports the ssize_t typedef.
-#define ACE_HAS_SSIZE_T
-
-// Defines the page size of the system.
-#define ACE_PAGE_SIZE 4096
-
-// Compiler/platform supports strerror ().
-#define ACE_HAS_STRERROR
-
-// ???
-#define ACE_HAS_SUNOS4_GETTIMEOFDAY
-
-// HP/UX has an undefined syscall for GETRUSAGE...
-#define ACE_HAS_SYSCALL_GETRUSAGE
-
-// Note, this only works if the flag is set above!
-#define ACE_HAS_GETRUSAGE
-
-// Platform uses int for select() rather than fd_set.
-// Dave 4/2/96 took this out.  It appears that HP -can- use fd_set for int
-// But time.h has a prototype defined so that int must be used ! so it goes
-// back in
-#define ACE_SELECT_USES_INT
-
-// Platform has prototypes for ACE_TLI.
-//#define ACE_HAS_TLI_PROTOTYPES
-// Platform has the XLI version of ACE_TLI.
-// #define ACE_HAS_XLI
-
-#define ACE_LACKS_ACE_IOSTREAM
-
-#define ACE_NEEDS_DEV_IO_CONVERSION
-
-// Turns off the tracing feature.
-#if !defined (ACE_NTRACE)
-#define ACE_NTRACE 1
-#endif /* ACE_NTRACE */
-
-#include "ace/post.h"
-#endif /* ACE_CONFIG_H */
diff --git a/ace/config-sunos4-sun4.x-orbix.h b/ace/config-sunos4-sun4.x-orbix.h
deleted file mode 100644
index 98dab1ac8c0..00000000000
--- a/ace/config-sunos4-sun4.x-orbix.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// The following configuration file is designed to work
-// for SunOS4 platforms using the SunC++ 4.x compiler.
-
-#ifndef ACE_CONFIG_H
-#define ACE_CONFIG_H
-#include "ace/pre.h"
-
-#define ACE_LACKS_GETPGID
-#define ACE_LACKS_SETPGID
-
-#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
-
-#define ACE_HAS_CHARPTR_SPRINTF
-#define ACE_HAS_UNION_WAIT
-
-// Platform supports System V IPC (most versions of UNIX, but not Win32)
-#define ACE_HAS_SYSV_IPC
-
-// Platform supports recvmsg and sendmsg.
-#define ACE_HAS_MSG
-
-// Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYSCALL_H
-
-// ACE sparcworks 4.01 signal handling under SunOS
-#define ACE_HAS_SPARCWORKS_401_SIGNALS
-
-// Compiler/platform has the getrusage() system call.
-#define ACE_HAS_GETRUSAGE
-
-// Platform contains Orbix CORBA implementation.
-#define ACE_HAS_ORBIX 1
-
-// Compiler/platform supports strerror ().
-// #define ACE_HAS_STRERROR
-#define ACE_HAS_SYS_ERRLIST
-
-// Header files lack t_errno for ACE_TLI.
-// #define ACE_LACKS_T_ERRNO
-
-// Compiler/platform uses old malloc()/free() prototypes (ugh).
-#define ACE_HAS_OLD_MALLOC
-
-// Defines the page size of the system.
-#define ACE_PAGE_SIZE 4096
-
-// Compiler/platform supports poll().
-#define ACE_HAS_POLL
-
-// Compiler/platform defines a union semun for SysV shared memory.
-#define ACE_HAS_SEMUN
-
-// Compiler/platform provides the sockio.h file.
-#define ACE_HAS_SOCKIO_H
-
-// Compiler has brain-damaged SPARCwork signal prototype...
-#define ACE_HAS_SPARCWORKS_401_SIGNALS
-
-// Compiler/platform supports struct strbuf
-#define ACE_HAS_STRBUF_T
-
-// Platform supports STREAMS.
-#define ACE_HAS_STREAMS
-
-// SunOS 4 style prototype.
-#define ACE_HAS_SUNOS4_GETTIMEOFDAY
-
-// Compiler/platform supports SVR4 dynamic linking semantics.
-#define ACE_HAS_SVR4_DYNAMIC_LINKING
-
-// Platform provides <sys/filio.h> header.
-#define ACE_HAS_SYS_FILIO_H
-
-// Platform supports ACE_TLI tiuser header.
-// #define ACE_HAS_TIUSER_H
-
-// Platform has ACE_TLI.
-// #define ACE_HAS_TLI
-
-#define ACE_LACKS_LINEBUFFERED_STREAMBUF
-#define ACE_LACKS_SIGNED_CHAR
-
-#define ACE_NEEDS_DEV_IO_CONVERSION
-
-#define ACE_LACKS_U_LONGLONG_T
-
-#define ACE_LACKS_DIFFTIME
-
-// Turns off the tracing feature.
-#if !defined (ACE_NTRACE)
-#define ACE_NTRACE 1
-#endif /* ACE_NTRACE */
-
-#include "ace/post.h"
-#endif /* ACE_CONFIG_H */
diff --git a/ace/config-sunos5.4-sunc++-4.x-orbix.h b/ace/config-sunos5.4-sunc++-4.x-orbix.h
deleted file mode 100644
index e908543be52..00000000000
--- a/ace/config-sunos5.4-sunc++-4.x-orbix.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// The following configuration file is designed to work for SunOS 5.4
-// platforms using the SunC++ 4.0.x compiler.  This works with the
-// MT-Orbix CORBA IDL compiler.
-
-#ifndef ACE_CONFIG_H
-#define ACE_CONFIG_H
-#include "ace/pre.h"
-
-#if ! defined (__ACE_INLINE__)
-# define __ACE_INLINE__
-#endif /* ! __ACE_INLINE__ */
-
-#define ACE_HAS_TEMPLATE_SPECIALIZATION
-
-#define ACE_HAS_HANDLE_SET_OPTIMIZED_FOR_SELECT
-
-// Platform supports pread() and pwrite()
-#define ACE_HAS_P_READ_WRITE
-
-#define ACE_HAS_XPG4_MULTIBYTE_CHAR
-
-// Platform supports System V IPC (most versions of UNIX, but not Win32)
-#define ACE_HAS_SYSV_IPC
-
-// Sun has the wrong prototype for sendmsg.
-#define ACE_HAS_BROKEN_SENDMSG
-
-// The SunOS 5.x version of rand_r is inconsistent with the header files...
-#define ACE_HAS_BROKEN_RANDR
-
-// Platform supports system configuration information.
-#define ACE_HAS_SYSINFO
-
-// Platform supports the POSIX regular expression library
-#define ACE_HAS_REGEX
-
-// Platform supports recvmsg and sendmsg.
-#define ACE_HAS_MSG
-
-// Compiler/platform contains the <sys/syscall.h> file.
-#define ACE_HAS_SYSCALL_H
-
-// Platform has terminal ioctl flags like TCGETS and TCSETS.
-#define ACE_HAS_TERM_IOCTLS
-
-// Compiler/platform correctly calls init()/fini() for shared libraries.
-#define ACE_HAS_AUTOMATIC_INIT_FINI
-
-// Platform supports POSIX O_NONBLOCK semantics.
-#define ACE_HAS_POSIX_NONBLOCK
-
-// Compiler/platform has correctly prototyped header files.
-#define ACE_HAS_CPLUSPLUS_HEADERS
-
-// Compiler/platform supports SunOS high resolution timers.
-#define ACE_HAS_HI_RES_TIMER
-
-// Platform supports IP multicast
-#define ACE_HAS_IP_MULTICAST
-
-// Compiler/platform supports alloca()
-#define ACE_HAS_ALLOCA
-
-// Compiler/platform has <alloca.h>
-#define ACE_HAS_ALLOCA_H
-
-// Platform contains the Orbix CORBA implementation.
-#define ACE_HAS_ORBIX 1
-
-// Platform contains the multi-threaded Orbix CORBA implementation.
-// #define ACE_HAS_MT_ORBIX
-
-// Platform contains <poll.h>.
-#define ACE_HAS_POLL
-
-// Platform supports POSIX timers via timestruc_t.
-#define ACE_HAS_POSIX_TIME
-
-// Platform supports the /proc file system.
-#define ACE_HAS_PROC_FS
-
-// Platform supports the prusage_t struct.
-#define ACE_HAS_PRUSAGE_T
-
-// Compiler/platform defines the sig_atomic_t typedef.
-#define ACE_HAS_SIG_ATOMIC_T
-
-// Platform supports SVR4 extended signals.
-#define ACE_HAS_SIGINFO_T
-#define ACE_HAS_UCONTEXT_T
-
-// Compiler/platform provides the sockio.h file.
-#define ACE_HAS_SOCKIO_H
-
-// Compiler supports the ssize_t typedef.
-#define ACE_HAS_SSIZE_T
-
-// Platform supports STREAMS.
-#define ACE_HAS_STREAMS
-
-// Platform supports STREAM pipes.
-#define ACE_HAS_STREAM_PIPES
-
-// Compiler/platform supports strerror ().
-#define ACE_HAS_STRERROR
-
-// Compiler/platform supports struct strbuf.
-#define ACE_HAS_STRBUF_T
-
-// Compiler/platform supports SVR4 dynamic linking semantics.
-#define ACE_HAS_SVR4_DYNAMIC_LINKING
-
-// Compiler/platform supports SVR4 gettimeofday() prototype.
-#define ACE_HAS_SVR4_GETTIMEOFDAY
-
-// Compiler/platform supports SVR4 signal typedef.
-#define ACE_HAS_SVR4_SIGNAL_T
-
-// Platform lacks pthread_sigaction
-#define ACE_LACKS_PTHREAD_THR_SIGSETMASK
-
-// Compiler/platform supports SVR4 ACE_TLI (in particular, T_GETNAME stuff)...
-#define ACE_HAS_SVR4_TLI
-
-// Platform provides <sys/filio.h> header.
-#define ACE_HAS_SYS_FILIO_H
-
-// Compiler/platform supports sys_siglist array.
-#define ACE_HAS_SYS_SIGLIST
-
-/* Turn off the following defines if you want to disable threading. */
-// Compile using multi-thread libraries.
-#if !defined (ACE_MT_SAFE)
-# define ACE_MT_SAFE 1
-#endif
-
-// Platform supports Solaris threads.
-#define ACE_HAS_STHREADS
-
-// Platform supports threads.
-#define ACE_HAS_THREADS
-
-// Compiler/platform has thread-specific storage
-#define ACE_HAS_THREAD_SPECIFIC_STORAGE
-
-// Platform supports reentrant functions (i.e., all the POSIX *_r functions).
-#define ACE_HAS_REENTRANT_FUNCTIONS
-
-/* end threading defines */
-
-#define ACE_HAS_PRIOCNTL
-#define ACE_NEEDS_LWP_PRIO_SET
-
-// Platform supports ACE_TLI timod STREAMS module.
-#define ACE_HAS_TIMOD_H
-
-// Platform supports ACE_TLI tiuser header.
-#define ACE_HAS_TIUSER_H
-
-// Platform provides ACE_TLI function prototypes.
-#define ACE_HAS_TLI_PROTOTYPES
-
-// Platform supports ACE_TLI.
-#define ACE_HAS_TLI
-
-#define ACE_LACKS_LINEBUFFERED_STREAMBUF
-#define ACE_LACKS_SIGNED_CHAR
-
-// Use the poll() event demultiplexor rather than select().
-//#define ACE_USE_POLL
-
-#define ACE_NEEDS_DEV_IO_CONVERSION
-
-// Turns off the tracing feature.
-#if !defined (ACE_NTRACE)
-# define ACE_NTRACE 1
-#endif /* ACE_NTRACE */
-
-// Defines the page size of the system.
-#define ACE_PAGE_SIZE 4096
-#define ACE_HAS_IDTYPE_T
-#define ACE_HAS_GPERF
-#define ACE_HAS_DIRENT
-
-#include "ace/post.h"
-#endif /* ACE_CONFIG_H */
diff --git a/ace/config-sunos5.x-sunc++-4.x-orbix.h b/ace/config-sunos5.x-sunc++-4.x-orbix.h
deleted file mode 100644
index f48b35c2e8e..00000000000
--- a/ace/config-sunos5.x-sunc++-4.x-orbix.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// The following configuration file is designed to work for SunOS
-// 5.[56] platforms using the SunC++ 4.x compiler. This works with the
-// Orbix 2.x CORBA IDL compiler.
-
-#ifndef ACE_CONFIG_ORBIX_H
-#define ACE_CONFIG_ORBIX_H
-#include "ace/pre.h"
-
-// Pick up correct platform definition file based on compiler's predefined
-// macros.
-#if defined (__SunOS_5_5) || defined (__SunOS_5_5_1)
-#  include "ace/config-sunos5.5.h"
-#elif defined (__SunOS_5_6)
-#  include "ace/config-sunos5.6.h"
-#else
-#  error "Need a new platform extension in config-sunos5.x-sunc++-4.x-orbix.h"
-#endif /* __SunOS_* */
-
-// Platform contains the Orbix CORBA implementation.
-#define ACE_HAS_ORBIX 1
-
-// Platform contains the multi-threaded Orbix CORBA implementation, unless
-// overridden by site config.
-#if !defined (ACE_HAS_MT_ORBIX)
-#  define ACE_HAS_MT_ORBIX 1
-#endif /* ACE_HAS_MT_ORBIX */
-
-#include "ace/post.h"
-#endif /* ACE_CONFIG_ORBIX_H */
diff --git a/ace/config-tandem.h b/ace/config-tandem.h
index f42b644a56d..47777c9f53d 100644
--- a/ace/config-tandem.h
+++ b/ace/config-tandem.h
@@ -310,10 +310,6 @@
 
 //ACE_HAS_OLD_MALLOC                    Compiler/platform uses old malloc()/
 // free() prototypes (ugh)
-#if !defined (ACE_HAS_ORBIX)
-        #define ACE_HAS_ORBIX 0
-#endif
-// ACE_HAS_ORBIX                        Platform has Orbix CORBA implementation
 //? ACE_HAS_POSIX_SEM                   Platform supports POSIX real-time
 //semaphores (e.g., VxWorks and Solaris)
 //Compiler/platform defines a union semun for SysV shared memory
diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h
index cfd78ba0542..c66b41dde9d 100644
--- a/ace/config-win32-common.h
+++ b/ace/config-win32-common.h
@@ -103,26 +103,6 @@
 //  Runtime restrictions: winsock2 must be installed.
 //      #define ACE_HAS_WINSOCK2 0
 
-// Define ACE_HAS_ORBIX to 1 in your config.h file if you want to integrate
-// ACE and Orbix in Win32.
-//  Setting applies to  : building ACE, linking with ACE
-//  Runtime restrictions: system must have Orbix DLLs
-#if !defined (ACE_HAS_ORBIX)
-# define ACE_HAS_ORBIX 0
-#endif
-
-#if !defined (ACE_HAS_MT_ORBIX)
-# define ACE_HAS_MT_ORBIX 0
-#endif
-
-// By default, you will get the proper namespace usage for Orbix.  If
-// you don't like this, comment out the #define line or #undef
-// ACE_ORBIX_HAS_NAMESPACES in your config.h file after including this
-// file.
-#if !defined (ACE_ORBIX_HAS_NAMESPACES)
-# define ACE_ORBIX_HAS_NAMESPACES
-#endif /* ACE_ORBIX_HAS_NAMESPACES */
-
 // By default, we use non-static object manager on Win32.  That is,
 // the object manager is allocated in main's stack memory.  If this
 // does not suit your need, i.e., if your programs depend on the use