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

7 files changed, 309 insertions, 161 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index da349a96240..b382ad39c13 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,21 @@
+Wed Aug  2 17:47:59 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* orbsvcs/orbsvcs/CosNotification.bor:
+
+       	* Makefile.bor:
+       	* orbsvcs/orbsvcs/Makefile.bor:
+       	* orbsvcs/orbsvcs/Security.bor:
+       	* orbsvcs/orbsvcs/SSLIOP.bor: Add makefile support for the SSL and
+	  security libraries in ACE and TAO.
+
+     	* orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h: Added a post.h at
+	  the end of the file.
+
+	  The above patches were taken from
+	  http://www.tenermerx.com/programming/corba/tao_bcb/patch.html,
+	  which is the site maintained by Chistopher Kohlhoff
+	  <chris@kohlhoff.com>.
+
 Wed Aug  2 14:03:28 2000  Carlos O'Ryan  <coryan@uci.edu>
 
 	* tests/ORB_destroy/run_test.pl:
@@ -39,7 +57,7 @@ Tue Aug 01 03:11:25 2000  Irfan Pyarali  <irfan@cs.wustl.edu>
 Tue Aug  1 01:48:52 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
 
 	* orbsvcs/orbsvcs/Notify/Notify_Event_Manager.{h,cpp}:
-	* orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.{h,cpp}: 
+	* orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.{h,cpp}:
 	  Juggled header files to fix VxWorks warnings.
 
 Mon Jul 31 22:51:47 2000  Balachandran  <bala@cs.wustl.edu>
@@ -57,8 +75,8 @@ Sun Jul 30 16:13:37 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* orbsvcs/orbsvcs/Notify/Notify_Collection.h:
 	* orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h:
-	* orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp: 
-	  
+	* orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp:
+
 	  Should fix the rest of the problems in vxworks compilation.
 
 Sun Jul 30 09:15:13 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
@@ -70,17 +88,17 @@ Sun Jul 30 06:48:18 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp (get_vdev): Reverted
 	  the change that I made yesterday as it was complaining on
-	  Linux. 
+	  Linux.
 
 Sat Jul 29 22:01:12 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp:
 	* orbsvcs/orbsvcs/Notify/Notify_Collection.cpp:
 	* orbsvcs/orbsvcs/Notify/Notify_Collection.h:
-	* orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h: 
-	  
+	* orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h:
+
 	  Hopefully some of the errors in vxworks for Notification
-	  services and g++ in AV should be fixed. 
+	  services and g++ in AV should be fixed.
 
 Sat Jul 29 16:46:31 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 
@@ -109,7 +127,7 @@ Thu Jul 27 11:05:13 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 
 Wed Jul 26 23:20:46 2000  Andrew G. Gilpin  <agg1@cs.wustl.edu>
 
-	* performance-tests/Cubit/TAO/IDL_Cubit/README: 
+	* performance-tests/Cubit/TAO/IDL_Cubit/README:
 	  Fixed minor typo
 
 Wed Jul 26 20:56:41 2000  Jeff Parsons  <parsons@cs.wustl.edu>
@@ -121,9 +139,9 @@ Wed Jul 26 20:56:41 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 	* tao/DynStruct_i.cpp:
 	* tao/DynUnion_i.cpp:
 
-	  Francois Bernier <fbernier@gel.ulaval.ca> reported some 
+	  Francois Bernier <fbernier@gel.ulaval.ca> reported some
   	  memory leaks in TAO_DynAny_i. Upon checking this out
-	  and making a pass through all the Dyn*_i files, I found a 
+	  and making a pass through all the Dyn*_i files, I found a
 	  lot more cases that needed fixing, stemming mostly from
 	  recent changes to CORBA::Any's TypeCode member
 	  and accessor. There were also some Dyn* accessors that
@@ -162,16 +180,16 @@ Tue Jul 25 08:21:03 2000  Chad Elliott  <elliott_c@ociweb.com>
 
 Mon Jul 24 16:22:02 2000  Yamuna Krishnamurthy  <yamuna@cs.wustl.edu>
 
