ChangeLogTag: Sun Jul 06 17:40:19 2003 Pradeep Gore <pradeep@oomworks.com>

12 files changed, 135 insertions, 135 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
index 991d872ed41..06d5f4f871e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
@@ -6,20 +6,20 @@
 #include "RT_StructuredProxyPushSupplier.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_NS_RT_StructuredProxyPushSupplier, "$id$")
+ACE_RCSID(Notify, TAO_Notify_RT_StructuredProxyPushSupplier, "$id$")
 
-TAO_NS_RT_StructuredProxyPushSupplier::TAO_NS_RT_StructuredProxyPushSupplier (void)
+TAO_Notify_RT_StructuredProxyPushSupplier::TAO_Notify_RT_StructuredProxyPushSupplier (void)
 {
 }
 
-TAO_NS_RT_StructuredProxyPushSupplier::~TAO_NS_RT_StructuredProxyPushSupplier ()
+TAO_Notify_RT_StructuredProxyPushSupplier::~TAO_Notify_RT_StructuredProxyPushSupplier ()
 {
 }
 
 CORBA::Object_ptr
-TAO_NS_RT_StructuredProxyPushSupplier::activate (PortableServer::Servant servant ACE_ENV_ARG_DECL)
+TAO_Notify_RT_StructuredProxyPushSupplier::activate (PortableServer::Servant servant ACE_ENV_ARG_DECL)
 {
-  CORBA::Object_var object = TAO_NS_Proxy::activate (servant ACE_ENV_ARG_PARAMETER);
+  CORBA::Object_var object = TAO_Notify_Proxy::activate (servant ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
 
   // Obtain our ref.
@@ -32,7 +32,7 @@ TAO_NS_RT_StructuredProxyPushSupplier::activate (PortableServer::Servant servant
 }
 
 void
-TAO_NS_RT_StructuredProxyPushSupplier::push (const TAO_NS_Event* event ACE_ENV_ARG_DECL)
+TAO_Notify_RT_StructuredProxyPushSupplier::push (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -43,7 +43,7 @@ TAO_NS_RT_StructuredProxyPushSupplier::push (const TAO_NS_Event* event ACE_ENV_A
     {
       if (TAO_debug_level > 2)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "(%P|%t) TAO_NS_RT_StructuredProxyPushSupplier::push failed\n");
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "(%P|%t) TAO_Notify_RT_StructuredProxyPushSupplier::push failed\n");
         }
 
     }
@@ -51,7 +51,7 @@ TAO_NS_RT_StructuredProxyPushSupplier::push (const TAO_NS_Event* event ACE_ENV_A
 }
 
 void
-TAO_NS_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_NS_Event* event ACE_ENV_ARG_DECL)
+TAO_Notify_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -62,7 +62,7 @@ TAO_NS_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_NS_Event* ev
     {
       if (TAO_debug_level > 2)
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "(%P|%t) TAO_NS_RT_StructuredProxyPushSupplier::push failed\n");
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "(%P|%t) TAO_Notify_RT_StructuredProxyPushSupplier::push failed\n");
         }
 
     }
@@ -70,13 +70,13 @@ TAO_NS_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_NS_Event* ev
 }
 
 void
