*** empty log message ***

4 files changed, 31 insertions, 31 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp
index 7714f21d186..d8530a74f82 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp
@@ -8,6 +8,6 @@ ACE_RCSID(Notify, TAO_NS_CosNotify_Initializer, "$id$")
 
 TAO_NS_CosNotify_Initializer::TAO_NS_CosNotify_Initializer (void)
 {
-  // ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_TAO_NS_CosNotify_Service);
+  ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_TAO_NS_CosNotify_Service);
   ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_TAO_Notify_Default_EMO_Factory_OLD);
 }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
index a9d945d4768..bec3fca7246 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
@@ -11,22 +11,22 @@
 #include "orbsvcs/NotifyExtC.h"
 #include "tao/debug.h"
 
-ACE_RCSID(RT_Notify, TAO_NS_CosNotify_Service, "$Id$")
+ACE_RCSID(RT_Notify, TAO_CosNotify_Service, "$Id$")
 
-TAO_NS_CosNotify_Service::TAO_NS_CosNotify_Service (void)
+TAO_CosNotify_Service::TAO_CosNotify_Service (void)
   : factory_ (0)
   , builder_ (0)
 {
 }
 
-TAO_NS_CosNotify_Service::~TAO_NS_CosNotify_Service ()
+TAO_CosNotify_Service::~TAO_CosNotify_Service ()
 {
   delete this->factory_;
   delete this->builder_;
 }
 
 int
-TAO_NS_CosNotify_Service::init (int argc, char *argv[])
+TAO_CosNotify_Service::init (int argc, char *argv[])
 {
   ACE_Arg_Shifter arg_shifter (argc, argv);
 
@@ -142,7 +142,7 @@ TAO_NS_CosNotify_Service::init (int argc, char *argv[])
 }
 
 void
-TAO_NS_CosNotify_Service::set_threads (CosNotification::QoSProperties &qos, int threads)
+TAO_CosNotify_Service::set_threads (CosNotification::QoSProperties &qos, int threads)
 {
   NotifyExt::ThreadPoolParams tp_params =
     {0, (unsigned)threads, 0, 0, 0, 0, 0 };
@@ -153,13 +153,13 @@ TAO_NS_CosNotify_Service::set_threads (CosNotification::QoSProperties &qos, int
 }
 
 int
-TAO_NS_CosNotify_Service::fini (void)
+TAO_CosNotify_Service::fini (void)
 {
   return 0;
 }
 
 void
-TAO_NS_CosNotify_Service::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+TAO_CosNotify_Service::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG, "Loading the Cos Notification Service...\n"));
 
@@ -168,7 +168,7 @@ TAO_NS_CosNotify_Service::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 }
 
 void