-	* orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp: 
-	  
+	* orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp:
+
 	  Fixed compile warnings on KCC 3.4
 
 Mon Jul 24 16:07:25 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
-        * orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp: 
+        * orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp:
 	* orbsvcs/tests/Notify/Basic/Updates.cpp:
 	  fixes for errors building on vxworks - added #pragma
 	  instantiate, missing class keyword.
-	
+
 Mon Jul 24 14:03:59 2000  Chad Elliott  <elliott_c@ociweb.com>
         * rules.tao.GNU
         * orbsvcs/orbsvcs/Makefile
@@ -254,9 +272,9 @@ Sun Jul 23 22:01:23 2000  Irfan Pyarali  <irfan@cs.wustl.edu>
 
 Sun Jul 23 18:18:35 2000  Yamuna Krishnamurthy  <yamuna@cs.wustl.edu>
 
-	* orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp: 
-	* orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp: 
-	* orbsvcs/tests/AVStreams/Multicast/ftp.cpp: 
+	* orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp:
+	* orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp:
+	* orbsvcs/tests/AVStreams/Multicast/ftp.cpp:
 
 	Fixed Compile Warnings
 
@@ -269,7 +287,7 @@ Sat Jul 22 17:36:58 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 	* orbsvcs/IFR_Service/ModuleDef_i.cpp:
 
 	  Fixed several places where wrapper function (instead of
-	  the '_i' unlocked wrapped version) was called from inside 
+	  the '_i' unlocked wrapped version) was called from inside
 	  a critical section.
 
 Sat Jul 22 16:30:39 2000  Jeff Parsons  <parsons@cs.wustl.edu>
@@ -317,15 +335,15 @@ Sat Jul 22 16:30:39 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 
 Sat Jul 22 09:53:02 2000  Yamuna Krishnamurthy  <yamuna@danzon.cs.wustl.edu>
 
-	* orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp: 
-	* orbsvcs/tests/AVStreams/Multicast/ftp.cpp: 
-	* orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp: 
+	* orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp:
+	* orbsvcs/tests/AVStreams/Multicast/ftp.cpp:
+	* orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp:
 
-	Fixed compile warnings	
+	Fixed compile warnings
 
 Fri Jul 21 17:54:55 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* tao/Invocation.cpp (reset_reply_received): 
+	* tao/Invocation.cpp (reset_reply_received):
 	* tao/Invocation.h: Added a new method reset_reply_received
 	  (). This method resets the reply_received field in the
 	  Invocation classes.
@@ -387,46 +405,46 @@ Thu Jul 20 04:53:02 2000  Darrell Brunsch <brunsch@uci.edu>
 
 Thu Jul 20 19:49:06 2000  Yamuna Krishnamurthy  <yamuna@cs.wustl.edu>
 
-	* orbsvcs/orbsvcs/AV/AVStreams_i.cpp: 
-		
-	  Fixed Compilation Errors and Warning	
+	* orbsvcs/orbsvcs/AV/AVStreams_i.cpp:
+
+	  Fixed Compilation Errors and Warning
 
 Thu Jul 20 18:37:46 2000  Yamuna Krishnamurthy  <yamuna@cs.wustl.edu>
 
 	* orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp:
-	
-	  Replaced the TAO_AV_Core run with the orb run	
-	
-	* orbsvcs/tests/AVStreams/Full_Profile/README: 
+
+	  Replaced the TAO_AV_Core run with the orb run
+
+	* orbsvcs/tests/AVStreams/Full_Profile/README:
 
 	  Added the README for the test
-		
-	* orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp: 
-	  
-	  Replaced the TAO_AV_Core run with the orb run	
-		
-	* orbsvcs/tests/AVStreams/Multicast_Full_Profile/README: 
-	  
+
+	* orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp:
+
+	  Replaced the TAO_AV_Core run with the orb run
+
+	* orbsvcs/tests/AVStreams/Multicast_Full_Profile/README:
+
 	  Added the REAME file for the test
