ChangeLogTag:Sun Nov 03 11:00:27 2002 Pradeep Gore <pradeep@oomworks.com>

3 files changed, 74 insertions, 74 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 32814dc451d..07b4f4ec129 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,13 @@
+Sun Nov 03 11:00:27 2002  Pradeep Gore  <pradeep@oomworks.com>
+
+	* orbsvcs/orbsvcs/CosNotification.bor:
+	  Added missing .obj extension to targets. Thanks to Johnny
+	  Willemsen <jwillemsen@remedy.nl> for pointing this out.
+
+	* orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp:
+	  Removed calls to initalize old Notification factories. This is
+	  not needed now.
+
 Sat Nov  2 19:58:51 2002  Balachandran Natarajan  <bala@isis-server.isis.vanderbilt.edu>
 
 	* tests/Bug_1269_Regression/ORB_Task.cpp:
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp
index 04512878c27..d014dd51a67 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Server.cpp
@@ -1,9 +1,5 @@
+//$Id$
 #include "Notify_Logging_Service.h"
-#include "orbsvcs/Notify/Notify_EventChannelFactory_i.h"
-#include "orbsvcs/Notify/Notify_Default_CO_Factory.h"
-#include "orbsvcs/Notify/Notify_Default_POA_Factory.h"
-#include "orbsvcs/Notify/Notify_Default_Collection_Factory.h"
-#include "orbsvcs/Notify/Notify_Default_EMO_Factory.h"
 
 ACE_RCSID (Notify_Logging_Service,
            Notify_Logging_Server,
@@ -14,12 +10,6 @@ ACE_RCSID (Notify_Logging_Service,
 int
 main (int argc, char *argv[])
 {
-  // Init factories.
-  TAO_Notify_Default_CO_Factory::init_svc ();
-  TAO_Notify_Default_POA_Factory::init_svc ();
-  TAO_Notify_Default_Collection_Factory::init_svc ();
-  TAO_Notify_Default_EMO_Factory::init_svc ();
-
   Notify_Logging_Service notify_logging_service;
 
   ACE_DECLARE_NEW_CORBA_ENV;
diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.bor b/TAO/orbsvcs/orbsvcs/CosNotification.bor
index 7969399ba7e..7346980e018 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotification.bor
+++ b/TAO/orbsvcs/orbsvcs/CosNotification.bor
@@ -31,69 +31,69 @@ OBJFILES = \
 	$(OBJDIR)\NotifyExtS.obj \
 	$(OBJDIR)\Event_ForwarderC.obj \
 	$(OBJDIR)\Event_ForwarderS.obj \
-        $(OBJDIR)\Notify_Extensions \
-        $(OBJDIR)\Event_Manager \
-        $(OBJDIR)\Admin \
-        $(OBJDIR)\AdminProperties\
-        $(OBJDIR)\Any\AnyEvent \
-        $(OBJDIR)\Any\CosEC_ProxyPushConsumer \
-        $(OBJDIR)\Any\CosEC_ProxyPushSupplier \
-        $(OBJDIR)\Any\ProxyPushConsumer \
-        $(OBJDIR)\Any\ProxyPushSupplier \
-        $(OBJDIR)\Any\PushConsumer \
-        $(OBJDIR)\Any\PushSupplier \
-        $(OBJDIR)\Buffering_Strategy \
-        $(OBJDIR)\Builder \
-        $(OBJDIR)\Consumer \
-        $(OBJDIR)\ConsumerAdmin \
-        $(OBJDIR)\Container \
-        $(OBJDIR)\Event \
-        $(OBJDIR)\EventChannel \
-        $(OBJDIR)\EventChannelFactory \
-        $(OBJDIR)\EventType \
-        $(OBJDIR)\EventTypeSeq \
-        $(OBJDIR)\Factory \
-        $(OBJDIR)\FilterAdmin \
-        $(OBJDIR)\ID_Factory \
-        $(OBJDIR)\Method_Request \
-        $(OBJDIR)\Method_Request_Dispatch \
-        $(OBJDIR)\Method_Request_Dispatch_No_Filtering \
-        $(OBJDIR)\Object \
-        $(OBJDIR)\Method_Request_Lookup \
-        $(OBJDIR)\Method_Request_Shutdown \
-        $(OBJDIR)\Notify_Service \
-        $(OBJDIR)\Peer \
-        $(OBJDIR)\POA_Helper \
-        $(OBJDIR)\Properties \
-        $(OBJDIR)\PropertySeq \
-        $(OBJDIR)\Property_Boolean \
-        $(OBJDIR)\Proxy \
-        $(OBJDIR)\ProxyConsumer \
-        $(OBJDIR)\ProxySupplier \
-        $(OBJDIR)\QoSProperties \
-        $(OBJDIR)\Reactive_Task \
-        $(OBJDIR)\Refcountable \
-        $(OBJDIR)\Sequence\EventBatch \
-        $(OBJDIR)\Sequence\Method_Request_Dispatch_EventBatch \
-        $(OBJDIR)\Sequence\SequenceProxyPushConsumer \
-        $(OBJDIR)\Sequence\SequenceProxyPushSupplier \
-        $(OBJDIR)\Sequence\SequencePushConsumer \
-        $(OBJDIR)\Sequence\SequencePushSupplier \
-        $(OBJDIR)\Structured\StructuredEvent \
-        $(OBJDIR)\Structured\StructuredProxyPushConsumer \
-        $(OBJDIR)\Structured\StructuredProxyPushSupplier \
-        $(OBJDIR)\Structured\StructuredPushConsumer \
-        $(OBJDIR)\Structured\StructuredPushSupplier \
-        $(OBJDIR)\Supplier \
-        $(OBJDIR)\Subscription_Change_Worker \
-        $(OBJDIR)\SupplierAdmin \
-        $(OBJDIR)\ThreadPool_Task \
-        $(OBJDIR)\Types \
-        $(OBJDIR)\Worker_Task
-        $(OBJDIR)\ETCL_Filter \
-        $(OBJDIR)\ETCL_FilterFactory \
-        $(OBJDIR)\Constraint_Interpreter \
-        $(OBJDIR)\Constraint_Visitors
+        $(OBJDIR)\Notify_Extensions.obj \
+        $(OBJDIR)\Event_Manager.obj \
+        $(OBJDIR)\Admin.obj \
+        $(OBJDIR)\AdminProperties.obj \
+        $(OBJDIR)\Any\AnyEvent.obj \
+        $(OBJDIR)\Any\CosEC_ProxyPushConsumer.obj \
+        $(OBJDIR)\Any\CosEC_ProxyPushSupplier.obj \
+        $(OBJDIR)\Any\ProxyPushConsumer.obj \
+        $(OBJDIR)\Any\ProxyPushSupplier.obj \
+        $(OBJDIR)\Any\PushConsumer.obj \
+        $(OBJDIR)\Any\PushSupplier.obj \
+        $(OBJDIR)\Buffering_Strategy.obj \
+        $(OBJDIR)\Builder.obj \
+        $(OBJDIR)\Consumer.obj \
+        $(OBJDIR)\ConsumerAdmin.obj \
+        $(OBJDIR)\Container.obj \
+        $(OBJDIR)\Event.obj \
+        $(OBJDIR)\EventChannel.obj \
+        $(OBJDIR)\EventChannelFactory.obj \
+        $(OBJDIR)\EventType.obj \
+        $(OBJDIR)\EventTypeSeq.obj \
+        $(OBJDIR)\Factory.obj \
+        $(OBJDIR)\FilterAdmin.obj \
+        $(OBJDIR)\ID_Factory.obj \
+        $(OBJDIR)\Method_Request.obj \
+        $(OBJDIR)\Method_Request_Dispatch.obj \
+        $(OBJDIR)\Method_Request_Dispatch_No_Filtering.obj \
+        $(OBJDIR)\Object.obj \
+        $(OBJDIR)\Method_Request_Lookup.obj \
+        $(OBJDIR)\Method_Request_Shutdown.obj \
+        $(OBJDIR)\Notify_Service.obj \
+        $(OBJDIR)\Peer.obj \
+        $(OBJDIR)\POA_Helper.obj \
+        $(OBJDIR)\Properties.obj \
+        $(OBJDIR)\PropertySeq.obj \
+        $(OBJDIR)\Property_Boolean.obj \
+        $(OBJDIR)\Proxy.obj \
+        $(OBJDIR)\ProxyConsumer.obj \
+        $(OBJDIR)\ProxySupplier.obj \
+        $(OBJDIR)\QoSProperties.obj \
+        $(OBJDIR)\Reactive_Task.obj \
+        $(OBJDIR)\Refcountable.obj \
+        $(OBJDIR)\Sequence\EventBatch.obj \
+        $(OBJDIR)\Sequence\Method_Request_Dispatch_EventBatch.obj \
+        $(OBJDIR)\Sequence\SequenceProxyPushConsumer.obj \
+        $(OBJDIR)\Sequence\SequenceProxyPushSupplier.obj \
+        $(OBJDIR)\Sequence\SequencePushConsumer.obj \
+        $(OBJDIR)\Sequence\SequencePushSupplier.obj \
+        $(OBJDIR)\Structured\StructuredEvent.obj \
+        $(OBJDIR)\Structured\StructuredProxyPushConsumer.obj \
+        $(OBJDIR)\Structured\StructuredProxyPushSupplier.obj \
+        $(OBJDIR)\Structured\StructuredPushConsumer.obj \
+        $(OBJDIR)\Structured\StructuredPushSupplier.obj \
+        $(OBJDIR)\Supplier.obj \
+        $(OBJDIR)\Subscription_Change_Worker.obj \
+        $(OBJDIR)\SupplierAdmin.obj \
+        $(OBJDIR)\ThreadPool_Task.obj \
+        $(OBJDIR)\Types.obj \
+        $(OBJDIR)\Worker_Task.obj \
+        $(OBJDIR)\ETCL_Filter.obj \
+        $(OBJDIR)\ETCL_FilterFactory.obj \
+        $(OBJDIR)\Constraint_Interpreter.obj \
+        $(OBJDIR)\Constraint_Visitors.obj
 
 RESOURCE = $(OBJDIR)\CosNotification.res