Tue Nov 26 13:41:21 2002 Pradeep Gore <pradeep@oomworks.com>

9 files changed, 20 insertions, 70 deletions

diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.bor b/TAO/orbsvcs/orbsvcs/CosNotification.bor
index aacb1630b9a..dbdd8fd59b3 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotification.bor
+++ b/TAO/orbsvcs/orbsvcs/CosNotification.bor
@@ -92,8 +92,8 @@ OBJFILES = \
         $(OBJDIR)\Worker_Task.obj \
         $(OBJDIR)\ETCL_Filter.obj \
         $(OBJDIR)\ETCL_FilterFactory.obj \
-        $(OBJDIR)\Constraint_Interpreter.obj \
-        $(OBJDIR)\Constraint_Visitors.obj \
+        $(OBJDIR)\Notify_Constraint_Interpreter.obj \
+        $(OBJDIR)\Notify_Constraint_Visitors.obj \
         $(OBJDIR)\Notify_Default_CO_Factory.obj \
         $(OBJDIR)\Notify_Default_Collection_Factory.obj \
         $(OBJDIR)\Notify_Default_EMO_Factory.obj \
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.CosNotification b/TAO/orbsvcs/orbsvcs/Makefile.CosNotification
index e80d44e44b6..d527a9f68fe 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.CosNotification
+++ b/TAO/orbsvcs/orbsvcs/Makefile.CosNotification
@@ -117,8 +117,8 @@ CPP_SRCS += \
 CPP_SRCS += \
         Notify/ETCL_Filter \
         Notify/ETCL_FilterFactory \
-        Notify/Constraint_Interpreter \
-        Notify/Constraint_Visitors \
+        Notify/Notify_Constraint_Interpreter \
+        Notify/Notify_Constraint_Visitors \
 
 IDL_SRC = \
         $(addsuffix S.cpp, $(IDL_FILES)) \
@@ -19901,14 +19901,14 @@ realclean: clean
  CosNotifyFilterS_T.i \
  CosNotifyFilterS_T.cpp \
  CosNotifyFilterS.i \
- Notify/Constraint_Interpreter.h \
+ Notify/Notify_Constraint_Interpreter.h \
  ETCL/ETCL_Interpreter.h \
  ETCL/etcl_export.h \
  ETCL/ETCL_Constraint.h \
  ETCL/ETCL_Constraint.inl \
  Notify/ETCL_Filter.inl \
  $(TAO_ROOT)/tao/debug.h \
- Notify/Constraint_Visitors.h \
+ Notify/Notify_Constraint_Visitors.h \
  ETCL/ETCL_Constraint_Visitor.h
 
 .obj/ETCL_FilterFactory.o .obj/ETCL_FilterFactory.so .shobj/ETCL_FilterFactory.o .shobj/ETCL_FilterFactory.so: Notify/ETCL_FilterFactory.cpp \
@@ -20183,15 +20183,15 @@ realclean: clean
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
  $(ACE_ROOT)/ace/Reactor.i \
  $(ACE_ROOT)/ace/Reactor_Impl.h \
- Notify/Constraint_Interpreter.h \
+ Notify/Notify_Constraint_Interpreter.h \
  ETCL/ETCL_Interpreter.h \
  ETCL/etcl_export.h \
  ETCL/ETCL_Constraint.h \
  ETCL/ETCL_Constraint.inl \
  Notify/ETCL_Filter.inl
 
-.obj/Constraint_Interpreter.o .obj/Constraint_Interpreter.so .shobj/Constraint_Interpreter.o .shobj/Constraint_Interpreter.so: Notify/Constraint_Interpreter.cpp \
- Notify/Constraint_Interpreter.h \
+.obj/Notify_Constraint_Interpreter.o .obj/Notify_Constraint_Interpreter.so .shobj/Notify_Constraint_Interpreter.o .shobj/Notify_Constraint_Interpreter.so: Notify/Notify_Constraint_Interpreter.cpp \
+ Notify/Notify_Constraint_Interpreter.h \
  $(ACE_ROOT)/ace/pre.h \
  ETCL/ETCL_Interpreter.h \
  ETCL/etcl_export.h \
@@ -20387,7 +20387,7 @@ realclean: clean
  CosEventCommC.i \
  CosNotifyCommC.i \
  CosNotifyFilterC.i \
- Notify/notify_export.h Notify/Constraint_Visitors.h \
+ Notify/notify_export.h Notify/Notify_Constraint_Visitors.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Functor.h \
@@ -20422,8 +20422,8 @@ realclean: clean
  $(ACE_ROOT)/ace/Reactor_Impl.h \
  ETCL/ETCL_Constraint_Visitor.h
 