-		
-	* orbsvcs/tests/AVStreams/Multicast/ftp.cpp: 
-	  
+
+	* orbsvcs/tests/AVStreams/Multicast/ftp.cpp:
+
 	  Added a default multicast address and replaced the TAO_AV_Core
 	  run with the orb run
-		
-	* orbsvcs/tests/AVStreams/Multicast/README: 
-	  
+
+	* orbsvcs/tests/AVStreams/Multicast/README:
+
 	  Added the README file for the test
-	
-	* AVStreams_i.cpp: 
-	  
+
+	* AVStreams_i.cpp:
+
 	  Duplicated the flow device and flow endpoints before binding
 	  them to the corresponding hash maps to fix the AVStreams tests.
 
 	  Made the above changes to get the Multicast,
 	  Multicast_Full_Profile and Full_Profile tests running. Thanks to
-	  Craig Rodrigues <crodrigu@bbn.com> for pointing them out. 
-	
+	  Craig Rodrigues <crodrigu@bbn.com> for pointing them out.
+
 
 Thu Jul 20 15:28:17 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 
@@ -438,7 +456,7 @@ Thu Jul 20 14:07:47 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
 	* examples/Advanced/ch_21/{server,client}.cpp: Removed the need
 	  for the ostream extraction operator, which TAO doesn't need.
-  	  Thanks to Alex Hornby <alex@anvil.co.uk> for reporting this.	  
+  	  Thanks to Alex Hornby <alex@anvil.co.uk> for reporting this.
 
 Thu Jul 20 13:37:23 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 
@@ -455,7 +473,7 @@ Thu Jul 20 13:37:23 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 	  was removed, along with the command line option (-So) to
 	  suppress this generation. The ostream operator in the
 	  base class CORBA::Exception works fine and produces
-	  the same output. Thanks to Hans Utz 
+	  the same output. Thanks to Hans Utz
 	  <hans.utz@student.uni-ulm.de> for pointing this out.
 
 	* docs/compiler.html:
@@ -498,17 +516,17 @@ Wed Jul 19 14:41:06 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
 	* examples/Simple/chat/Makefile:
 	  Added missing Broadcaster.idl to the IDL_FILES declaration
 	  and updates dependencies.
-	
+
 Wed Jul 19 14:41:06 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
 
 	* docs/releasenotes/index.html:
 	  updated #notify to reflect recent additions.
-	
+
 Wed Jul 19 14:41:06 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
 
 	* orbsvcs/orbsvcs/CosNotification_Static.dsp:
 	  Added new Notify files, updated dependencies.
-	
+
 Wed Jul 19 11:32:27 2000  Irfan Pyarali  <irfan@cs.wustl.edu>
 
 	* examples/POA/Adapter_Activator/server.cpp (unknown_adapter):
@@ -521,12 +539,12 @@ Wed Jul 19 11:29:23 2000  Irfan Pyarali  <irfan@cs.wustl.edu>
 
 Tue Jul 18 23:09:19 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
 
-	* orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp 
-	* orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.cpp 
+	* orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.cpp
+	* orbsvcs/orbsvcs/Notify/Notify_QoSAdmin_i.cpp
 	  use shorter paths in #include directive.
 	* orbsvcs/orbsvcs/Makefile.CosNotification:
 	  updated dependencies.
-  	
+
 Tue Jul 18 21:39:39 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
 
 	Modified Files:
@@ -539,98 +557,98 @@ Tue Jul 18 21:39:39 2000  Pradeep Gore  <pradeep@cs.wustl.edu>
 	  This framework will allow implementation of QoS properties.
 	4. (Almost) all memory allocations are via factory interfaces.
 	   Default factories are provided.
-	
+
  	* orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
-	* orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h 
+	* orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
  	* orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.h
