ChangeLogTag: Wed Aug 2 17:47:59 2000 Balachandran Natarajan <bala@cs.wustl.edu>

5 files changed, 151 insertions, 24 deletions

diff --git a/TAO/orbsvcs/orbsvcs/CosNotification.bor b/TAO/orbsvcs/orbsvcs/CosNotification.bor
index 92ef396f3e0..6688db0c32d 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotification.bor
+++ b/TAO/orbsvcs/orbsvcs/CosNotification.bor
@@ -1,11 +1,11 @@
 #
-# Makefile for building the TAO CosNotification library
+# Makefile for building	the TAO	CosNotification	library
 #
 
 NAME = TAO_CosNotification
 
-TAO_IDL = $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
-	-I..\.. -Ge 1 -Wb,export_macro=TAO_Notify_Export \
+TAO_IDL	= $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
+	-I..\..	-Ge 1 -Wb,export_macro=TAO_Notify_Export \
 	-Wb,export_include=Notify/notify_export.h -Wb,pre_include=ace/pre.h \
 	-Wb,post_include=ace/post.h
 
@@ -24,25 +24,38 @@ OBJFILES = \
 	$(OBJDIR)\CosNotifyCommS.obj \
 	$(OBJDIR)\CosNotifyFilterC.obj \
 	$(OBJDIR)\CosNotifyFilterS.obj \
+	$(OBJDIR)\Notify_Collection.obj	\
 	$(OBJDIR)\Notify_Constraint_Interpreter.obj \
 	$(OBJDIR)\Notify_Constraint_Visitors.obj \
 	$(OBJDIR)\Notify_ConsumerAdmin_i.obj \
+	$(OBJDIR)\Notify_Default_CO_Factory.obj	\
+	$(OBJDIR)\Notify_Default_Collection_Factory.obj	\
+	$(OBJDIR)\Notify_Default_EMO_Factory.obj \
+	$(OBJDIR)\Notify_Default_POA_Factory.obj \
+	$(OBJDIR)\Notify_Event.obj \
+	$(OBJDIR)\Notify_Event_Dispatch_Command.obj \
 	$(OBJDIR)\Notify_Event_Manager.obj \
+	$(OBJDIR)\Notify_Event_Map.obj \
+	$(OBJDIR)\Notify_Event_Processor.obj \
 	$(OBJDIR)\Notify_EventChannel_i.obj \
 	$(OBJDIR)\Notify_EventChannelFactory_i.obj \
+	$(OBJDIR)\Notify_Factory.obj \
 	$(OBJDIR)\Notify_Filter_i.obj \
 	$(OBJDIR)\Notify_FilterAdmin_i.obj \
 	$(OBJDIR)\Notify_FilterFactory_i.obj \
+	$(OBJDIR)\Notify_Listener_Filter_Eval_Command.obj \
+	$(OBJDIR)\Notify_Lookup_Command.obj \
 	$(OBJDIR)\Notify_ProxyPushConsumer_i.obj \
 	$(OBJDIR)\Notify_ProxyPushSupplier_i.obj \
-	$(OBJDIR)\Notify_QoSAdmin_i.obj \
-	$(OBJDIR)\Notify_Resource_Manager.obj \
+	$(OBJDIR)\Notify_QoSAdmin_i.obj	\
 	$(OBJDIR)\Notify_SequenceProxyPushConsumer_i.obj \
 	$(OBJDIR)\Notify_SequenceProxyPushSupplier_i.obj \
+	$(OBJDIR)\Notify_Source_Filter_Eval_Command.obj	\
 	$(OBJDIR)\Notify_StructuredProxyPushConsumer_i.obj \
 	$(OBJDIR)\Notify_StructuredProxyPushSupplier_i.obj \
 	$(OBJDIR)\Notify_SupplierAdmin_i.obj \
-	$(OBJDIR)\Notify_Types.obj
+	$(OBJDIR)\Notify_Update_Dispatch_Command.obj \
+	$(OBJDIR)\Notify_Worker_Task.obj
 
 RESOURCE = $(OBJDIR)\orbsvcs.res
 
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.bor b/TAO/orbsvcs/orbsvcs/Makefile.bor
index 5f2d45051cf..24f589ffdce 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.bor
+++ b/TAO/orbsvcs/orbsvcs/Makefile.bor
@@ -1,11 +1,11 @@
 #
-# Makefile for building the TAO ORB Services libraries
+# Makefile for building	the TAO	ORB Services libraries
 #
 
 MAKEFILES = \
 	Svc_Utils.bor \
 	CosNaming.bor \
