Fri Mar 10 18:56:25 2000 Pradeep Gore <pradeep@flamenco.cs.wustl.edu>

13 files changed, 0 insertions, 886 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.cpp
deleted file mode 100644
index f8364b70127..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-
-#ifndef ID_POOL_T_C
-#define ID_POOL_T_C
-
-#include "ID_Pool_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "ID_Pool_T.i"
-#endif /* __ACE_INLINE__ */
-
-// @@ Pradeep: please complete the implementation,
-template <class ID_TYPE> void
-ID_Pool<ID_TYPE>::put (ID_TYPE /* id */)
-{
-  // TBD:
-}
-
-template <class ID_TYPE> ID_TYPE
-ID_Pool<ID_TYPE>::get (void)
-{
-   return ++id_;
-}
-
-#endif /* ID_POOL_T_C */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.h b/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.h
deleted file mode 100644
index 9953b9a2a9c..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   ID_Pool_T.h
-//
-// = DESCRIPTION
-//   A class to generate ID's and recycle them.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
-
-#ifndef ID_POOL_T_H
-#define ID_POOL_T_H
-
-// Need this to get ACE macros
-// @@ Pradeep, we *never* #include this directly, use ace/OS.h
-// instead.
-#include "ace/config.h"
-
-  // @@ Pradeep: ID_Pool should have some prefix, TAO_Notify or
-  // something similar.
-template <class ID_TYPE>
-class ID_Pool
-{
-  // = TITLE
-  //   ID_Pool
-  // = DESCRIPTION
-  //   This class is used by factories that need to associate id's with the
-  //   objects that they create.When the objects are destroyed, these id's
-  //   can be reused, hence the need to recycle.
-  //
-
-  // @@ Pradeep: fix the indentation, leave some blank lines, in
-  // general make this stuff more readable.
- public:
-  ID_TYPE get (void);
-  // Returns a new or recycled ID
-
-  void put (ID_TYPE id);
-  // Put an ID back so that it might be recycled.
- private:
-  ID_TYPE id_;
-};
-
-#if defined (__ACE_INLINE__)
-#include "ID_Pool_T.i"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ID_Pool_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("ID_Pool.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* ID_POOL_T_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.i b/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.i
deleted file mode 100644
index 166c9e2f6d0..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/ID_Pool_T.i
+++ /dev/null
@@ -1,5 +0,0 @@
-/* -*- C++ -*- $Id$ */
-
-
-
-
diff --git a/TAO/orbsvcs/orbsvcs/Notify/NotifyPublish_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/NotifyPublish_i.cpp
deleted file mode 100644
index ee9e96a5031..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/NotifyPublish_i.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* -*- C++ -*- $Id$ */
-#include "orbsvcs/orbsvcs/Notify/NotifyPublish_i.h"
-
-// Implementation skeleton constructor
-TAO_NotifyPublish_i::TAO_NotifyPublish_i (void)
-{
-}
-
-// Implementation skeleton destructor
-TAO_NotifyPublish_i::~TAO_NotifyPublish_i (void)
-{
-}
-
-void TAO_NotifyPublish_i::offer_change (
-                                        const CosNotification::EventTypeSeq & /*added */,
-                                        const CosNotification::EventTypeSeq & /*removed*/,
-                                        CORBA::Environment & //ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosNotifyComm::InvalidEventType
-  ))
-{
-  //Add your implementation here
-}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/NotifyPublish_i.h b/TAO/orbsvcs/orbsvcs/Notify/NotifyPublish_i.h
deleted file mode 100644
index 36f067582d4..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/NotifyPublish_i.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   NotifyPublish_i.h
-//
-// = DESCRIPTION
-//
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
-
-#ifndef NOTIFYPUBLISH_I_H
-#define NOTIFYPUBLISH_I_H
-
-#include "orbsvcs/orbsvcs/CosNotifyCommS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-// @@ Pradeep: it seems like this is not implemented, could you please
-// add a comment stating so? Or is this something that the application
-// must provide.  If the latter, then why do you implement one?
-
-class TAO_ORBSVCS_Export TAO_NotifyPublish_i :
-public virtual POA_CosNotifyComm::NotifyPublish
-{
-public:
-  // = TITLE
-  //   TAO_NotifyPublish_i
-  // = DESCRIPTION
-  //
-  //
-
-  TAO_NotifyPublish_i (void);
-  // Constructor
-
-  virtual ~TAO_NotifyPublish_i (void);
-  // Destructor
-
-virtual void offer_change (
-    const CosNotification::EventTypeSeq & added,
-    const CosNotification::EventTypeSeq & removed,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosNotifyComm::InvalidEventType
-  ));
-};
-
-#endif /* NOTIFYPUBLISH_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/NotifySubscribe_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/NotifySubscribe_i.cpp
deleted file mode 100644
index c091240474a..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/NotifySubscribe_i.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-/* -*- C++ -*- $Id$ */
-#include "orbsvcs/orbsvcs/Notify/NotifySubscribe_i.h"
-
-// Implementation skeleton constructor
-TAO_NotifySubscribe_i::TAO_NotifySubscribe_i (void)
-{
-}
-
-// Implementation skeleton destructor
-TAO_NotifySubscribe_i::~TAO_NotifySubscribe_i (void)
-{
-}
-
-void TAO_NotifySubscribe_i::subscription_change (
-                                                 const CosNotification::EventTypeSeq & /*added*/,
-                                                 const CosNotification::EventTypeSeq & /*removed*/,
-                                                 CORBA::Environment & //ACE_TRY_ENV
-                                                 )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosNotifyComm::InvalidEventType
-  ))
-{
-  //Add your implementation here
-}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/NotifySubscribe_i.h b/TAO/orbsvcs/orbsvcs/Notify/NotifySubscribe_i.h
deleted file mode 100644
index b43051c6b2b..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/NotifySubscribe_i.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   NotifySubscribe_i.h
-//
-// = DESCRIPTION
-//
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
-
-// @@ Pradeep: please make sure that you use unique names for these
-// #define, for example TAO_NOTIFY_NOTIFY_SUBSCRIBE_H...
-
-#ifndef NOTIFYSUBSCRIBE_H
-#define NOTIFYSUBSCRIBE_H
-
-#include "orbsvcs/orbsvcs/CosNotifyCommS.h"
-
-// @@ Pradeep: be consistent with your use of #pragma once and similar
-// things!
-
-// @@ Pradeep: it seems like this is not implemented, could you please
-// add a comment stating so? Or is this something that the application
-// must provide.  If the latter, then why do you implement one?
-
-class TAO_ORBSVCS_Export TAO_NotifySubscribe_i : public virtual POA_CosNotifyComm::NotifySubscribe
-{
-  // = TITLE
-  //   TAO_NotifySubscribe_i
-  // = DESCRIPTION
-  //
-  //
-
-public:
-  //Constructor
-  TAO_NotifySubscribe_i (void);
-
-  //Destructor
-  virtual ~TAO_NotifySubscribe_i (void);
-
-virtual void subscription_change (
-    const CosNotification::EventTypeSeq & added,
-    const CosNotification::EventTypeSeq & removed,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosNotifyComm::InvalidEventType
-  ));
-
-};
-
-#endif /* NOTIFYSUBSCRIBE_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Dispatcher.cpp
deleted file mode 100644
index 59b61a852cd..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Dispatcher.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/* -*- C++ -*- $Id$ */
-
-#include "Notify_Dispatcher.h"
-#include "ace/CORBA_macros.h"
-#include "orbsvcs/orbsvcs/CosNotifyCommC.h" // i get some errors with env otherwise
-#include "Notify_FilterAdmin_i.h"
-
-TAO_Notify_Dispatcher::TAO_Notify_Dispatcher (void)
-  :filter_admin_ (0)
-{
-}
-
-TAO_Notify_Dispatcher::~TAO_Notify_Dispatcher ()
-{
-}
-
-TAO_Notify_Dispatcher*
-TAO_Notify_Dispatcher::create (CORBA::Environment &ACE_TRY_ENV)
-{
-  // just return the reactive dispatcher for now.
-  // TODO: use the service configurator to allow the user to specify
-  // which dispatcher to use and where.
-  // @@ Should we have a factory instead?
-  //
-  TAO_Notify_Dispatcher* dispatcher;
-  ACE_NEW_THROW_EX (dispatcher,
-                    Notify_Reactive_Dispatcher (),
-                    CORBA::NO_MEMORY());
-  return dispatcher;
-}
-
-void
-TAO_Notify_Dispatcher::set_FilterAdmin (TAO_Notify_FilterAdmin_i* filter_admin)
-{
-  filter_admin_ = filter_admin;
-}
-
-int
-TAO_Notify_Dispatcher::add_dispatcher (TAO_Notify_Dispatcher& dispatcher)
-{
-  return contained_.insert (&dispatcher);
-}
-
-int
-TAO_Notify_Dispatcher::remove_dispatcher (TAO_Notify_Dispatcher& dispatcher)
-{
-  return contained_.remove (&dispatcher);
-}
-
-void
-Notify_Reactive_Dispatcher::dispatch_event (const CORBA::Any & data,
-                                            CORBA::Environment &ACE_TRY_ENV)
-{
-  // @@ Pradeep: here is where all kinds of things can go wrong with
-  // concurrency, please check the documentation of the RTEC for more
-  // details.
-
-  // TODO: Filtering comes here..
-
-  DISPATCHER_SET_ITER iter (contained_);
-  TAO_Notify_Dispatcher **p_dispatcher;
-
-  for (iter.first ();iter.done () != 1;iter.advance ())
-    {
-      if (iter.next (p_dispatcher) == 0)
-        break;
-      (*p_dispatcher)->dispatch_event (data, ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-}
-
-void
-Notify_Reactive_Dispatcher::dispatch_event (
-                                            const CosNotification::StructuredEvent& event,
-                                            CORBA::Environment &ACE_TRY_ENV)
-{
-  if (filter_admin_ != 0)
-    {
-      CORBA::Boolean truth =
-        filter_admin_->match_structured (event, ACE_TRY_ENV);
-      ACE_CHECK;
-
-      if (truth == 0)
-        return; // don't propogate the event further out.
-    }
-
-  DISPATCHER_SET_ITER iter (contained_);
-  TAO_Notify_Dispatcher **p_dispatcher;
-
-  for (iter.first ();iter.done () != 1;iter.advance ())
-    {
-      if (iter.next (p_dispatcher) == 0)
-        break;
-      (*p_dispatcher)->dispatch_event (event, ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Unbounded_Set<TAO_Notify_Dispatcher *>;
-template class ACE_Unbounded_Set_Iterator<TAO_Notify_Dispatcher *>;
-template class ACE_Node <TAO_Notify_Dispatcher *>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Unbounded_Set<TAO_Notify_Dispatcher *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Notify_Dispatcher *>;
-#pragma instantiate ACE_Node <TAO_Notify_Dispatcher *>
-#endif
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Dispatcher.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Dispatcher.h
deleted file mode 100644
index 6026c420fd3..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Dispatcher.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   Notify_Dispatcher.h
-//
-// = DESCRIPTION
-//   Various dispatching strategies are defined here.
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
-
-#ifndef NOTIFY_DISPATCHER_H_
-#define NOTIFY_DISPATCHER_H_
-
-#include "ace/Containers.h"
-#include "tao/corbafwd.h"
-#include "orbsvcs/orbsvcs/CosNotifyCommC.h"
-
-class TAO_Notify_FilterAdmin_i;
-
-class TAO_ORBSVCS_Export TAO_Notify_Dispatcher
-{
-  // = TITLE
-  //   TAO_Notify_Dispatcher
-  // = DESCRIPTION
-  //   This is a base class for for different kinds of dispatching schemes.
-  //   Dispatchers will have an internel criteria which will determine *if*
-  //   (i,e. filtering) and *when* (i,e. qos) events will be forwarded to
-  //   contained Dispatchers.
-
- public:
-  // = Initialization and termination
-  TAO_Notify_Dispatcher (void);
-  // Constructor
-
-  virtual ~TAO_Notify_Dispatcher (void);
-  // Destructor
-
-  static TAO_Notify_Dispatcher* create (CORBA::Environment &ACE_TRY_ENV);
-  // Factory method to create dispatchers of various types.
-
-  void set_FilterAdmin (TAO_Notify_FilterAdmin_i* filter_admin);
-  // Set the filter admin for this dispatcher.
-
-  // = Clients of this class should call these methods to dispatch events.
-  virtual void dispatch_event (const CORBA::Any & data,
-                               CORBA::Environment &ACE_TRY_ENV) = 0;
-
-  virtual void dispatch_event (const CosNotification::StructuredEvent& event,
-                               CORBA::Environment &ACE_TRY_ENV) = 0;
-
-  int add_dispatcher (TAO_Notify_Dispatcher& dispatcher);
-  // Add a dispatcher to an internal list of event recipients.
-
-  int remove_dispatcher (TAO_Notify_Dispatcher& dispatcher);
-  //Remove a dispatcher from the internal list.
-
- protected:
-  TAO_Notify_FilterAdmin_i* filter_admin_;
-
-  typedef ACE_Unbounded_Set<TAO_Notify_Dispatcher*> DISPATCHER_SET;
-  typedef ACE_Unbounded_Set_Iterator<TAO_Notify_Dispatcher*>
-    DISPATCHER_SET_ITER;
-
-  DISPATCHER_SET contained_;
-  // Dispatchers forward events to their "contained" dispatchers.
-};
-
-class TAO_ORBSVCS_Export Notify_Reactive_Dispatcher : public TAO_Notify_Dispatcher
-{
-  // = TITLE
-  //
-  // = DESCRIPTION
-  //   Simplest dispatcher - dispatches event in the callers thread.
-  //
-  virtual void dispatch_event (const CORBA::Any & data,
-                               CORBA::Environment &ACE_TRY_ENV);
-
-  virtual void dispatch_event (const CosNotification::StructuredEvent& event,
-                               CORBA::Environment &ACE_TRY_ENV);
-};
-
-#endif /* NOTIFY_DISPATCHER_H_ */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_i.cpp
deleted file mode 100644
index de2d77918ee..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_i.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- C++ -*- $Id$ */
-
-#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_i.h"
-#include "orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h"
-
-// Implementation skeleton constructor
-TAO_Notify_ProxyConsumer_i::TAO_Notify_ProxyConsumer_i
-(TAO_Notify_SupplierAdmin_i &myadmin)
-  :myadmin_ (myadmin)
-{
-}
-
-// Implementation skeleton destructor
-TAO_Notify_ProxyConsumer_i::~TAO_Notify_ProxyConsumer_i (void)
-{
-}
-
-void
-TAO_Notify_ProxyConsumer_i::init (CORBA::Environment & /* ACE_TRY_ENV */)
-{
-}
-
-CosNotifyChannelAdmin::ProxyType TAO_Notify_ProxyConsumer_i::MyType (
-    CORBA::Environment & /* ACE_TRY_ENV */
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-
-  {
-    //Add your implementation here
-    return (CosNotifyChannelAdmin::ProxyType) 0;
-  }
-
-CosNotifyChannelAdmin::SupplierAdmin_ptr TAO_Notify_ProxyConsumer_i::MyAdmin (
-    CORBA::Environment & /* ACE_TRY_ENV */
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-
-  {
-    //Add your implementation here
-    return 0;
-  }
-
-CosNotification::EventTypeSeq * TAO_Notify_ProxyConsumer_i::obtain_subscription_types (
-    CosNotifyChannelAdmin::ObtainInfoMode /* mode */,
-    CORBA::Environment & /* ACE_TRY_ENV */
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-
-  {
-    //Add your implementation here
-    return 0;
-  }
-
-void TAO_Notify_ProxyConsumer_i::validate_event_qos (
-    const CosNotification::QoSProperties & /* required_qos */,
-    CosNotification::NamedPropertyRangeSeq_out /* available_qos */,
-    CORBA::Environment & /* ACE_TRY_ENV */
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosNotification::UnsupportedQoS
-  ))
-
-  {
-    //Add your implementation here
-  }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_i.h
deleted file mode 100644
index 8d8d11ecda0..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_i.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//   Notify_ProxyConsumer_i.h
-//
-// = DESCRIPTION
-//
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
-
-#ifndef NOTIFY_PROXYCONSUMER_I_H
-#define NOTIFY_PROXYCONSUMER_I_H
-
-#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h"
-#include "orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h"
-
-class TAO_Notify_SupplierAdmin_i;
-
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_ORBSVCS_Export TAO_Notify_ProxyConsumer_i :
-public virtual POA_CosNotifyChannelAdmin::ProxyConsumer,
-  public virtual TAO_Notify_QoSAdmin_i,
-  public virtual TAO_Notify_FilterAdmin_i
-{
-  // = TITLE
-  //   TAO_Notify_ProxyConsumer_i
-  // = DESCRIPTION
-  //
-  //
-
-public:
-  //Constructor
-  TAO_Notify_ProxyConsumer_i (TAO_Notify_SupplierAdmin_i &myadmin);
-
-  //Destructor
-  virtual ~TAO_Notify_ProxyConsumer_i (void);
-
-  virtual void init (CORBA::Environment &ACE_TRY_ENV);
-  //
-
-  virtual CosNotifyChannelAdmin::ProxyConsumer_ptr get_ref (CORBA::Environment &ACE_TRY_ENV) = 0;
-  //
-
-  virtual CosNotifyChannelAdmin::ProxyType MyType (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
-
-virtual CosNotifyChannelAdmin::SupplierAdmin_ptr MyAdmin (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
-
-virtual CosNotification::EventTypeSeq * obtain_subscription_types (
-    CosNotifyChannelAdmin::ObtainInfoMode mode,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
-
-virtual void validate_event_qos (
-    const CosNotification::QoSProperties & required_qos,
-    CosNotification::NamedPropertyRangeSeq_out available_qos,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosNotification::UnsupportedQoS
-  ));
-
-protected:
-  TAO_Notify_SupplierAdmin_i &myadmin_;
-  //
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#endif /* NOTIFY_PROXYCONSUMER_I_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_i.cpp
deleted file mode 100644
index e376662b0eb..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_i.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/* -*- C++ -*- $Id$ */
-#include "orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_i.h"
-#include "orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h"
-
-// Implementation skeleton constructor
-TAO_Notify_ProxySupplier_i::TAO_Notify_ProxySupplier_i
-(TAO_Notify_ConsumerAdmin_i &myadmin)
-  :myadmin_(myadmin)
-{
-}
-
-// Implementation skeleton destructor
-TAO_Notify_ProxySupplier_i::~TAO_Notify_ProxySupplier_i (void)
-{
-}
-
-void
-TAO_Notify_ProxySupplier_i::init (CORBA::Environment & /*ACE_TRY_ENV*/)
-{
-}
-
-CosNotifyChannelAdmin::ProxyType TAO_Notify_ProxySupplier_i::MyType (
-                                                                     CORBA::Environment & //ACE_TRY_ENV
-                                                                     )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-
-  {
-    //Add your implementation here
-    return (CosNotifyChannelAdmin::ProxyType) 0;
-  }
-
-CosNotifyChannelAdmin::ConsumerAdmin_ptr TAO_Notify_ProxySupplier_i::MyAdmin (
-                                                                              CORBA::Environment & //ACE_TRY_ENV
-                                                                              )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-
-  {
-    //Add your implementation here
-    return 0;
-  }
-
-CosNotifyFilter::MappingFilter_ptr TAO_Notify_ProxySupplier_i::priority_filter (
-                                                                                CORBA::Environment & /*ACE_TRY_ENV*/
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-
-  {
-    //Add your implementation here
-    return 0;
-  }
-
-void TAO_Notify_ProxySupplier_i::priority_filter (
-                                                  CosNotifyFilter::MappingFilter_ptr /*priority_filter*/,
-                                                  CORBA::Environment & //ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-
-  {
-    //Add your implementation here
-  }
-
-CosNotifyFilter::MappingFilter_ptr TAO_Notify_ProxySupplier_i::lifetime_filter (
-                                                                                CORBA::Environment & //ACE_TRY_ENV
-                                                                                )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
-
-  {
-    //Add your implementation here
-    return 0;
-  }
-
-void TAO_Notify_ProxySupplier_i::lifetime_filter (
-                                                  CosNotifyFilter::MappingFilter_ptr /*lifetime_filter */,
-                                                  CORBA::Environment & //ACE_TRY_ENV
-                                                  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-
-  {
-    //Add your implementation here
-  }
-
-CosNotification::EventTypeSeq*
-TAO_Notify_ProxySupplier_i::obtain_offered_types (
-                                                  CosNotifyChannelAdmin::ObtainInfoMode /*mode */,
-                                                  CORBA::Environment & //ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException
-                   ))
-  
-{
-  //Add your implementation here
-  return 0;
-}
-
-void TAO_Notify_ProxySupplier_i::validate_event_qos (
-                                                     const CosNotification::QoSProperties & /*required_qos */,
-                                                     CosNotification::NamedPropertyRangeSeq_out /*available_qos*/,
-                                                     CORBA::Environment & //ACE_TRY_ENV
-                                                     )
-  ACE_THROW_SPEC ((
-                   CORBA::SystemException,
-                   CosNotification::UnsupportedQoS
-                   ))
-
-  {
-    //Add your implementation here
-  }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_i.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_i.h
deleted file mode 100644
index 2622b35416f..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_i.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   orbsvcs
-//
-// = FILENAME
-//
-//
-// = DESCRIPTION
-//
-//
-// = AUTHOR
-//    Pradeep Gore <pradeep@cs.wustl.edu>
-//
-// ==========================================================================
-
-#ifndef TAO_NOTIFY_PROXYSUPPLIER_H
-#define TAO_NOTIFY_PROXYSUPPLIER_H
-
-#include "orbsvcs/orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.h"
-#include "orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h"
-#include "ace/Auto_Ptr.h"
-#include "Notify_Dispatcher.h"
-
-class TAO_Notify_ConsumerAdmin_i;
-
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class TAO_ORBSVCS_Export TAO_Notify_ProxySupplier_i :
-public virtual POA_CosNotifyChannelAdmin::ProxySupplier,
-public virtual TAO_Notify_QoSAdmin_i,
-public virtual TAO_Notify_FilterAdmin_i,
-public TAO_Notify_Dispatcher
-{
-  // = TITLE
-  //   TAO_Notify_ProxySupplier_i
-  // = DESCRIPTION
-  //
-  //
-
-public:
-  //Constructor
-  TAO_Notify_ProxySupplier_i (TAO_Notify_ConsumerAdmin_i &myadmin);
-
-  //Destructor
-  virtual ~TAO_Notify_ProxySupplier_i (void);
-
-  virtual void init (CORBA::Environment &ACE_TRY_ENV);
-  //
-
-  virtual CosNotifyChannelAdmin::ProxySupplier_ptr get_ref (CORBA::Environment &ACE_TRY_ENV) = 0;
-
-  virtual CosNotifyChannelAdmin::ProxyType MyType (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
-
-virtual CosNotifyChannelAdmin::ConsumerAdmin_ptr MyAdmin (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
-
-virtual CosNotifyFilter::MappingFilter_ptr priority_filter (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
-
-virtual void priority_filter (
-    CosNotifyFilter::MappingFilter_ptr priority_filter,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
-
-virtual CosNotifyFilter::MappingFilter_ptr lifetime_filter (
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
-
-virtual void lifetime_filter (
-    CosNotifyFilter::MappingFilter_ptr lifetime_filter,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
-
-virtual CosNotification::EventTypeSeq * obtain_offered_types (
-    CosNotifyChannelAdmin::ObtainInfoMode mode,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ));
-
-virtual void validate_event_qos (
-    const CosNotification::QoSProperties & required_qos,
-    CosNotification::NamedPropertyRangeSeq_out available_qos,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException,
-    CosNotification::UnsupportedQoS
-  ));
-protected:
-  TAO_Notify_ConsumerAdmin_i &myadmin_;
-  //
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#endif /* TAO_NOTIFY_PROXYSUPPLIER_H */