-	* orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h 
+	* orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
  	* orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.h
-	* orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h 
+	* orbsvcs/orbsvcs/Notify/Notify_Event_Manager.h
  	* orbsvcs/orbsvcs/Notify/Notify_FilterAdmin_i.h
 	* orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h
-	* orbsvcs/orbsvcs/Notify/Notify_Listeners.h 
+	* orbsvcs/orbsvcs/Notify/Notify_Listeners.h
  	* orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.h
-	* orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h 
+	* orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.h
  	* orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.h
-	* orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h 
+	* orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.h
 	* orbsvcs/orbsvcs/Notify/Notify_Proxy_T.h
-	* orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h 
-	* orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h 
-	* orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h 
-	* orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h 
-	* orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h 
-	* orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp 
+	* orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.h
+	* orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.h
+	* orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.h
+	* orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.h
+	* orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.h
+	* orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp
 	* orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
-	* orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp 
+	* orbsvcs/orbsvcs/Notify/Notify_EventChannel_i.cpp
 	* orbsvcs/orbsvcs/Notify/Notify_Event_Manager.cpp
-	* orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp 
+	* orbsvcs/orbsvcs/Notify/Notify_Filter_i.cpp
 	* orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.cpp
-	* orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.cpp 
+	* orbsvcs/orbsvcs/Notify/Notify_ProxyConsumer_T.cpp
 	* orbsvcs/orbsvcs/Notify/Notify_ProxyPushConsumer_i.cpp
-	* orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp 
+	* orbsvcs/orbsvcs/Notify/Notify_ProxyPushSupplier_i.cpp
 	* orbsvcs/orbsvcs/Notify/Notify_ProxySupplier_T.cpp
-	* orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp 
-	* orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.cpp 
-	* orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp 
-	* orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp 
-	* orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.cpp 
-	* orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp 
-	* orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.i 
+	* orbsvcs/orbsvcs/Notify/Notify_Proxy_T.cpp
+	* orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushConsumer_i.cpp
+	* orbsvcs/orbsvcs/Notify/Notify_SequenceProxyPushSupplier_i.cpp
+	* orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushConsumer_i.cpp
+	* orbsvcs/orbsvcs/Notify/Notify_StructuredProxyPushSupplier_i.cpp
+	* orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp
+	* orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.i
 
 	Added Files:
-	* orbsvcs/orbsvcs/Notify/Notify_Channel_Objects_Factory.h 
-	* orbsvcs/orbsvcs/Notify/Notify_Collection.h 
-	* orbsvcs/orbsvcs/Notify/Notify_Collection_Factory.h 
-	* orbsvcs/orbsvcs/Notify/Notify_Command.h 
-	* orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h 
-	* orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h 
+	* orbsvcs/orbsvcs/Notify/Notify_Channel_Objects_Factory.h
+	* orbsvcs/orbsvcs/Notify/Notify_Collection.h
+	* orbsvcs/orbsvcs/Notify/Notify_Collection_Factory.h
+	* orbsvcs/orbsvcs/Notify/Notify_Command.h
+	* orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h
+	* orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h
 	* orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h
-	* orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h 
+	* orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h
 	* orbsvcs/orbsvcs/Notify/Notify_Event.h
-	* orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.h 
-	* orbsvcs/orbsvcs/Notify/Notify_Event_Manager_Objects_Factory.h 
-	* orbsvcs/orbsvcs/Notify/Notify_Event_Map.h 
+	* orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.h
+	* orbsvcs/orbsvcs/Notify/Notify_Event_Manager_Objects_Factory.h
+	* orbsvcs/orbsvcs/Notify/Notify_Event_Map.h
 	* orbsvcs/orbsvcs/Notify/Notify_Event_Processor.h
-	* orbsvcs/orbsvcs/Notify/Notify_Factory.h 
+	* orbsvcs/orbsvcs/Notify/Notify_Factory.h
 	* orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.h