-	CosProperty.bor \
+	CosProperty.bor	\
 	CosTrading.bor \
 	RTSched.bor \
 	RTEvent.bor \
@@ -13,6 +13,8 @@ MAKEFILES = \
 	RTSchedEvent.bor \
 	CosEvent.bor \
 	CosNotification.bor \
+	Security.bor \
+	SSLIOP.bor \
 	AV.bor \
 	CosConcurrency.bor \
 	CosLifeCycle.bor \
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h
index 8a495f27b0d..5933500078c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h
@@ -1,5 +1,6 @@
 /* -*- C++ -*- */
-// $Id$
+// Notify_Worker_Task.h,v 1.1 2000/07/19 02:40:06 pradeep Exp
+//$Id$
 //
 // ============================================================================
 //
@@ -17,15 +18,15 @@
 //
 // ============================================================================
 
-#ifndef TAO_NOTIFY_WORKER_TASK_H
-#define TAO_NOTIFY_WORKER_TASK_H
+#ifndef	TAO_NOTIFY_WORKER_TASK_H
+#define	TAO_NOTIFY_WORKER_TASK_H
 
 #include "ace/pre.h"
 #include "ace/Task.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
+#endif /* ACE_LACKS_PRAGMA_ONCE	*/
 
 #include "tao/corba.h"
 #include "Notify_Command.h"
@@ -33,14 +34,14 @@
 
 class TAO_Notify_Event_Manager;
 
-class TAO_Notify_Export TAO_Notify_Worker_Task : public ACE_Task<ACE_SYNCH>
+class TAO_Notify_Export	TAO_Notify_Worker_Task : public	ACE_Task<ACE_SYNCH>
 {
   // = TITLE
   //   TAO_Notify_Worker_Task
   //
   // = DESCRIPTION
-  //   A worker task that we use for various event processing jobs.
-  //   Also see TAO_Notify_Command - This task executes Notify_Command objects.
+  //   A worker	task that we use for various event processing jobs.
+  //   Also see	TAO_Notify_Command - This task executes	Notify_Command objects.
   //
 public:
   // = Initialization and termination code
@@ -51,13 +52,13 @@ public:
   // Activate the task if <active_object_> is set.
 
   virtual int svc (void);
-  // svc command objects stored in the message queue.
+  // svc command objects stored	in the message queue.
 
-  void shutdown (CORBA::Environment& ACE_TRY_ENV);
+  void shutdown	(CORBA::Environment& ACE_TRY_ENV);
   // shutdown this task.
 
-  virtual int process_event (TAO_Notify_Command *mb, CORBA::Environment& ACE_TRY_ENV, ACE_Time_Value *tv = 0);
-  // Allows the producer to pass messages to the <Message_Block>.
+  virtual int process_event (TAO_Notify_Command	*mb, CORBA::Environment& ACE_TRY_ENV, ACE_Time_Value *tv = 0);
+  // Allows the	producer to pass messages to the <Message_Block>.
 
   TAO_Notify_Event_Manager* event_manager (void);
   // access manager.
@@ -70,25 +71,25 @@ public:
   // The Event Manager using us.
 
   CORBA::Boolean activate_object_;
-  // Is this an active object.
+  // Is	this an	active object.
 };
 
 //****************************************************************************************
 
-class TAO_Notify_Export TAO_Notify_Shutdown_Command : public TAO_Notify_Command
+class TAO_Notify_Export	TAO_Notify_Shutdown_Command : public TAO_Notify_Command
 {
   // = TITLE
   //   TAO_Notify_Shutdown_Command
   //
   // = DESCRIPTION
-  //   Shutdown command to shutdown the task.
+  //   Shutdown	command	to shutdown the	task.
   //
  public:
   virtual int execute (TAO_Notify_Worker_Task* parent_task, CORBA::Environment&);
-  // Returns -1. This signals worker threads to finish servicing requests.
+  // Returns -1. This signals worker threads to	finish servicing requests.
 };
 
 //****************************************************************************************
 
