summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/orbsvcs/CosEvent
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/CosEvent')
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.cpp37
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h57
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.cpp61
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h68
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp132
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h58
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp119
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h48
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.cpp38
-rw-r--r--TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h56
10 files changed, 0 insertions, 674 deletions
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.cpp
deleted file mode 100644
index 7c087478c0a..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-// $Id$
-//
-#include "CosEvent/ConsumerAdmin_i.h"
-
-ConsumerAdmin_i::ConsumerAdmin_i (const RtecEventChannelAdmin::ConsumerQOS &qos,
- RtecEventChannelAdmin::ConsumerAdmin_ptr
- rtec_consumeradmin)
- : qos_ (qos),
- rtec_consumeradmin_(RtecEventChannelAdmin::ConsumerAdmin::_duplicate (rtec_consumeradmin))
-{
-}
-
-ConsumerAdmin_i::~ConsumerAdmin_i ()
-{
- CORBA::release (this->rtec_consumeradmin_);
-}
-
-CosEventChannelAdmin::ProxyPushSupplier_ptr
-ConsumerAdmin_i::obtain_push_supplier (CORBA::Environment &TAO_TRY_ENV)
-{
- RtecEventChannelAdmin::ProxyPushSupplier_ptr rtecproxypushsupplier =
- this->rtec_consumeradmin_->obtain_push_supplier (TAO_TRY_ENV);
-
- TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, 0);
-
- ProxyPushSupplier_i *pps =
- new ProxyPushSupplier_i (this->qos_, rtecproxypushsupplier);
-
- return pps->_this (TAO_TRY_ENV);
-}
-
-CosEventChannelAdmin::ProxyPullSupplier_ptr
-ConsumerAdmin_i::obtain_pull_supplier (CORBA::Environment &TAO_TRY_ENV)
-{
- // TODO: implement this.
- return 0;
-}
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h
deleted file mode 100644
index 3180e774e64..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ConsumerAdmin_i.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-// TAO services
-//
-// = FILENAME
-// ConsumerAdmin_i
-//
-// = AUTHOR
-// Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// = DESCRIPTION
-// This has the implementation of the CosEventChannelAdmin::ConsumerAdmin interface.
-// ============================================================================
-
-
-#if !defined (_CONSUMERADMIN_I_H)
-#define _CONSUMERADMIN_I_H
-
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
-#include "orbsvcs/CosEvent/ProxyPushSupplier_i.h"
-
-class ConsumerAdmin_i : public POA_CosEventChannelAdmin::ConsumerAdmin
-{
- // = TITLE
- // class ConsumerAdmin_i implements the ConsumerAdmin interface.
- // = DESCRIPTION
- // This implementation of the ConsumerAdmin uses the RtecEventChannelAdmin::ConsumerAdmin.
- //
-public:
- // = Initialization and termination methods.
- ConsumerAdmin_i (const RtecEventChannelAdmin::ConsumerQOS &consumerqos,
- RtecEventChannelAdmin::ConsumerAdmin_ptr rtec_consumeradmin);
-
- ~ConsumerAdmin_i ();
-
- virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
- obtain_push_supplier(CORBA::Environment &TAO_TRY_ENV);
- // returns a new ProxyPushSupplier_ptr.
-
- virtual CosEventChannelAdmin::ProxyPullSupplier_ptr
- obtain_pull_supplier(CORBA::Environment &TAO_TRY_ENV);
- // returns a new ProxyPullSupplier_ptr.
-
-private:
- const RtecEventChannelAdmin::ConsumerQOS &qos_;
- // The ConsumerQOS specified by the user of this class.
-
- RtecEventChannelAdmin::ConsumerAdmin_ptr rtec_consumeradmin_;
- // The RtecEventChannelAdmin::ConsumerAdmin specified by the user of this class.
-};
-
-#endif //_CONSUMERADMIN_I_H
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.cpp
deleted file mode 100644
index ddd2858b631..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-// $Id$
-#include "EventChannel_i.h"
-
-EventChannel_i::EventChannel_i(const RtecEventChannelAdmin::ConsumerQOS &consumerqos,
- const RtecEventChannelAdmin::SupplierQOS &supplierqos,
- RtecEventChannelAdmin::ConsumerAdmin_ptr rtec_consumeradmin,
- RtecEventChannelAdmin::SupplierAdmin_ptr rtec_supplieradmin)
- : consumer_admin_ (consumerqos, rtec_consumeradmin),
- supplier_admin_ (supplierqos, rtec_supplieradmin),
- consumeradmin_ (0),
- supplieradmin_ (0)
-{
-
-}
-
-EventChannel_i::~EventChannel_i ()
-{
- //No-Op.
-}
-
-int
-EventChannel_i::init (CORBA::Environment &TAO_TRY_ENV)
-{
- this->consumeradmin_ = consumer_admin_._this (TAO_TRY_ENV);
- TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
-
- this->supplieradmin_ = supplier_admin_._this (TAO_TRY_ENV);
- TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, -1);
-
- return 0;
-}
-
-CosEventChannelAdmin::ConsumerAdmin_ptr
-EventChannel_i::for_consumers (CORBA::Environment &TAO_TRY_ENV)
-{
- return this->consumeradmin_;
-}
-
-CosEventChannelAdmin::SupplierAdmin_ptr
-EventChannel_i::for_suppliers (CORBA::Environment &TAO_TRY_ENV)
-{
- return this->supplieradmin_;
-}
-
-void
-EventChannel_i::destroy (CORBA::Environment &TAO_TRY_ENV)
-{
- // Deactivate the CosEventChannel
- PortableServer::POA_var poa = this->_default_POA (TAO_TRY_ENV);
-
- TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
-
- PortableServer::ObjectId_var id = poa->servant_to_id (this, TAO_TRY_ENV);
-
- TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
-
- poa->deactivate_object (id.in (), TAO_TRY_ENV);
- TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
-
- delete this;
-}
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h
deleted file mode 100644
index f5ba3702748..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosEvent/EventChannel_i.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-// TAO services
-//
-// = FILENAME
-// EventChannel_i
-//
-// = AUTHOR
-// Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// = DESCRIPTION
-// This has the implementation of the CosEventChannelAdmin::EventChannel interface.
-// ============================================================================
-
-#if !defined (_EVENTCHANNEL_I_H)
-#define _EVENTCHANNEL_I_H
-
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
-#include "orbsvcs/CosEvent/ConsumerAdmin_i.h"
-#include "orbsvcs/CosEvent/SupplierAdmin_i.h"
-
-class EventChannel_i : public POA_CosEventChannelAdmin::EventChannel
-{
- // = TITLE
- // class EventChannel-i implements the EventChannel interface.
- // = DESCRIPTION
- // The Cos EventChannel is based on the Real time event channel.
- // This EventChannel_i implementation delegates all its responsibility to
- // corresponding objects from the real time implementation.
- //
-public:
- // = Initialization and termination methods.
- EventChannel_i (const RtecEventChannelAdmin::ConsumerQOS &consumerqos,
- const RtecEventChannelAdmin::SupplierQOS &supplierqos,
- RtecEventChannelAdmin::ConsumerAdmin_ptr rtec_consumeradmin,
- RtecEventChannelAdmin::SupplierAdmin_ptr rtec_supplieradmin);
- // Initializes the data members.
-
- ~EventChannel_i ();
- // deactivates the EventChannel.
-
- int init (CORBA::Environment &TAO_TRY_ENV);
- // activates the ConsumerAdmin and SupplierAdmin servants.
- // returns -1 on error, 0 on success.
-
- virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (CORBA::Environment &TAO_TRY_ENV);
- // The for_consumers method will return the same ConsumerAdmin_ptr everytime its called.
-
- virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (CORBA::Environment &TAO_TRY_ENV);
- // The for_suppliers method will return the same SupplierAdmin_ptr everytime its called.
-
- virtual void destroy (CORBA::Environment &TAO_TRY_ENV);
- // destroys this object.
-
-private:
- ConsumerAdmin_i consumer_admin_;
- SupplierAdmin_i supplier_admin_;
-
- CosEventChannelAdmin::ConsumerAdmin_ptr consumeradmin_ ;
- CosEventChannelAdmin::SupplierAdmin_ptr supplieradmin_;
-};
-
-#endif //_EVENTCHANNEL_I_H
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp
deleted file mode 100644
index 5bf49f62c15..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-#include "orbsvcs/Event_Utilities.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
-#include "orbsvcs/RtecEventCommS.h"
-#include "orbsvcs/CosEventCommS.h"
-#include "CosEvent/ProxyPushConsumer_i.h"
-
-class PushSupplierWrapper : public POA_RtecEventComm::PushSupplier
-{
- // = TITLE
- // A Wrapper for the Rtec PushSupplier.
- // = DESCRIPTION
- // The Rtec ProxyPushConsumer uses a Rtec PushSupplier.
- // This class wraps the Cos PushSupplier to make it look like a Rtec PushSupplier.
-public:
- // = Initialization and termination methods.
- PushSupplierWrapper (CosEventComm::PushSupplier_ptr supplier);
-
- ~PushSupplierWrapper ();
-
- virtual void disconnect_push_supplier (CORBA::Environment &TAO_TRY_ENV);
- // disconnects the push supplier.
-private:
- CosEventComm::PushSupplier_ptr supplier_;
- // The Cos PushSupplier that we're proxying for.
-};
-
-PushSupplierWrapper::PushSupplierWrapper
-(CosEventComm::PushSupplier_ptr supplier)
- : supplier_ (CosEventComm::PushSupplier::_duplicate (supplier))
-{
-}
-
-PushSupplierWrapper::~PushSupplierWrapper ()
-{
- CORBA::release (supplier_);
-}
-
-void
-PushSupplierWrapper::disconnect_push_supplier (CORBA::Environment &TAO_TRY_ENV)
-{
- this->supplier_->disconnect_push_supplier (TAO_TRY_ENV);
-
- // Deactivate the supplier proxy
- PortableServer::POA_var poa =
- this->_default_POA (TAO_TRY_ENV);
-
- TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
-
- PortableServer::ObjectId_var id =
- poa->servant_to_id (this, TAO_TRY_ENV);
- TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
-
- poa->deactivate_object (id.in (), TAO_TRY_ENV);
- TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
-
- // @@ If we keep a list remember to remove this object from the list.
- delete this;
-};
-
-ProxyPushConsumer_i::ProxyPushConsumer_i (const RtecEventChannelAdmin::SupplierQOS &qos, RtecEventChannelAdmin::ProxyPushConsumer_ptr ppc)
- : qos_ (qos),
- ppc_ (ppc)
-{
-}
-
-ProxyPushConsumer_i::~ProxyPushConsumer_i ()
-{
-}
-
-void
-ProxyPushConsumer_i::push (const CORBA::Any &data,
- CORBA::Environment &TAO_TRY_ENV)
-{
- RtecEventComm::EventSet events (1);
- events.length (1);
-
- RtecEventComm::Event& e = events[0];
- // TODO: fill this..
- //e.header.source = ECB_SupplierID_Test::SUPPLIER_ID;
- e.header.source = 1;
- e.header.ttl = 1;
- // TODO: fill this..
- e.header.type = ACE_ES_EVENT_ANY;
-
- ACE_hrtime_t t = ACE_OS::gethrtime ();
- ORBSVCS_Time::hrtime_to_TimeT (e.header.creation_time, t);
- e.header.ec_recv_time = ORBSVCS_Time::zero;
- e.header.ec_send_time = ORBSVCS_Time::zero;
-
- e.data.any_value = data;
-
- this->ppc_->push (events, TAO_TRY_ENV);
-}
-
-void
-ProxyPushConsumer_i::disconnect_push_consumer (CORBA::Environment &TAO_TRY_ENV)
-{
- this->ppc_->disconnect_push_consumer (TAO_TRY_ENV);
-
- // Deactivate the ProxyPushConsumer
- PortableServer::POA_var poa =
- this->_default_POA (TAO_TRY_ENV);
-
- TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
-
- PortableServer::ObjectId_var id =
- poa->servant_to_id (this, TAO_TRY_ENV);
- TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
-
- poa->deactivate_object (id.in (), TAO_TRY_ENV);
- TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
-
- delete this;
-}
-
-void
-ProxyPushConsumer_i::connect_push_supplier (CosEventComm::PushSupplier_ptr push_supplier, CORBA::Environment &TAO_TRY_ENV)
-{
- //if (this->connected ())
- //TAO_THROW (EventChannelAdmin::AlreadyConnected());
-
- // Implements the RtecEventSupplier interface
- PushSupplierWrapper *wrapper = new PushSupplierWrapper(push_supplier);
-
- this->ppc_->connect_push_supplier (wrapper->_this (TAO_TRY_ENV),
- this->qos_,
- TAO_TRY_ENV);
-}
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h
deleted file mode 100644
index 266b62bfb47..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushConsumer_i.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-// TAO services
-//
-// = FILENAME
-// ProxyPushConsumer_i
-//
-// = AUTHOR
-// Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// = DESCRIPTION
-// This has the implementation of the CosEventChannelAdmin::ProxyPushConsumer interface.
-// ======================================================================================
-
-#if !defined (_PROXYPUSHCONSUMER_H)
-#define _PROXYPUSHCONSUMER_H
-
-#include "orbsvcs/RtecEventChannelAdminS.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
-
-class ProxyPushConsumer_i : public
-POA_CosEventChannelAdmin::ProxyPushConsumer
-{
- // = TITLE
- // class ProxyPushConsumer_i implements the ProxyPushConsumer interface.
- // = DESCRIPTION
- // This implementation of the ProxyPushConsumer uses the RtecEventChannelAdmin::ProxyPushConsumer.
- //
-public:
- // = Initialization and termination methods.
- ProxyPushConsumer_i(const RtecEventChannelAdmin::SupplierQOS &qos,
- RtecEventChannelAdmin::ProxyPushConsumer_ptr ppc);
-
- ~ProxyPushConsumer_i ();
-
- virtual void push (const CORBA::Any &data,
- CORBA::Environment &TAO_TRY_ENV);
- // Suppliers call this method to pass data to connected consumers.
-
- virtual void disconnect_push_consumer (CORBA::Environment &TAO_TRY_ENV);
- // Disconnects the supplier from the event communication.
-
- virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier,
- CORBA::Environment &TAO_TRY_ENV);
- // Connects a push supplier.
-private:
- const RtecEventChannelAdmin::SupplierQOS &qos_;
- // The SupplierQOS specified by the user of this class.
-
- RtecEventChannelAdmin::ProxyPushConsumer_ptr ppc_;
- // The Rtec ProxyPushConsumer specified by the user of this class.
-};
-
-#endif // _PROXYPUSHCONSUMER_H
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp
deleted file mode 100644
index 5465a53db85..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-// $Id$
-//
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
-#include "orbsvcs/CosEventChannelAdminS.h"
-#include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/RtecEventCommS.h"
-#include "CosEvent/ProxyPushSupplier_i.h"
-
-class PushConsumerWrapper : public POA_RtecEventComm::PushConsumer
-{
- // = TITLE
- // Wrapper class for the Rtec PushConsumer.
- // = DESCRIPTION
- // The Rtec ProxyPushSupplier uses a Rtec PushConsumer.
- // This class wraps the Cos PushConsumer to make it look like a Rtec PushConsumer.
-public:
- // = Initialization and termination methods.
- PushConsumerWrapper (CosEventComm::PushConsumer_ptr consumer);
- ~PushConsumerWrapper ();
-
- virtual void push (const RtecEventComm::EventSet & data,
- CORBA::Environment &TAO_TRY_ENV);
-
- virtual void disconnect_push_consumer (CORBA::Environment &TAO_TRY_ENV);
-private:
- CosEventComm::PushConsumer_ptr consumer_;
- // The Cos PushConsumer that we're proxying for.
-};
-
-PushConsumerWrapper::PushConsumerWrapper
-(CosEventComm::PushConsumer_ptr consumer)
- : consumer_ (CosEventComm::PushConsumer::_duplicate (consumer))
-{
-}
-
-PushConsumerWrapper::~PushConsumerWrapper ()
-{
- CORBA::release (this->consumer_);
-}
-
-void
-PushConsumerWrapper::push (const RtecEventComm::EventSet& set,
- CORBA::Environment &_env)
-{
- for (CORBA::ULong i = 0; i < set.length (); ++i)
- {
- this->consumer_->push (set[i].data.any_value,
- _env);
- }
-}
-
-void
-PushConsumerWrapper::disconnect_push_consumer (CORBA::Environment &TAO_TRY_ENV)
-{
- this->consumer_->disconnect_push_consumer (TAO_TRY_ENV);
- // Deactivate the supplier proxy
- PortableServer::POA_var poa =
- this->_default_POA (TAO_TRY_ENV);
-
- TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
-
- PortableServer::ObjectId_var id =
- poa->servant_to_id (this, TAO_TRY_ENV);
- TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
-
- poa->deactivate_object (id.in (), TAO_TRY_ENV);
- TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
-
- // @@ If we keep a list remember to remove this object from the list.
- delete this;
-}
-
-
-ProxyPushSupplier_i::ProxyPushSupplier_i
-(const RtecEventChannelAdmin::ConsumerQOS &qos,
-RtecEventChannelAdmin::ProxyPushSupplier_ptr pps)
- : qos_ (qos),
- pps_ (pps)
-{
-}
-
-ProxyPushSupplier_i::~ProxyPushSupplier_i ()
-{
-}
-
-void
-ProxyPushSupplier_i::disconnect_push_supplier (CORBA::Environment &TAO_TRY_ENV)
-{
- this->pps_->disconnect_push_supplier (TAO_TRY_ENV);
- // @@ Maybe we should do a "delete this" here? And consider POA deactivation...
-
- // Deactivate the supplier proxy
- PortableServer::POA_var poa =
- this->_default_POA (TAO_TRY_ENV);
-
- TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
-
- PortableServer::ObjectId_var id =
- poa->servant_to_id (this, TAO_TRY_ENV);
- TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
-
- poa->deactivate_object (id.in (), TAO_TRY_ENV);
- TAO_CHECK_ENV_RETURN_VOID (TAO_TRY_ENV);
-
- // @@ If we keep a list remember to remove this object from the list.
- delete this;
-}
-
-void ProxyPushSupplier_i::connect_push_consumer(
-CosEventComm::PushConsumer_ptr push_consumer, CORBA::Environment &TAO_TRY_ENV)
-{
- // Implements the RtecEventConsumer interface
- PushConsumerWrapper *wrapper = new PushConsumerWrapper(push_consumer);
-
- this->pps_->connect_push_consumer (wrapper->_this (TAO_TRY_ENV),
- this->qos_,
- TAO_TRY_ENV);
-}
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h
deleted file mode 100644
index 43a348fcef6..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-// TAO services
-//
-// = FILENAME
-// ProxyPushSupplier_i
-//
-// = AUTHOR
-// Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// = DESCRIPTION
-// This has the implementation of the CosEventChannelAdmin::ProxyPushSupplier interface.
-// ======================================================================================
-
-#if !defined (_PROXYPUSHSUPPLIER_H)
-#define _PROXYPUSHSUPPLIER_H
-
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
-
-class ProxyPushSupplier_i : public POA_CosEventChannelAdmin::ProxyPushSupplier
-{
- // = TITLE
- // class ProxyPushSupplier-i implements the ProxyPushConsumer interface.
- // = DESCRIPTION
- // This implementation of the ProxyPushSupplier uses the RtecEventChannelAdmin::ProxyPushSupplier.
- //
-public:
- // Initialization and termination methods.
- ProxyPushSupplier_i (const RtecEventChannelAdmin::ConsumerQOS &qos,
- RtecEventChannelAdmin::ProxyPushSupplier_ptr pps);
-
- ~ProxyPushSupplier_i ();
-
- virtual void disconnect_push_supplier (CORBA::Environment &TAO_TRY_ENV);
-
- virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer,
- CORBA::Environment &TAO_TRY_ENV);
-private:
- const RtecEventChannelAdmin::ConsumerQOS &qos_;
- RtecEventChannelAdmin::ProxyPushSupplier_ptr pps_;
-};
-
-#endif //_PROXYPUSHSUPPLIER_H
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.cpp
deleted file mode 100644
index ae3edeeee4d..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// $Id$
-//
-#include "CosEvent/SupplierAdmin_i.h"
-
-SupplierAdmin_i::SupplierAdmin_i(const RtecEventChannelAdmin::SupplierQOS &qos,
- RtecEventChannelAdmin::SupplierAdmin_ptr
- rtec_supplieradmin)
- :qos_ (qos),
- rtec_supplieradmin_(RtecEventChannelAdmin::SupplierAdmin::_duplicate (rtec_supplieradmin))
-{
-}
-
-SupplierAdmin_i::~SupplierAdmin_i ()
-{
- CORBA::release (this->rtec_supplieradmin_);
-}
-
-CosEventChannelAdmin::ProxyPushConsumer_ptr
-SupplierAdmin_i::obtain_push_consumer (CORBA::Environment &TAO_TRY_ENV)
-{
- RtecEventChannelAdmin::ProxyPushConsumer_ptr rtecproxypushconsumer =
- this->rtec_supplieradmin_->obtain_push_consumer (TAO_TRY_ENV);
-
- TAO_CHECK_ENV_RETURN (TAO_TRY_ENV, 0);
-
- ProxyPushConsumer_i *ppc =
- new ProxyPushConsumer_i (this->qos_, rtecproxypushconsumer);
-
- return ppc->_this (TAO_TRY_ENV);
-}
-
-
-CosEventChannelAdmin::ProxyPullConsumer_ptr
-SupplierAdmin_i::obtain_pull_consumer (CORBA::Environment &TAO_TRY_ENV)
-{
- // TODO: implement this.
- return 0;
-}
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h b/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h
deleted file mode 100644
index 7d9113d6fdb..00000000000
--- a/TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-//
-// ============================================================================
-//
-// = LIBRARY
-// TAO services
-//
-// = FILENAME
-// SupplierAdmin_i
-//
-// = AUTHOR
-// Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// = DESCRIPTION
-// This has the implementation of the CosEventChannelAdmin::SupplierAdmin interface.
-// ============================================================================
-
-#if !defined (_SUPPLIERADMIN_I_H)
-#define _SUPPLIERADMIN_I_H
-
-#include "orbsvcs/RtecEventChannelAdminC.h"
-#include "orbsvcs/CosEventChannelAdminC.h"
-#include "orbsvcs/CosEvent/ProxyPushConsumer_i.h"
-
-class SupplierAdmin_i : public POA_CosEventChannelAdmin::SupplierAdmin
-{
- // = TITLE
- // class SupplierAdmin_i implements the SupplierAdmin interface.
- // = DESCRIPTION+
- // This implementation of the SupplierAdmin uses the RtecEventChannelAdmin::SupplierAdmin.
- //
-public:
- // = Initialization and termination methods.
- SupplierAdmin_i (const RtecEventChannelAdmin::SupplierQOS &qos,
- RtecEventChannelAdmin::SupplierAdmin_ptr rtec_supplieradmin);
-
- ~SupplierAdmin_i ();
-
- virtual CosEventChannelAdmin::ProxyPushConsumer_ptr
- obtain_push_consumer (CORBA::Environment &TAO_TRY_ENV);
- // Returns a new ProxyPushConsumer_ptr.
-
- virtual CosEventChannelAdmin::ProxyPullConsumer_ptr
- obtain_pull_consumer(CORBA::Environment &TAO_TRY_ENV);
- // Returns a new ProxyPullConsumer_ptr.
-
-private:
- const RtecEventChannelAdmin::SupplierQOS &qos_;
- // The SupplierQOS specified by the user of this class.
-
- RtecEventChannelAdmin::SupplierAdmin_ptr rtec_supplieradmin_;
- // The RtecEventChannelAdmin::SupplierAdmin specified by the user of this class.
-};
-
-#endif // _SUPPLIERADMIN_I_H