-	* orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.h 
+	* orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.h
 	* orbsvcs/orbsvcs/Notify/Notify_POA_Factory.h
-	* orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.h 
+	* orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.h
 	* orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.h
-	* orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h 
+	* orbsvcs/orbsvcs/Notify/Notify_Worker_Task.h
 	* orbsvcs/orbsvcs/Notify/Notify_Collection.cpp
-	* orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp 
-	* orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp 
+	* orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp
+	* orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
 	* orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp
-	* orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp 
+	* orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp
 	* orbsvcs/orbsvcs/Notify/Notify_Event.cpp
-	* orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.cpp 
+	* orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.cpp
 	* orbsvcs/orbsvcs/Notify/Notify_Event_Map.cpp
-	* orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp 
+	* orbsvcs/orbsvcs/Notify/Notify_Event_Processor.cpp
 	* orbsvcs/orbsvcs/Notify/Notify_Factory.cpp
-	* orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.cpp 
-	* orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.cpp 
-	* orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.cpp 
+	* orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.cpp
+	* orbsvcs/orbsvcs/Notify/Notify_Lookup_Command.cpp
+	* orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.cpp
 	* orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.cpp
-	* orbsvcs/orbsvcs/Notify/Notify_Worker_Task.cpp 
+	* orbsvcs/orbsvcs/Notify/Notify_Worker_Task.cpp
 	* orbsvcs/orbsvcs/Notify/Notify_Event_Manager.i
-	* orbsvcs/orbsvcs/Notify/Notify_Event_Map.i 
+	* orbsvcs/orbsvcs/Notify/Notify_Event_Map.i
 
 	Removed Files:
-	* orbsvcs/orbsvcs/Notify/Notify_Types.h 
-	* orbsvcs/orbsvcs/Notify/Notify_Types.cpp 
-	* orbsvcs/orbsvcs/Notify/Notify_Resource_Manager.h 
-	* orbsvcs/orbsvcs/Notify/Notify_Resource_Manager.cpp 
-		
+	* orbsvcs/orbsvcs/Notify/Notify_Types.h
+	* orbsvcs/orbsvcs/Notify/Notify_Types.cpp
+	* orbsvcs/orbsvcs/Notify/Notify_Resource_Manager.h
+	* orbsvcs/orbsvcs/Notify/Notify_Resource_Manager.cpp
+
 	Modified Files:
-	* orbsvcs/Notify_Service/Notify_Service.cpp 
+	* orbsvcs/Notify_Service/Notify_Service.cpp
 	* orbsvcs/orbsvcs/CosNotification.dsp
 	* orbsvcs/tests/Notify/lib/Notify_Test_Client.h
-	* orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp 
-	* orbsvcs/tests/Notify/Subscribe/Subscribe.h 
-	* orbsvcs/tests/Notify/Subscribe/Subscribe.cpp 
-	* orbsvcs/tests/Notify/Filter/Filter.h 
-	* orbsvcs/tests/Notify/Filter/Filter.cpp 
+	* orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
+	* orbsvcs/tests/Notify/Subscribe/Subscribe.h
+	* orbsvcs/tests/Notify/Subscribe/Subscribe.cpp
+	* orbsvcs/tests/Notify/Filter/Filter.h
+	* orbsvcs/tests/Notify/Filter/Filter.cpp
 
 	Added Files:
 	orbsvcs/Notify_Service/svc.conf
@@ -760,7 +778,7 @@ Tue Jul 18 11:41:42 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 Tue Jul 18 10:45:50 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* tao/Client_Priority_Policy.cpp: 
+	* tao/Client_Priority_Policy.cpp:
 	* tao/Client_Priority_Policy.h:
 	* tao/Buffering_Constraint_Policy.cpp:
 	* tao/Buffering_Constraint_Policy.h:
@@ -854,7 +872,7 @@ Mon Jul 17 13:26:53 2000  Ossama Othman  <ossama@uci.edu>
 
 Mon Jul 17 12:14:09 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* tao/RT_Policy_i.cpp (destroy): 
