Deleted these files and named them without IIOP.

2 files changed, 0 insertions, 308 deletions

diff --git a/TAO/tao/IIOP_RMS.cpp b/TAO/tao/IIOP_RMS.cpp
deleted file mode 100644
index 4e42cd5df01..00000000000
--- a/TAO/tao/IIOP_RMS.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-// $Id$
-
-#include "tao/IIOP_RMS.h"
-
-// @@ Alex: there is another aspect that is controlled by this
-//    strategy: the demuxed version must idle() the transport
-//    right after the request is sent, otherwise nobody else will be
-//    able to use it.
-//    The exclusive version must idle it after the reply is received,
-//    to guarantee that nobody else is using it.
-//    We may need to add a couple of methods to implement that.
-
-TAO_IIOP_Request_Multiplexing_Strategy::TAO_IIOP_Request_Multiplexing_Strategy (void)
-  : cdr_ (0)
-{
-}
-
-TAO_IIOP_Request_Multiplexing_Strategy::~TAO_IIOP_Request_Multiplexing_Strategy (void)
-{
-}
-
-TAO_InputCDR *
-TAO_IIOP_Request_Multiplexing_Strategy::get_cdr_stream (void)
-{
-  return cdr_;
-}
-
-// *********************************************************************
-
-TAO_IIOP_Muxed_RMS::TAO_IIOP_Muxed_RMS (void)
-{
-}
-
-TAO_IIOP_Muxed_RMS::~TAO_IIOP_Muxed_RMS (void)
-{
-  // @@ delete ???
-}
-
-// Generate and return an unique request id for the current
-// invocation.
-CORBA::ULong
-TAO_IIOP_Muxed_RMS::request_id (void)
-{
-  // @@
-  return 0;
-}
-
-// Bind the dispatcher with the request id.
-int
-TAO_IIOP_Muxed_RMS::bind_dispatcher (CORBA::ULong request_id,
-                                     TAO_IIOP_Reply_Dispatcher *rh)
-{
-  // @@
-  return 0;
-}
-
-// Find the Reply Dispatcher.
-TAO_IIOP_Reply_Dispatcher*
-TAO_IIOP_Muxed_RMS::find_dispatcher (CORBA::ULong request_id)
-{
-  // @@
-  return 0;
-}
-
-void
-TAO_IIOP_Muxed_RMS::set_cdr_stream (TAO_InputCDR *Cdr)
-{
-  // @@
-}
-
-
-void
-TAO_IIOP_Muxed_RMS::destroy_cdr_stream (void)
-{
-  // @@ Implement.
-  // delete cdr;
-  // cdr = 0;
-}
-
-// *********************************************************************
-
-TAO_IIOP_Exclusive_RMS::TAO_IIOP_Exclusive_RMS (void)
-  : request_id_ (931232), // @@ Hardcoding.
-    rd_ (0)
-{
-}
-
-TAO_IIOP_Exclusive_RMS::~TAO_IIOP_Exclusive_RMS (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_IIOP_Exclusive_RMS::request_id (void)
-{
-  return this->request_id_;
-}
-
-// Bind the handler with the request id.
-int
-TAO_IIOP_Exclusive_RMS::bind_dispatcher (CORBA::ULong request_id,
-                                         TAO_IIOP_Reply_Dispatcher *rd)
-{
-  this->request_id_ = request_id;
-  this->rd_ = rd;
-  return 0;
-}
-
-// Find the Reply Handler.
-TAO_IIOP_Reply_Dispatcher *
-TAO_IIOP_Exclusive_RMS::find_dispatcher (CORBA::ULong request_id)
-{
-  if (this->request_id_ != request_id)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%N:%l:TAO_IIOP_Exclusive_RMS::find_handler: ",
-                       "Failed to find the handler\n"),
-                      0);
-
-  return this->rd_;
-}
-
-
-// Set the CDR stream.
-void
-TAO_IIOP_Exclusive_RMS::set_cdr_stream (TAO_InputCDR *cdr)
-{
-  this->cdr_ = cdr;
-}
-
-// NOOP function.
-void
-TAO_IIOP_Exclusive_RMS::destroy_cdr_stream (void)
-{
-}
diff --git a/TAO/tao/IIOP_RMS.h b/TAO/tao/IIOP_RMS.h
deleted file mode 100644
index 11ae6f3ceb8..00000000000
--- a/TAO/tao/IIOP_RMS.h
+++ /dev/null
@@ -1,172 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     IIOP_RMS.h
-//
-// = DESCRIPTION
-//     IIOP Request Multiplexing Strategies.
-//
-// = AUTHOR
-//     Alexander Babu Arulanthu <alex@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_IIOP_RMS_H
-#define TAO_IIOP_RMS_H
-
-#include "tao/CDR.h"
-
-// Forward declarations.
-
-class TAO_IIOP_Reply_Dispatcher;
-
-
-class TAO_Export TAO_IIOP_Request_Multiplexing_Strategy
-{
-  // = TITLE
-  // 
-  //     Strategy to determine whether the connection should be
-  //     multiplexed for multiple requests or it is exclusive for a
-  //     single request at a time. 
-  // 
-  // = DESCRIPTION
-  // 
-  
-public:
-  TAO_IIOP_Request_Multiplexing_Strategy (void);
-  // Base class constructor.
-
-  virtual ~TAO_IIOP_Request_Multiplexing_Strategy (void);
-  // Base class destructor.
-
-  virtual CORBA::ULong request_id (void)  = 0;
-  // Generate and return an unique request id for the current
-  // invocation.  
-
-  // = Bind and Find methods for the <Request ID, ReplyDispatcher>
-  //   pairs. The ReplyDispatcher is not the CORBA ReplyDispatcher of
-  //   the AMI's.  
-  
-  virtual int bind_dispatcher (CORBA::ULong request_id,
-                               TAO_IIOP_Reply_Dispatcher *rh) = 0; 
-  // Bind the dispatcher with the request id.
-  
-  virtual TAO_IIOP_Reply_Dispatcher* find_dispatcher (CORBA::ULong request_id) = 0;
-  // Find the Reply Dispatcher.
-
-  // = "Factory methods" to obtain the CDR stream, in the Muxed case
-  //    the factory simply allocates a new one, in the Exclusive case
-  //    the factory returns a pointer to the pre-allocated CDR. 
-
-  virtual void set_cdr_stream (TAO_InputCDR *cdr) = 0;
-  // Set the CDR stream.
-
-  virtual TAO_InputCDR *get_cdr_stream (void);
-  // Get the CDR stream.
-  
-  virtual void destroy_cdr_stream (void) = 0;
-  // Destroy the CDR stream.
-
-protected:
-  TAO_InputCDR *cdr_;
-  // Pointer to the CDR stream used to read the incoming message. This
-  // is obtained from the Invocation object. This is preallocated in
-  // the SMI and dynamically allocated in AMI.
-};
-  
-class TAO_Export TAO_IIOP_Muxed_RMS : public  TAO_IIOP_Request_Multiplexing_Strategy
-{
-  // = TITLE
-  //
-  //    Connection is multiplexed for many requests.
-  //
-  // = DESCRIPTION
-  // 
-
-public:
-  TAO_IIOP_Muxed_RMS (void);
-  // Constructor.
-  
-  virtual ~TAO_IIOP_Muxed_RMS (void);
-  // Destructor.
-
-  virtual CORBA::ULong request_id (void);
-  // Generate and return an unique request id for the current
-  // invocation.  
-
-  virtual int bind_dispatcher (CORBA::ULong request_id,
-                               TAO_IIOP_Reply_Dispatcher *rh);
-  // Bind the dispatcher with the request id.
-  
-  virtual TAO_IIOP_Reply_Dispatcher* find_dispatcher (CORBA::ULong request_id);
-  // Find the Reply Dispatcher.
-  
-  // virtual TAO_InputCDR *cdr_stream (void);
-  // Create a new CDR stream and return. 
-
-  virtual void set_cdr_stream (TAO_InputCDR *cdr);
-  // Set the CDR stream.
-
-  // virtual TAO_InputCDR *cdr_stream (void);
-  // Get the CDR stream.
-
-  virtual void destroy_cdr_stream (void);
-  // Delete the cdr stream.
-
-protected:
-  // @@ HASH TABLE???
-};  
-
-class TAO_Export TAO_IIOP_Exclusive_RMS : public TAO_IIOP_Request_Multiplexing_Strategy
-{
-  // = TITLE
-  //   
-  //    Connection exclusive for the request.
-  //
-  // = DESCRIPTION
-  // 
-
-public:
-  TAO_IIOP_Exclusive_RMS (void);
-  // Constructor.
-  
-  virtual ~TAO_IIOP_Exclusive_RMS (void);
-  // Destructor.
-
-  virtual CORBA::ULong request_id (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.
-
-  virtual int bind_dispatcher (CORBA::ULong request_id,
-                               TAO_IIOP_Reply_Dispatcher *rh);
-  // Bind the dispatcher with the request id.
-  
-  virtual TAO_IIOP_Reply_Dispatcher* find_dispatcher (CORBA::ULong request_id);
-  // Find the Reply Dispatcher.
-  
-  // virtual TAO_InputCDR *get_cdr_stream (void);
-  // Return the preallocated CDR stream.
-  
-  virtual void set_cdr_stream (TAO_InputCDR *cdr);
-  // Set the CDR stream.
-
-  // virtual TAO_InputCDR *cdr_stream (void);
-  // Get the CDR stream.
-
-  virtual void destroy_cdr_stream (void);
-  // NO-OP function.
-
-protected:
-  CORBA::ULong request_id_;
-  // Request id for the current request.
-  
-  TAO_IIOP_Reply_Dispatcher *rd_;
-  // Reply Dispatcher corresponding to the request. 
-};  
-#endif /* IIOP_RMS_H */