summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/Logging_Service
diff options
context:
space:
mode:
authorpradeep <pradeep@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-11-02 23:55:52 +0000
committerpradeep <pradeep@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-11-02 23:55:52 +0000
commitddfa2419c029ce8a9a88765be90221fe9253e7d0 (patch)
tree3cbc3847c48b19ad0f6412dc200aafe58eec3f3f /TAO/orbsvcs/Logging_Service
parent81cee425490d86bb6f9eb2dc722ccb13132fddfc (diff)
downloadATCD-ddfa2419c029ce8a9a88765be90221fe9253e7d0.tar.gz
ChangeLogTag:Sat Nov 02 18:10:44 2002 Pradeep Gore <pradeep@oomworks.com>
Diffstat (limited to 'TAO/orbsvcs/Logging_Service')
-rw-r--r--TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp26
-rwxr-xr-xTAO/orbsvcs/Logging_Service/Notify_Logging_Service/svc.conf6
2 files changed, 22 insertions, 10 deletions
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
index f5c11d7cda3..183fa36e9da 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
@@ -1,9 +1,11 @@
#include "Notify_Logging_Service.h"
-#include "tao/debug.h"
-#include "orbsvcs/Notify/Notify_EventChannelFactory_i.h"
-#include "tao/IORTable/IORTable.h"
+
+#include "ace/Dynamic_Service.h"
#include "ace/Arg_Shifter.h"
#include "ace/Get_Opt.h"
+#include "tao/debug.h"
+#include "tao/IORTable/IORTable.h"
+#include "orbsvcs/Notify/Service.h"
ACE_RCSID (Notify_Logging_Service,
Notify_Logging_Service,
@@ -74,21 +76,28 @@ Notify_Logging_Service::init (int argc, char *argv[]
ACE_DEBUG ((LM_DEBUG,
"\nStarting up the Notification Logging Service...\n"));
+ TAO_NS_Service* notify_service = ACE_Dynamic_Service<TAO_NS_Service>::instance (TAO_NS_COS_NOTIFICATION_SERVICE_NAME);
+
+ if (notify_service == 0)
+ {
+ ACE_DEBUG ((LM_DEBUG, "Notify Service not found! check conf. file\n"));
+ return -1;
+ }
+
// Activate the factory
this->notify_factory_ =
- TAO_Notify_EventChannelFactory_i::create (this->poa_.in ()
- ACE_ENV_ARG_PARAMETER);
+ notify_service->create (this->poa_.in ()
+ ACE_ENV_ARG_PARAMETER);
ACE_NEW_THROW_EX (this->notify_log_factory_,
NotifyLogFactory_i (this->notify_factory_.in ()),
CORBA::NO_MEMORY ());
-
- DsNotifyLogAdmin::NotifyLogFactory_var obj =
+
+ DsNotifyLogAdmin::NotifyLogFactory_var obj =
notify_log_factory_->activate (this->poa_.in () ACE_ENV_ARG_PARAMETER);
ACE_CHECK_RETURN (-1);
-
// Register the Factory
ACE_ASSERT (!CORBA::is_nil (this->naming_.in ()));
@@ -181,4 +190,3 @@ Notify_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
/*****************************************************************/
-
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/svc.conf b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/svc.conf
index 4e5403f39ac..509c0ee230f 100755
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/svc.conf
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/svc.conf
@@ -1 +1,5 @@
-static Notify_Default_Event_Manager_Objects_Factory "-MTDispatching -DispatchingThreads 1"
+##$Id$
+
+## Load the static Cos Notification Service
+static TAO_NS_CosNotification_Service "-DispatchingThreads 1"
+