+	* tao/RT_Policy_i.cpp (destroy):
 	* tao/RT_Policy_i.h:
 	* tao/Policy_Manager.h:
 	* tao/Policy_Manager.i:
@@ -869,28 +887,28 @@ Mon Jul 17 11:17:30 2000  Jeff Parsons  <parsons@cs.wustl.edu>
 
 	* tests/IDL_Test/IDL_Test.dsp:
 
-	  Updated project settings for the two newest IDL files in the 
+	  Updated project settings for the two newest IDL files in the
 	  release version.
 
 Mon Jul 17 10:50:30 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* tao/PortableServerC.cpp: Fixed some link errors in Minimum CORBA
-	  builds. 
+	  builds.
 
 Sun Jul 16 16:17:23 2000  Darrell Brunsch <brunsch@uci.edu>
 
-        * tao/POA.cpp:  
+        * tao/POA.cpp:
 
           Thanks to the help of Alex Hornby <alex@anvil.co.uk>, one of
           my @@ TODO comments about the server_object has been resolved.
           Irfan suggested a long time back to put the servant object in
           the root_poa instead of the current poa.  I tried an initial
-          implementation, but wasn't using the correct API's, and 
-          deadlocks occurred on non-windows platforms (IOW, those that 
-          do not use recursive mutex's by default).  So I put in a 
+          implementation, but wasn't using the correct API's, and
+          deadlocks occurred on non-windows platforms (IOW, those that
+          do not use recursive mutex's by default).  So I put in a
           comment to look at later.
 
-          Alex then noticed that this change needed to be done to use 
+          Alex then noticed that this change needed to be done to use
           the H&V Evictor pattern with the ImR, and submitted a patch
           to do this.
 
@@ -907,7 +925,7 @@ Sun Jul 16 13:58:01 2000  Balachandran Natarajan  <bala@cs.wustl.edu>
 	* tao/POA.h:
 	* tao/POA.cpp: Fixed a few compile errors from SunCC5 and Minimum
 	  CORBA builds. They were mostly due to mismatched exception
-	  specifications. 
+	  specifications.
 
 Fri Jul 14 21:37:16 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
diff --git a/TAO/Makefile.bor b/TAO/Makefile.bor
index 4bb0fec8c9a..932de57e812 100644
--- a/TAO/Makefile.bor
+++ b/TAO/Makefile.bor
@@ -1,46 +1,49 @@
 #
-# Makefile for building ACE and TAO 
+# Makefile for building	ACE and	TAO
 #
 
-!ifndef BUILD
-BUILD = typical
+!ifndef	BUILD
+BUILD =	typical
 !endif
 
-!if $(BUILD) == minimal
+!if $(BUILD) ==	minimal
 
 DIRS = \
 	..\ace \
+	..\ace\SSL \
 	..\apps\gperf\src \
 	tao \
-	TAO_IDL \
+	TAO_IDL	\
 	orbsvcs
 
 !elif $(BUILD) == typical
 
 DIRS = \
 	..\ace \
+	..\ace\SSL \
 	..\apps\gperf\src \
 	tao \
-	TAO_IDL \
-	orbsvcs \
+	TAO_IDL	\
+	orbsvcs	\
 	utils
 
 !elif $(BUILD) == all
 
 DIRS = \
 	..\ace \
-	..\apps \
+	..\ace\SSL \
+	..\apps	\
 	..\netsvcs \
 	..\tests \
 	tao \
-	TAO_IDL \
-	orbsvcs \
+	TAO_IDL	\
+	orbsvcs	\
 	examples \
 	tests \
 	utils
 
 !else
-!error Please set your BUILD variable to one of "minimal", "typical" or "all".
+!error Please set your BUILD variable to one of	"minimal", "typical" or	"all".
 !endif
-	
+
 !include <$(ACE_ROOT)\include\makeinclude\recurse.bor>
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) $**