-#include "ace/pre.h"
+#include "ace/post.h"
 #endif /* TAO_NOTIFY_WORKER_TASK_H */
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP.bor b/TAO/orbsvcs/orbsvcs/SSLIOP.bor
new file mode 100644
index 00000000000..7f71a038676
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP.bor
@@ -0,0 +1,60 @@
+#
+# Makefile for building	the TAO	SSLIOP library
+#
+
+NAME = TAO_SSLIOP
+
+TAO_IDL	= $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
+	-I..\..	-Ge 1 -Wb,export_macro=TAO_SSLIOP_Export \
+	-Wb,export_include=SSLIOP/SSLIOP_Export.h -Wb,pre_include=ace/pre.h \
+	-Wb,post_include=ace/post.h
+
+IDLFILES = \
+	$(IDLDIR)\SSLIOP.idl
+
+OBJFILES = \
+	$(OBJDIR)\SSLIOP_Factory.obj \
+	$(OBJDIR)\SSLIOP_Profile.obj \
+	$(OBJDIR)\SSLIOP_Transport.obj \
+	$(OBJDIR)\SSLIOP_Connector.obj \
+	$(OBJDIR)\SSLIOP_Acceptor.obj \
+	$(OBJDIR)\SSLIOP_Connect.obj \
+	$(OBJDIR)\SSLIOPC.obj \
+	$(OBJDIR)\SSLIOPS.obj
+
+RESOURCE = $(OBJDIR)\orbsvcs.res
+
+!ifdef STATIC
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(ACE_SSL_CFLAGS) \
+	$(SSL_CFLAGS) $(TAO_SECURITY_CFLAGS) $(TAO_SSLIOP_CFLAGS)
+!else
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(ACE_SSL_CFLAGS) \
+	$(SSL_CFLAGS) $(TAO_SECURITY_CFLAGS) $(TAO_SSLIOP_CFLAGS) \
+	-DTAO_SSLIOP_BUILD_DLL
+!endif
+
+CPPDIR = .;SSLIOP
+
+IDLDIR = .
+
+INCDIR_NAME = orbsvcs\SSLIOP
+INCLUDES = SSLIOP\*.h SSLIOP\*.i
+
+LIBFILES = $(ACE_LIB) $(TAO_LIB) $(ACE_SSL_LIB)	$(SSL_LIB) \
+	$(TAO_SECURITY_LIB)
+
+all: idl_src_files ssliop_lib
+
+!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
+
+ssliop_lib: $(TARGET)
+
+
+#
+# IDL Build rules
+#
+
+idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
+
+$(IDLDIR)\SSLIOPC.cpp $(IDLDIR)\SSLIOPS.cpp: $(IDLDIR)\SSLIOP.idl
+	$(TAO_IDL) $**
diff --git a/TAO/orbsvcs/orbsvcs/Security.bor b/TAO/orbsvcs/orbsvcs/Security.bor
new file mode 100644
index 00000000000..a2e0e651005
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Security.bor
@@ -0,0 +1,51 @@
+#
+# Makefile for building	the TAO	Security library
+#
+
+NAME = TAO_Security
+
+TAO_IDL	= $(CORE_BINDIR)\tao_idl -g $(CORE_BINDIR)\gperf.exe \
+	-I..\..	-Ge 1 -Wb,export_macro=TAO_Security_Export \
+	-Wb,export_include=Security/security_export.h -Wb,pre_include=ace/pre.h	\
+	-Wb,post_include=ace/post.h
+
+IDLFILES = \
+	$(IDLDIR)\Security.idl
+
+OBJFILES = \
+	$(OBJDIR)\SecurityC.obj	\
+	$(OBJDIR)\SecurityS.obj
+
+RESOURCE = $(OBJDIR)\orbsvcs.res
+
+!ifdef STATIC
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_SECURITY_CFLAGS)
+!else
+CFLAGS = $(ACE_CFLAGS) $(TAO_CFLAGS) $(TAO_SECURITY_CFLAGS) \
+	-DTAO_SECURITY_BUILD_DLL
+!endif
+
+CPPDIR = .;Security
+
+IDLDIR = .
+
+INCDIR_NAME = orbsvcs\Security
+INCLUDES = Security\*.h
+
+LIBFILES = $(ACE_LIB) $(TAO_LIB) $(TAO_SVC_UTILS_LIB)
+
+all: idl_src_files security_lib
+
+!include <$(ACE_ROOT)\include\makeinclude\build_core_library.bor>
+
+security_lib: $(TARGET)
+
+
+#
+# IDL Build rules
+#
+
+idl_src_files: $(IDLFILES:.idl=C.cpp) $(IDLFILES:.idl=S.cpp)
+
+$(IDLDIR)\SecurityC.cpp	$(IDLDIR)\SecurityS.cpp: $(IDLDIR)\Security.idl
+	$(TAO_IDL) $**