-TAO_NS_RT_StructuredProxyPushSupplier::push (const TAO_NS_Event_var &event ACE_ENV_ARG_DECL)
+TAO_Notify_RT_StructuredProxyPushSupplier::push (const TAO_Notify_Event_var &event ACE_ENV_ARG_DECL)
 {
   this->push (event.get () ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_NS_Event_var &event ACE_ENV_ARG_DECL)
+TAO_Notify_RT_StructuredProxyPushSupplier::push_no_filtering (const TAO_Notify_Event_var &event ACE_ENV_ARG_DECL)
 {
   this->push_no_filtering (event.get () ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
index b3516b05ce3..7d10169b487 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_RT_STRUCTUREDPROXYPUSHSUPPLIER_H
-#define TAO_NS_RT_STRUCTUREDPROXYPUSHSUPPLIER_H
+#ifndef TAO_Notify_RT_STRUCTUREDPROXYPUSHSUPPLIER_H
+#define TAO_Notify_RT_STRUCTUREDPROXYPUSHSUPPLIER_H
 #include "ace/pre.h"
 
 #include "../rt_notify_export.h"
@@ -22,34 +22,34 @@
 #include "StructuredProxyPushSupplier.h"
 
 /**
- * @class TAO_NS_RT_StructuredProxyPushSupplier
+ * @class TAO_Notify_RT_StructuredProxyPushSupplier
  *
  * @brief
  *
  */
-class TAO_RT_Notify_Export TAO_NS_RT_StructuredProxyPushSupplier : public virtual TAO_NS_StructuredProxyPushSupplier
+class TAO_RT_Notify_Export TAO_Notify_RT_StructuredProxyPushSupplier : public virtual TAO_Notify_StructuredProxyPushSupplier
 {
 public:
   /// Constuctor
-  TAO_NS_RT_StructuredProxyPushSupplier (void);
+  TAO_Notify_RT_StructuredProxyPushSupplier (void);
 
   /// Destructor
-  ~TAO_NS_RT_StructuredProxyPushSupplier ();
+  ~TAO_Notify_RT_StructuredProxyPushSupplier ();
 
   /// Activate this object and obtain the Event_Forwarder interface.
   virtual CORBA::Object_ptr activate (PortableServer::Servant servant ACE_ENV_ARG_DECL);
 
   /// Dispatch Event to consumer
-  virtual void push (const TAO_NS_Event* event ACE_ENV_ARG_DECL);
+  virtual void push (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
 
   /// Dispatch Event to consumer
-  virtual void push (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL);
+  virtual void push (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL);
 
   /// Dispatch Event to consumer, no filtering
-  virtual void push_no_filtering (const TAO_NS_Event* event ACE_ENV_ARG_DECL);
+  virtual void push_no_filtering (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
 
   /// Dispatch Event to consumer, no filtering
-  virtual void push_no_filtering (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL);
+  virtual void push_no_filtering (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL);
 
 private:
   /// Our ref.
@@ -61,4 +61,4 @@ private:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_RT_STRUCTUREDPROXYPUSHSUPPLIER_H */
+#endif /* TAO_Notify_RT_STRUCTUREDPROXYPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
index b12fc8978e2..1ce4ede4465 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
@@ -6,13 +6,13 @@
 #include "StructuredEvent.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RT_Notify, TAO_NS_StructuredEvent, "$Id$")
+ACE_RCSID(RT_Notify, TAO_Notify_StructuredEvent, "$Id$")
 
 #include "../PropertySeq.h"
 #include "../Consumer.h"
 #include "tao/debug.h"
 
-TAO_NS_StructuredEvent_No_Copy::TAO_NS_StructuredEvent_No_Copy (const CosNotification::StructuredEvent &notification)
+TAO_Notify_StructuredEvent_No_Copy::TAO_Notify_StructuredEvent_No_Copy (const CosNotification::StructuredEvent &notification)
   : notification_ (&notification), type_ (notification.header.fixed_header.event_type)
 {
   const CosNotification::PropertySeq& prop_seq = notification.header.variable_header;
@@ -26,30 +26,30 @@ TAO_NS_StructuredEvent_No_Copy::TAO_NS_StructuredEvent_No_Copy (const CosNotific
     }
 }
 
-const TAO_NS_EventType&
-TAO_NS_StructuredEvent_No_Copy::type (void) const
+const TAO_Notify_EventType&
+TAO_Notify_StructuredEvent_No_Copy::type (void) const
 {
   return this->type_;
 }
 
-TAO_NS_StructuredEvent_No_Copy::~TAO_NS_StructuredEvent_No_Copy ()
+TAO_Notify_StructuredEvent_No_Copy::~TAO_Notify_StructuredEvent_No_Copy ()
 {
 }
 
-TAO_NS_Event*
-TAO_NS_StructuredEvent_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) const
+TAO_Notify_Event*
+TAO_Notify_StructuredEvent_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL) const
 {
-  TAO_NS_Event* copy;
+  TAO_Notify_Event* copy;
 
   ACE_NEW_THROW_EX (copy,
-                    TAO_NS_StructuredEvent (*this->notification_),
+                    TAO_Notify_StructuredEvent (*this->notification_),
                     CORBA::NO_MEMORY ());
 
   return copy;
 }
 
 CORBA::Boolean
-TAO_NS_StructuredEvent_No_Copy::do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const
+TAO_Notify_StructuredEvent_No_Copy::do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
@@ -59,13 +59,13 @@ TAO_NS_StructuredEvent_No_Copy::do_match (CosNotifyFilter::Filter_ptr filter ACE
 }
 
 void
-TAO_NS_StructuredEvent_No_Copy::convert (CosNotification::StructuredEvent& notification) const
+TAO_Notify_StructuredEvent_No_Copy::convert (CosNotification::StructuredEvent& notification) const
 {
   notification = *this->notification_;
 }
 
 void
-TAO_NS_StructuredEvent_No_Copy::push (TAO_NS_Consumer* consumer ACE_ENV_ARG_DECL) const
+TAO_Notify_StructuredEvent_No_Copy::push (TAO_Notify_Consumer* consumer ACE_ENV_ARG_DECL) const
 {
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "Notify (%P|%t) - "
@@ -76,46 +76,46 @@ TAO_NS_StructuredEvent_No_Copy::push (TAO_NS_Consumer* consumer ACE_ENV_ARG_DECL
 }
 
 void
-TAO_NS_StructuredEvent_No_Copy::push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+TAO_Notify_StructuredEvent_No_Copy::push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
 {
   forwarder->forward_structured (*this->notification_ ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_StructuredEvent_No_Copy::push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+TAO_Notify_StructuredEvent_No_Copy::push_no_filtering (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
 {
   forwarder->forward_structured_no_filtering (*this->notification_ ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_StructuredEvent_No_Copy::push (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+TAO_Notify_StructuredEvent_No_Copy::push (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
 {
   CORBA::Any any;
 
-  TAO_NS_Event::translate (*this->notification_, any);
+  TAO_Notify_Event::translate (*this->notification_, any);
 
   forwarder->forward_any (any ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_StructuredEvent_No_Copy::push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
+TAO_Notify_StructuredEvent_No_Copy::push_no_filtering (Event_Forwarder::ProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const
 {
   CORBA::Any any;
 
-  TAO_NS_Event::translate (*this->notification_, any);
+  TAO_Notify_Event::translate (*this->notification_, any);
 
   forwarder->forward_any_no_filtering (any ACE_ENV_ARG_PARAMETER);
 }
 
 /*****************************************************************************************************/
 
-TAO_NS_StructuredEvent::TAO_NS_StructuredEvent (const CosNotification::StructuredEvent& notification)
-  : TAO_NS_StructuredEvent_No_Copy (notification)
+TAO_Notify_StructuredEvent::TAO_Notify_StructuredEvent (const CosNotification::StructuredEvent& notification)
+  : TAO_Notify_StructuredEvent_No_Copy (notification)
     , notification_copy (notification)
 {
   this->notification_ = &notification_copy;
 }
 
-TAO_NS_StructuredEvent::~TAO_NS_StructuredEvent ()
+TAO_Notify_StructuredEvent::~TAO_Notify_StructuredEvent ()
 {
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
index 175913c898c..d2c81dc79ed 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
@@ -8,8 +8,8 @@
  *
  *
  */
-#ifndef TAO_NS_STRUCTUREDEVENT_H
-#define TAO_NS_STRUCTUREDEVENT_H
+#ifndef TAO_Notify_STRUCTUREDEVENT_H
+#define TAO_Notify_STRUCTUREDEVENT_H
 
 #include "ace/pre.h"
 #include "../notify_export.h"
@@ -23,23 +23,23 @@
 #include "orbsvcs/CosNotificationC.h"
 
 /**
- * @class TAO_NS_StructuredEvent_No_Copy
+ * @class TAO_Notify_StructuredEvent_No_Copy
  *
  * @brief StructuredEvent implementation.
  *
  */
 
-class TAO_Notify_Export TAO_NS_StructuredEvent_No_Copy : public TAO_NS_Event
+class TAO_Notify_Export TAO_Notify_StructuredEvent_No_Copy : public TAO_Notify_Event
 {
 public:
   /// Constuctor
-  TAO_NS_StructuredEvent_No_Copy (const CosNotification::StructuredEvent& notification);
+  TAO_Notify_StructuredEvent_No_Copy (const CosNotification::StructuredEvent& notification);
 
   /// Destructor
-  ~TAO_NS_StructuredEvent_No_Copy ();
+  ~TAO_Notify_StructuredEvent_No_Copy ();
 
   /// Copy the event.
-  virtual TAO_NS_Event* copy (ACE_ENV_SINGLE_ARG_DECL) const;
+  virtual TAO_Notify_Event* copy (ACE_ENV_SINGLE_ARG_DECL) const;
 
   CORBA::Boolean do_match (CosNotifyFilter::Filter_ptr filter ACE_ENV_ARG_DECL) const;
 
@@ -47,10 +47,10 @@ public:
   virtual void convert (CosNotification::StructuredEvent& notification) const;
 
   /// Get the event type.
-  virtual const TAO_NS_EventType& type (void) const;
+  virtual const TAO_Notify_EventType& type (void) const;
 
   /// Push event to consumer
-  virtual void push (TAO_NS_Consumer* consumer ACE_ENV_ARG_DECL) const;
+  virtual void push (TAO_Notify_Consumer* consumer ACE_ENV_ARG_DECL) const;
 
   /// Push event to the Event_Forwarder interface
   virtual void push (Event_Forwarder::StructuredProxyPushSupplier_ptr forwarder ACE_ENV_ARG_DECL) const;
@@ -69,25 +69,25 @@ protected:
   const CosNotification::StructuredEvent* notification_;
 
   /// Our type.
-  const TAO_NS_EventType type_;
+  const TAO_Notify_EventType type_;
 };
 
 /*****************************************************************************************************/
 
 /**
- * @class TAO_NS_StructuredEvent
+ * @class TAO_Notify_StructuredEvent
  *
  * @brief StructuredEvent implementation.
  *
  */
-class TAO_Notify_Export TAO_NS_StructuredEvent : public TAO_NS_StructuredEvent_No_Copy
+class TAO_Notify_Export TAO_Notify_StructuredEvent : public TAO_Notify_StructuredEvent_No_Copy
 {
 public:
   /// Constuctor
-  TAO_NS_StructuredEvent (const CosNotification::StructuredEvent& notification);
+  TAO_Notify_StructuredEvent (const CosNotification::StructuredEvent& notification);
 
   /// Destructor
-  ~TAO_NS_StructuredEvent ();
+  ~TAO_Notify_StructuredEvent ();
 
 protected:
   /// Copy of the Event.
@@ -99,4 +99,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_STRUCTUREDEVENT_H */
+#endif /* TAO_Notify_STRUCTUREDEVENT_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
index 2d80fd27dae..6565a2c701f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
@@ -6,7 +6,7 @@
 #include "StructuredProxyPushConsumer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RT_Notify, TAO_NS_StructuredProxyPushConsumer, "$Id$")
+ACE_RCSID(RT_Notify, TAO_Notify_StructuredProxyPushConsumer, "$Id$")
 
 #include "ace/Refcounted_Auto_Ptr.h"
 #include "ace/Auto_Ptr.h"
@@ -17,16 +17,16 @@ ACE_RCSID(RT_Notify, TAO_NS_StructuredProxyPushConsumer, "$Id$")
 #include "../Method_Request_Lookup.h"
 #include "../Worker_Task.h"
 
-TAO_NS_StructuredProxyPushConsumer::TAO_NS_StructuredProxyPushConsumer (void)
+TAO_Notify_StructuredProxyPushConsumer::TAO_Notify_StructuredProxyPushConsumer (void)
 {
 }
 
-TAO_NS_StructuredProxyPushConsumer::~TAO_NS_StructuredProxyPushConsumer ()
+TAO_Notify_StructuredProxyPushConsumer::~TAO_Notify_StructuredProxyPushConsumer ()
 {
 }
 
 void
-TAO_NS_StructuredProxyPushConsumer::release (void)
+TAO_Notify_StructuredProxyPushConsumer::release (void)
 {
   if (this->supplier_)
     this->supplier_->release ();
@@ -36,10 +36,10 @@ TAO_NS_StructuredProxyPushConsumer::release (void)
 }
 
 void
-TAO_NS_StructuredProxyPushConsumer::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_StructuredProxyPushConsumer::destroy (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "In TAO_NS_StructuredProxyPushConsumer::destroy \n"));
+    ACE_DEBUG ((LM_DEBUG, "In TAO_Notify_StructuredProxyPushConsumer::destroy \n"));
 
   if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
     return;
@@ -48,7 +48,7 @@ TAO_NS_StructuredProxyPushConsumer::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CosNotifyChannelAdmin::ProxyType
-TAO_NS_StructuredProxyPushConsumer::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_StructuredProxyPushConsumer::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -57,16 +57,16 @@ TAO_NS_StructuredProxyPushConsumer::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_NS_StructuredProxyPushConsumer::connect_structured_push_supplier (CosNotifyComm::StructuredPushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredProxyPushConsumer::connect_structured_push_supplier (CosNotifyComm::StructuredPushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventChannelAdmin::AlreadyConnected
                    ))
 {
   // Convert Supplier to Base Type
-  TAO_NS_StructuredPushSupplier * supplier;
+  TAO_Notify_StructuredPushSupplier * supplier;
   ACE_NEW_THROW_EX (supplier,
-                    TAO_NS_StructuredPushSupplier (this),
+                    TAO_Notify_StructuredPushSupplier (this),
                     CORBA::NO_MEMORY ());
 
   supplier->init (push_supplier ACE_ENV_ARG_PARAMETER);
@@ -76,7 +76,7 @@ TAO_NS_StructuredProxyPushConsumer::connect_structured_push_supplier (CosNotifyC
 }
 
 void
-TAO_NS_StructuredProxyPushConsumer::push_structured_event (const CosNotification::StructuredEvent & notification ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredProxyPushConsumer::push_structured_event (const CosNotification::StructuredEvent & notification ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventComm::Disconnected
@@ -92,15 +92,15 @@ TAO_NS_StructuredProxyPushConsumer::push_structured_event (const CosNotification
       ACE_THROW (CosEventComm::Disconnected ());
     }
 
-  TAO_NS_StructuredEvent_No_Copy event (notification);
+  TAO_Notify_StructuredEvent_No_Copy event (notification);
 
-  TAO_NS_Method_Request_Lookup_No_Copy request (&event, this);
+  TAO_Notify_Method_Request_Lookup_No_Copy request (&event, this);
 
   this->worker_task ()->execute (request ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_StructuredProxyPushConsumer::disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_StructuredProxyPushConsumer::disconnect_structured_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
index 70ddb535673..8433c1d1dc6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_STRUCTUREDPROXYPUSHCONSUMER_H
-#define TAO_NS_STRUCTUREDPROXYPUSHCONSUMER_H
+#ifndef TAO_Notify_STRUCTUREDPROXYPUSHCONSUMER_H
+#define TAO_Notify_STRUCTUREDPROXYPUSHCONSUMER_H
 #include "ace/pre.h"
 
 #include "../notify_export.h"
@@ -30,21 +30,21 @@
 #endif /* _MSC_VER */
 
 /**
- * @class TAO_NS_StructuredProxyPushConsumer
+ * @class TAO_Notify_StructuredProxyPushConsumer
  *
  * @brief CosNotifyChannelAdmin::StructuredProxyPushConsumer implementation.
  *
  */
-class TAO_Notify_Export TAO_NS_StructuredProxyPushConsumer : public virtual TAO_NS_ProxyConsumer_T <POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer>
+class TAO_Notify_Export TAO_Notify_StructuredProxyPushConsumer : public virtual TAO_Notify_ProxyConsumer_T <POA_CosNotifyChannelAdmin::StructuredProxyPushConsumer>
 {
-  friend class TAO_NS_Builder;
+  friend class TAO_Notify_Builder;
 
 public:
   /// Constuctor
-  TAO_NS_StructuredProxyPushConsumer (void);
+  TAO_Notify_StructuredProxyPushConsumer (void);
 
   /// Destructor
-  ~TAO_NS_StructuredProxyPushConsumer ();
+  ~TAO_Notify_StructuredProxyPushConsumer ();
 
   /// Release
   virtual void release (void);
@@ -95,4 +95,4 @@ virtual void push_structured_event (
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_STRUCTUREDPROXYPUSHCONSUMER_H */
+#endif /* TAO_Notify_STRUCTUREDPROXYPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
index 4072b24f681..4681631f6cc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
@@ -10,21 +10,21 @@
 #include "StructuredProxyPushSupplier.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RT_Notify, TAO_NS_StructuredProxyPushSupplier, "$Id$")
+ACE_RCSID(RT_Notify, TAO_Notify_StructuredProxyPushSupplier, "$Id$")
 
-TAO_NS_StructuredProxyPushSupplier::TAO_NS_StructuredProxyPushSupplier (void)
+TAO_Notify_StructuredProxyPushSupplier::TAO_Notify_StructuredProxyPushSupplier (void)
 {
 }
 
-TAO_NS_StructuredProxyPushSupplier::~TAO_NS_StructuredProxyPushSupplier ()
+TAO_Notify_StructuredProxyPushSupplier::~TAO_Notify_StructuredProxyPushSupplier ()
 {
 }
 
 void
-TAO_NS_StructuredProxyPushSupplier::destroy (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_StructuredProxyPushSupplier::destroy (ACE_ENV_SINGLE_ARG_DECL)
 {
   if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "In TAO_NS_StructuredProxyPushConsumer::destroy \n"));
+    ACE_DEBUG ((LM_DEBUG, "In TAO_Notify_StructuredProxyPushConsumer::destroy \n"));
 
   if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
     return;
@@ -33,7 +33,7 @@ TAO_NS_StructuredProxyPushSupplier::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_StructuredProxyPushSupplier::release (void)
+TAO_Notify_StructuredProxyPushSupplier::release (void)
 {
   if (this->consumer_)
     this->consumer_->release ();
@@ -43,7 +43,7 @@ TAO_NS_StructuredProxyPushSupplier::release (void)
 }
 
 CosNotifyChannelAdmin::ProxyType
-TAO_NS_StructuredProxyPushSupplier::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO_Notify_StructuredProxyPushSupplier::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
@@ -52,7 +52,7 @@ TAO_NS_StructuredProxyPushSupplier::MyType (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 void
-TAO_NS_StructuredProxyPushSupplier::connect_structured_push_consumer (CosNotifyComm::StructuredPushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredProxyPushSupplier::connect_structured_push_consumer (CosNotifyComm::StructuredPushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    , CosEventChannelAdmin::AlreadyConnected
@@ -60,9 +60,9 @@ TAO_NS_StructuredProxyPushSupplier::connect_structured_push_consumer (CosNotifyC
                    ))
 {
   // Convert Consumer to Base Type
-  TAO_NS_StructuredPushConsumer* consumer;
+  TAO_Notify_StructuredPushConsumer* consumer;
   ACE_NEW_THROW_EX (consumer,
-                    TAO_NS_StructuredPushConsumer (this),
+                    TAO_Notify_StructuredPushConsumer (this),
                     CORBA::NO_MEMORY ());
 
   consumer->init (push_consumer ACE_ENV_ARG_PARAMETER);
@@ -72,7 +72,7 @@ TAO_NS_StructuredProxyPushSupplier::connect_structured_push_consumer (CosNotifyC
 }
 
 void
-TAO_NS_StructuredProxyPushSupplier::disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
+TAO_Notify_StructuredProxyPushSupplier::disconnect_structured_push_supplier (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((
                    CORBA::SystemException
                    ))
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
index 922122dc849..71093030f77 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_STRUCTUREDPROXYPUSHSUPPLIER_H
-#define TAO_NS_STRUCTUREDPROXYPUSHSUPPLIER_H
+#ifndef TAO_Notify_STRUCTUREDPROXYPUSHSUPPLIER_H
+#define TAO_Notify_STRUCTUREDPROXYPUSHSUPPLIER_H
 #include "ace/pre.h"
 
 #include "../notify_export.h"
@@ -32,26 +32,26 @@
 
 #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
 template class TAO_Notify_Export
-TAO_NS_ProxySupplier_T<POA_Event_Forwarder::StructuredProxyPushSupplier>;
+TAO_Notify_ProxySupplier_T<POA_Event_Forwarder::StructuredProxyPushSupplier>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
 
 /**
- * @class TAO_NS_StructuredProxyPushSupplier
+ * @class TAO_Notify_StructuredProxyPushSupplier
  *
  * @brief Implements the CosNotifyChannelAdmin::StructuredProxyPushSupplier methods.
  *
  *
  */
-class TAO_Notify_Export TAO_NS_StructuredProxyPushSupplier : public virtual TAO_NS_ProxySupplier_T <POA_Event_Forwarder::StructuredProxyPushSupplier>
+class TAO_Notify_Export TAO_Notify_StructuredProxyPushSupplier : public virtual TAO_Notify_ProxySupplier_T <POA_Event_Forwarder::StructuredProxyPushSupplier>
 {
-  friend class TAO_NS_Builder;
+  friend class TAO_Notify_Builder;
 
 public:
   /// Constuctor
-  TAO_NS_StructuredProxyPushSupplier (void);
+  TAO_Notify_StructuredProxyPushSupplier (void);
 
   /// Destructor
-  ~TAO_NS_StructuredProxyPushSupplier ();
+  ~TAO_Notify_StructuredProxyPushSupplier ();
 
   /// Destroy this object.
   virtual void destroy (ACE_ENV_SINGLE_ARG_DECL);
@@ -95,4 +95,4 @@ public:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_STRUCTUREDPROXYPUSHSUPPLIER_H */
+#endif /* TAO_Notify_STRUCTUREDPROXYPUSHSUPPLIER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
index 7a9aff05883..185ffe305a1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
@@ -7,19 +7,19 @@
 #include "StructuredPushConsumer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RT_Notify, TAO_NS_StructuredPushConsumer, "$Id$")
+ACE_RCSID(RT_Notify, TAO_Notify_StructuredPushConsumer, "$Id$")
 
-TAO_NS_StructuredPushConsumer::TAO_NS_StructuredPushConsumer (TAO_NS_ProxySupplier* proxy)
-  :TAO_NS_Consumer (proxy)
+TAO_Notify_StructuredPushConsumer::TAO_Notify_StructuredPushConsumer (TAO_Notify_ProxySupplier* proxy)
+  :TAO_Notify_Consumer (proxy)
 {
 }
 
-TAO_NS_StructuredPushConsumer::~TAO_NS_StructuredPushConsumer ()
+TAO_Notify_StructuredPushConsumer::~TAO_Notify_StructuredPushConsumer ()
 {
 }
 
 void
-TAO_NS_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_ptr push_consumer ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_ptr push_consumer ACE_ENV_ARG_DECL_NOT_USED)
 {
   this->push_consumer_ = CosNotifyComm::StructuredPushConsumer::_duplicate (push_consumer);
 
@@ -28,36 +28,36 @@ TAO_NS_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_ptr p
 }
 
 void
-TAO_NS_StructuredPushConsumer::release (void)
+TAO_Notify_StructuredPushConsumer::release (void)
 {
   delete this;
   //@@ inform factory
 }
 
 void
-TAO_NS_StructuredPushConsumer::push_i (const TAO_NS_Event* event ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredPushConsumer::push_i (const TAO_Notify_Event* event ACE_ENV_ARG_DECL)
 {
   event->push (this ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_StructuredPushConsumer::push_i (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredPushConsumer::push_i (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL)
 {
   event->push (this ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_StructuredPushConsumer::push (const CORBA::Any& event ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredPushConsumer::push (const CORBA::Any& event ACE_ENV_ARG_DECL)
 {
   CosNotification::StructuredEvent notification;
 
-  TAO_NS_Event::translate (event, notification);
+  TAO_Notify_Event::translate (event, notification);
 
   this->push_consumer_->push_structured_event (notification ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_StructuredPushConsumer::push (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredPushConsumer::push (const CosNotification::StructuredEvent& event ACE_ENV_ARG_DECL)
 {
   this->push_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
index d0e950a34c5..6687ace54d0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_STRUCTUREDPUSHCONSUMER_H
-#define TAO_NS_STRUCTUREDPUSHCONSUMER_H
+#ifndef TAO_Notify_STRUCTUREDPUSHCONSUMER_H
+#define TAO_Notify_STRUCTUREDPUSHCONSUMER_H
 #include "ace/pre.h"
 
 #include "../notify_export.h"
@@ -22,34 +22,34 @@
 #include "orbsvcs/CosNotifyCommC.h"
 #include "../Consumer.h"
 
-class TAO_NS_ProxySupplier;
+class TAO_Notify_ProxySupplier;
 
 /**
- * @class TAO_NS_StructuredPushConsumer
+ * @class TAO_Notify_StructuredPushConsumer
  *
  * @brief Wrapper for the StructuredPushConsumer that connect to the EventChannel.
  *
  */
-class TAO_Notify_Export TAO_NS_StructuredPushConsumer : public TAO_NS_Consumer
+class TAO_Notify_Export TAO_Notify_StructuredPushConsumer : public TAO_Notify_Consumer
 {
 public:
   /// Constuctor
-  TAO_NS_StructuredPushConsumer (TAO_NS_ProxySupplier* proxy);
+  TAO_Notify_StructuredPushConsumer (TAO_Notify_ProxySupplier* proxy);
 
   /// Init the Consumer
   void init (CosNotifyComm::StructuredPushConsumer_ptr push_consumer ACE_ENV_ARG_DECL);
 
   /// Destructor
-  ~TAO_NS_StructuredPushConsumer ();
+  ~TAO_Notify_StructuredPushConsumer ();
 
   /// Release
   virtual void release (void);
 
   /// Push <event> to this consumer.
-  virtual void push_i (const TAO_NS_Event* event ACE_ENV_ARG_DECL);
+  virtual void push_i (const TAO_Notify_Event* event ACE_ENV_ARG_DECL);
 
   /// Push <event> to this consumer.
-  virtual void push_i (const TAO_NS_Event_var& event ACE_ENV_ARG_DECL);
+  virtual void push_i (const TAO_Notify_Event_var& event ACE_ENV_ARG_DECL);
 
   /// Push <event> to this consumer.
   virtual void push (const CORBA::Any& event ACE_ENV_ARG_DECL);
@@ -67,4 +67,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_STRUCTUREDPUSHCONSUMER_H */
+#endif /* TAO_Notify_STRUCTUREDPUSHCONSUMER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
index 14bd28f93b1..12e343f11b7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
@@ -6,19 +6,19 @@
 #include "StructuredPushSupplier.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(RT_Notify, TAO_NS_StructuredPushSupplier, "$Id$")
+ACE_RCSID(RT_Notify, TAO_Notify_StructuredPushSupplier, "$Id$")
 
-TAO_NS_StructuredPushSupplier::TAO_NS_StructuredPushSupplier (TAO_NS_ProxyConsumer* proxy)
-  :TAO_NS_Supplier (proxy)
+TAO_Notify_StructuredPushSupplier::TAO_Notify_StructuredPushSupplier (TAO_Notify_ProxyConsumer* proxy)
+  :TAO_Notify_Supplier (proxy)
 {
 }
 
-TAO_NS_StructuredPushSupplier::~TAO_NS_StructuredPushSupplier ()
+TAO_Notify_StructuredPushSupplier::~TAO_Notify_StructuredPushSupplier ()
 {
 }
 
 void
-TAO_NS_StructuredPushSupplier::init (CosNotifyComm::StructuredPushSupplier_ptr push_supplier ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Notify_StructuredPushSupplier::init (CosNotifyComm::StructuredPushSupplier_ptr push_supplier ACE_ENV_ARG_DECL_NOT_USED)
 {
   this->push_supplier_ = CosNotifyComm::StructuredPushSupplier::_duplicate (push_supplier);
 
@@ -26,7 +26,7 @@ TAO_NS_StructuredPushSupplier::init (CosNotifyComm::StructuredPushSupplier_ptr p
 }
 
 void
-TAO_NS_StructuredPushSupplier::release (void)
+TAO_Notify_StructuredPushSupplier::release (void)
 {
   delete this;
   //@@ inform factory
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
index 6c9456befb7..95f5ef23059 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef TAO_NS_STRUCTUREDPUSHSUPPLIER_H
-#define TAO_NS_STRUCTUREDPUSHSUPPLIER_H
+#ifndef TAO_Notify_STRUCTUREDPUSHSUPPLIER_H
+#define TAO_Notify_STRUCTUREDPUSHSUPPLIER_H
 #include "ace/pre.h"
 
 #include "../notify_export.h"
@@ -22,22 +22,22 @@
 #include "orbsvcs/CosNotifyCommC.h"
 #include "../Supplier.h"
 
-class TAO_NS_ProxyConsumer;
+class TAO_Notify_ProxyConsumer;
 
 /**
- * @class TAO_NS_StructuredPushSupplier
+ * @class TAO_Notify_StructuredPushSupplier
  *
  * @brief Wrapper for the StructuredPushSupplier that connect to the EventChannel.
  *
  */
-class TAO_Notify_Export TAO_NS_StructuredPushSupplier : public TAO_NS_Supplier
+class TAO_Notify_Export TAO_Notify_StructuredPushSupplier : public TAO_Notify_Supplier
 {
 public:
   /// Constuctor
-  TAO_NS_StructuredPushSupplier (TAO_NS_ProxyConsumer* proxy);
+  TAO_Notify_StructuredPushSupplier (TAO_Notify_ProxyConsumer* proxy);
 
   /// Destructor
-  ~TAO_NS_StructuredPushSupplier ();
+  ~TAO_Notify_StructuredPushSupplier ();
 
   /// Init
   void init (CosNotifyComm::StructuredPushSupplier_ptr push_supplier ACE_ENV_ARG_DECL);
@@ -55,4 +55,4 @@ protected:
 #endif /* __ACE_INLINE__ */
 
 #include "ace/post.h"
-#endif /* TAO_NS_STRUCTUREDPUSHSUPPLIER_H */
+#endif /* TAO_Notify_STRUCTUREDPUSHSUPPLIER_H */