-TAO_NS_CosNotify_Service::init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
+TAO_CosNotify_Service::init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 {
   /// first, init the main thread.
   //this->init_main_thread (orb ACE_ENV_ARG_PARAMETER);
@@ -203,7 +203,7 @@ TAO_NS_CosNotify_Service::init_i (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 }
 
 void
-TAO_NS_CosNotify_Service::init_main_thread (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL_NOT_USED)
+TAO_CosNotify_Service::init_main_thread (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL_NOT_USED)
 {
   ACE_Sched_Params::Policy sched_policy;
   long thr_sched_policy = orb->orb_core ()->orb_params ()->sched_policy ();
@@ -267,7 +267,7 @@ TAO_NS_CosNotify_Service::init_main_thread (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL_
 }
 
 void
-TAO_NS_CosNotify_Service::init_factory (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CosNotify_Service::init_factory (ACE_ENV_SINGLE_ARG_DECL)
 {
   this->factory_ = ACE_Dynamic_Service<TAO_NS_Factory>::instance ("TAO_NS_Factory");
 
@@ -281,7 +281,7 @@ TAO_NS_CosNotify_Service::init_factory (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-TAO_NS_CosNotify_Service::init_builder (ACE_ENV_SINGLE_ARG_DECL)
+TAO_CosNotify_Service::init_builder (ACE_ENV_SINGLE_ARG_DECL)
 {
   ACE_NEW_THROW_EX (this->builder_,
                     TAO_NS_Builder (),
@@ -292,13 +292,13 @@ TAO_NS_CosNotify_Service::init_builder (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
-TAO_NS_CosNotify_Service::create (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL)
+TAO_CosNotify_Service::create (PortableServer::POA_ptr poa ACE_ENV_ARG_DECL)
 {
   return this->builder_->build_event_channel_factory (poa ACE_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_NS_CosNotify_Service::remove (TAO_NS_EventChannelFactory* /*ecf*/ ACE_ENV_ARG_DECL_NOT_USED)
+TAO_CosNotify_Service::remove (TAO_NS_EventChannelFactory* /*ecf*/ ACE_ENV_ARG_DECL_NOT_USED)
 {
   // NOP.
 }
@@ -308,21 +308,21 @@ TAO_NS_CosNotify_Service::remove (TAO_NS_EventChannelFactory* /*ecf*/ ACE_ENV_AR
 ACE_STATIC_SVC_DEFINE (TAO_Notify_Default_EMO_Factory_OLD,
                        ACE_TEXT (TAO_NOTIFY_DEF_EMO_FACTORY_NAME),
                        ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_NS_CosNotify_Service),
+                       &ACE_SVC_NAME (TAO_CosNotify_Service),
                        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
                        0)
 
 /*********************************************************************************************************************/
-/*
-ACE_STATIC_SVC_DEFINE (TAO_NS_CosNotify_Service,
+
+ACE_STATIC_SVC_DEFINE (TAO_CosNotify_Service,
                        ACE_TEXT (TAO_NS_COS_NOTIFICATION_SERVICE_NAME),
                        ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_NS_CosNotify_Service),
+                       &ACE_SVC_NAME (TAO_CosNotify_Service),
                        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
                        0)
 
-*/
-ACE_FACTORY_DEFINE (TAO_Notify, TAO_NS_CosNotify_Service)
+
+ACE_FACTORY_DEFINE (TAO_Notify, TAO_CosNotify_Service)
 
 /*********************************************************************************************************************/
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
index fd29b69d2a8..afbd64a3bf9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
@@ -27,19 +27,19 @@ class TAO_NS_Properties;
 class TAO_NS_EventChannelFactory;
 
 /**
- * @class TAO_NS_CosNotify_Service
+ * @class TAO_CosNotify_Service
  *
  * @brief A service object for creating the  Notify Service Factory.
  *
  */
-class TAO_Notify_Export TAO_NS_CosNotify_Service : public TAO_NS_Service
+class TAO_Notify_Export TAO_CosNotify_Service : public TAO_Notify_Service
 {
 public:
   /// Constuctor
-  TAO_NS_CosNotify_Service (void);
+  TAO_CosNotify_Service (void);
 
   /// Destructor
-  virtual ~TAO_NS_CosNotify_Service ();
+  virtual ~TAO_CosNotify_Service ();
 
   /// = Service_Object virtual method overloads.
   virtual int init (int argc, char *argv[]);
@@ -77,8 +77,8 @@ protected:
   TAO_NS_Builder* builder_;
 };
 
-//ACE_STATIC_SVC_DECLARE (TAO_NS_CosNotify_Service)
-ACE_FACTORY_DECLARE (TAO_Notify, TAO_NS_CosNotify_Service)
+ACE_STATIC_SVC_DECLARE (TAO_CosNotify_Service)
+ACE_FACTORY_DECLARE (TAO_Notify, TAO_CosNotify_Service)
 
 ACE_STATIC_SVC_DECLARE (TAO_Notify_Default_EMO_Factory_OLD)
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Service.h b/TAO/orbsvcs/orbsvcs/Notify/Service.h
index d10636f5b12..a6848386f76 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Service.h
@@ -25,14 +25,14 @@
 #include "tao/PortableServer/PortableServer.h"
 
 /**
- * @class TAO_NS_Service
+ * @class TAO_Notify_Service
  *
  * @brief Abstract ACE_Service_Object interface that is a
  * factory for creating a Notify EventChannelFactory.
  *        Note that a Service creates only 1 Factory object.
  *
  */
-class TAO_Notify_Export TAO_NS_Service : public ACE_Service_Object
+class TAO_Notify_Export TAO_Notify_Service : public ACE_Service_Object
 {
 public:
   /// Define Service_Object method otherwise SunCC compiler complains.
@@ -49,11 +49,11 @@ public:
 
 #define TAO_NOTIFY_DEF_EMO_FACTORY_NAME "Notify_Default_Event_Manager_Objects_Factory"
 
-#define TAO_NS_NOTIFICATION_SERVICE_NAME "TAO_NS_Service"
+#define TAO_NS_NOTIFICATION_SERVICE_NAME "TAO_Notify_Service"
 
-#define TAO_NS_COS_NOTIFICATION_SERVICE_NAME "TAO_NS_CosNotify_Service"
+#define TAO_NS_COS_NOTIFICATION_SERVICE_NAME "TAO_CosNotify_Service"
 
-#define TAO_NS_RT_NOTIFICATION_SERVICE_NAME "TAO_NS_RT_Notify_Service"
+#define TAO_NS_RT_NOTIFICATION_SERVICE_NAME "TAO_RT_Notify_Service"
 
 #include "ace/post.h"
 #endif /* TAO_NS_SERVICE_H */