-.obj/Constraint_Visitors.o .obj/Constraint_Visitors.so .shobj/Constraint_Visitors.o .shobj/Constraint_Visitors.so: Notify/Constraint_Visitors.cpp \
- Notify/Constraint_Visitors.h \
+.obj/Notify_Constraint_Visitors.o .obj/Notify_Constraint_Visitors.so .shobj/Notify_Constraint_Visitors.o .shobj/Notify_Constraint_Visitors.so: Notify/Notify_Constraint_Visitors.cpp \
+ Notify/Notify_Constraint_Visitors.h \
  $(ACE_ROOT)/ace/pre.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/post.h \
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
index 562a6f9d6a0..df575458c46 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
@@ -10,7 +10,7 @@ ACE_RCSID(Notify, TAO_ETCL_Filter, "$id$")
 
 #include "ace/Auto_Ptr.h"
 #include "tao/debug.h"
-#include "Constraint_Visitors.h"
+#include "Notify_Constraint_Visitors.h"
 
 TAO_NS_ETCL_Filter::TAO_NS_ETCL_Filter (void)
 {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
index 853340b2cb9..6a6dc6cecbe 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h
@@ -23,7 +23,7 @@
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Atomic_Op.h"
 #include "orbsvcs/CosNotifyFilterS.h"
-#include "Constraint_Interpreter.h"
+#include "Notify_Constraint_Interpreter.h"
 
 #if defined(_MSC_VER)
 #if (_MSC_VER >= 1200)
@@ -35,7 +35,7 @@
 /**
  * @class TAO_ETCL_Filter
  *
- * @brief
+ * @brief Implementation of CosNotifyFilter::Filter servant.
  *
  */
 class TAO_Notify_Export TAO_NS_ETCL_Filter : public POA_CosNotifyFilter::Filter, public PortableServer::RefCountServantBase
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Forwarder.idl b/TAO/orbsvcs/orbsvcs/Notify/Event_Forwarder.idl
deleted file mode 100644
index bab9f7611c5..00000000000
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Forwarder.idl
+++ /dev/null
@@ -1,50 +0,0 @@
-
-/**
- * @file Event_Forwarder.idl
- *
- * @brief
- *
- * $Id$
- *
- * @author Pradeep Gore <pradeep@oomworks.com>
- */
-
-#ifndef _EVENT_FORWARDER_IDL_
-#define _EVENT_FORWARDER_IDL_
-
-#include "CosNotification.idl"
-#include "CosNotifyChannelAdmin.idl"
-
-#pragma prefix ""
-
-/**
- * @namespace Event_Forwarder
- *
- * @brief
- */
-module Event_Forwarder
-{
-  interface StructuredProxyPushSupplier : CosNotifyChannelAdmin::StructuredProxyPushSupplier
-  {
-    void forward_structured (in CosNotification::StructuredEvent event);
-
-    void forward_structured_no_filtering (in CosNotification::StructuredEvent event);
-
-    void forward_any (in any event);
-
-    void forward_any_no_filtering (in any event);
-  };
-
-  interface ProxyPushSupplier : CosNotifyChannelAdmin::ProxyPushSupplier
-  {
-    void forward_structured (in CosNotification::StructuredEvent event);
-
-    void forward_structured_no_filtering (in CosNotification::StructuredEvent event);
-
-    void forward_any (in any event);
-
-    void forward_any_no_filtering (in any event);
-  };
-};
-
-#endif /* _EVENT_FORWARDER_IDL_ */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Constraint_Interpreter.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
index 8cb1eac6dd0..0dc683e4f0b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "Constraint_Interpreter.h"
-#include "Constraint_Visitors.h"
+#include "Notify_Constraint_Interpreter.h"
+#include "Notify_Constraint_Visitors.h"
 
 ACE_RCSID(Notify, NS_Constraint_Interpreter, "$Id$")
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
index 736582152c8..03ca6f6d4f4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
 //=============================================================================
 /**
- *  @file   Constraint_Interpreter.h
+ *  @file   Notify_Constraint_Interpreter.h
  *
  *  $Id$
  *
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
index 809c52bb05e..e7224c069a0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
 /* $Id$ */
 
-#include "Constraint_Visitors.h"
+#include "Notify_Constraint_Visitors.h"
 #include "orbsvcs/ETCL/ETCL_Constraint.h"
 #include "orbsvcs/ETCL/ETCL_y.h"
 #include "tao/DynamicAny/DynArray_i.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
index b78af944a8a..4b356c9945f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
@@ -1,7 +1,7 @@
 /* -*- C++ -*- */
 //=============================================================================
 /**
- *  @file   Constraint_Visitors.h
+ *  @file   Notify_Constraint_Visitors.h
  *
  *  $Id$
  *