ChangeLogTag:Fri Mar 23 07:12:50 2001 Carlos O'Ryan <coryan@uci.edu>

3 files changed, 82 insertions, 77 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index feabb10ec9e..05fa398b27c 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,104 +1,109 @@
+Fri Mar 23 07:12:50 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * orbsvcs/examples/Notify/Subscribe/Makefile:
+        * orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile:
+          Add libraries to make QNX happy
+
 Fri Mar 23 06:44:12 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* tests/POA/Excessive_Object_Deactivations: Fixed warnings
-	  with g++ builds. The file is
-	  Excessive_Object_deactivations.cpp. 
+        * tests/POA/Excessive_Object_Deactivations/Excessive_Object_deactivations.cpp:
+          Fixed warnings with g++ builds.
 
 Thu Mar 22 19:29:09 2001  Irfan Pyarali  <irfan@cs.wustl.edu>
 
-	* tao/PortableServer/Active_Object_Map.i
-	  (find_servant_and_system_id_using_user_id): One version of this
-	  function was broken because it did not check the <deactivated_>
-	  and the <servant_> fields.  Thanks to Jody Hagins
-	  <jody@atdesk.com> for pointing this out.  This fixes
-	  [BUGID:834].  
+        * tao/PortableServer/Active_Object_Map.i
+          (find_servant_and_system_id_using_user_id): One version of this
+          function was broken because it did not check the <deactivated_>
+          and the <servant_> fields.  Thanks to Jody Hagins
+          <jody@atdesk.com> for pointing this out.  This fixes
+          [BUGID:834].
+
+        * tests/POA/Excessive_Object_Deactivations: New test for
+          regression checking excessive object deactivations in the POA.
+          The test checks excessive deactivations in a POA with SYSTEM_ID
+          and other POA with USER_ID.  The test also check for excessive
+          deactivations during upcalls.
+
+        * tests/POA/Multiple_Deactivations: No longer needed with
+          tests/POA/Excessive_Object_Deactivations in place.
 
-	* tests/POA/Excessive_Object_Deactivations: New test for
-	  regression checking excessive object deactivations in the POA.
-	  The test checks excessive deactivations in a POA with SYSTEM_ID
-	  and other POA with USER_ID.  The test also check for excessive
-	  deactivations during upcalls.
+        * tao/PortableServer/POA.cpp (key_to_stub_i):
 
-	* tests/POA/Multiple_Deactivations: No longer needed with
-	  tests/POA/Excessive_Object_Deactivations in place.
+          (Re)fixed compilation problems under Minimum CORBA
+          configurations which got reverted when Bala backed out Carlos'
+          changes.
 
-	* tao/PortableServer/POA.cpp (key_to_stub_i): 
+        * tao/ORB_Core.cpp (collocation_strategy): Small change for better
+          code readability.  Thanks Ossama.
 
-	  (Re)fixed compilation problems under Minimum CORBA
-	  configurations which got reverted when Bala backed out Carlos'
-	  changes.
+        * tests/POA/Destruction was renamed to tests/POA/POA_Destruction.
 
-	* tao/ORB_Core.cpp (collocation_strategy): Small change for better
-	  code readability.  Thanks Ossama.
+        * tests/POA/Deactivation was renamed to tests/POA/Object_Reactivation.
 
-	* tests/POA/Destruction was renamed to tests/POA/POA_Destruction.
-	
-	* tests/POA/Deactivation was renamed to tests/POA/Object_Reactivation.
-	
-	* Following files were also updated to accomodate new and renamed
-	  tests:
+        * Following files were also updated to accomodate new and renamed
+          tests:
 
-	  - tests/TAO_Tests.dsw
-	  - tests/POA/Makefile
-	  - tests/POA/Makefile.bor
-	  - tests/POA/README
-	  - ACE_wrappers/bin/auto_run_tests.lst
+          - tests/TAO_Tests.dsw
+          - tests/POA/Makefile
+          - tests/POA/Makefile.bor
+          - tests/POA/README
+          - ACE_wrappers/bin/auto_run_tests.lst
 
 Thu Mar 22 20:08:05 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
-	* tao/PortableServer/POA.cpp: Backed out changes from "Thu Mar 22
-	  15:32:22 2001  Carlos O'Ryan  <coryan@uci.edu>." The fix is
-	  being commited by Irfan as the above changes may not be the
-	  right fix.
+        * tao/PortableServer/POA.cpp: Backed out changes from "Thu Mar 22
+          15:32:22 2001  Carlos O'Ryan  <coryan@uci.edu>." The fix is
+          being commited by Irfan as the above changes may not be the
+          right fix.
 
 Thu Mar 22 15:32:22 2001  Carlos O'Ryan  <coryan@uci.edu>
 
-	* tao/PortableServer/POA.cpp (deactivate_object_i): 
-	  The deactivation code did not check for previous deactivations,
-	  this can result in crashes as the ORB deactivates objects in the
-	  middle of a request. This fixes [BUGID:834]
-	  Also fixed compilation problems under Minimum CORBA
-	  configurations.
-
-	* tests/POA/Makefile:
-	* tests/POA/Makefile.bor:
-	* tests/POA/README:
-	* tests/POA/Multiple_Deactivations/README:
-	* tests/POA/Multiple_Deactivations/Makefile:
-	* tests/POA/Multiple_Deactivations/Makefile.bor:
-	* tests/POA/Multiple_Deactivations/run_test.pl:
-	* tests/POA/Multiple_Deactivations/Test.idl:
-	* tests/POA/Multiple_Deactivations/Empty.h:
-	* tests/POA/Multiple_Deactivations/Empty.cpp:
-	* tests/POA/Multiple_Deactivations/server.cpp:
-	  New regression test for the previous bug.
+        * tao/PortableServer/POA.cpp (deactivate_object_i):
+          The deactivation code did not check for previous deactivations,
+          this can result in crashes as the ORB deactivates objects in the
+          middle of a request. This fixes [BUGID:834]
+          Also fixed compilation problems under Minimum CORBA
+          configurations.
+
+        * tests/POA/Makefile:
+        * tests/POA/Makefile.bor:
+        * tests/POA/README:
+        * tests/POA/Multiple_Deactivations/README:
+        * tests/POA/Multiple_Deactivations/Makefile:
+        * tests/POA/Multiple_Deactivations/Makefile.bor:
+        * tests/POA/Multiple_Deactivations/run_test.pl:
+        * tests/POA/Multiple_Deactivations/Test.idl:
+        * tests/POA/Multiple_Deactivations/Empty.h:
+        * tests/POA/Multiple_Deactivations/Empty.cpp:
+        * tests/POA/Multiple_Deactivations/server.cpp:
+          New regression test for the previous bug.
 
 Thu Mar 22 12:20:00 2001  Michael Kircher  <Michael.Kircher@mchp.siemens.de>
 
         * docs/releasenotes/index.html:
-        
+
           Updated the release notes to reflect the latest status of
-          AMI, e.g. AMI timeouts. 
+          AMI, e.g. AMI timeouts.
 
 Thu Mar 22 09:25:43 2001  Ossama Othman  <ossama@uci.edu>
 
-	* orbsvcs/tests/Security/RejectInsecure/Makefile:
-	* orbsvcs/tests/Security/RejectInsecure/README:
-	* orbsvcs/tests/Security/RejectInsecure/authorization_test.idl:
-	* orbsvcs/tests/Security/RejectInsecure/authorization_test_i.cpp:
-	* orbsvcs/tests/Security/RejectInsecure/authorization_test_i.h:
-	* orbsvcs/tests/Security/RejectInsecure/authorization_test_i.i:
-	* orbsvcs/tests/Security/RejectInsecure/client.conf:
-	* orbsvcs/tests/Security/RejectInsecure/client.cpp:
-	* orbsvcs/tests/Security/RejectInsecure/client_nopasswd.conf:
-	* orbsvcs/tests/Security/RejectInsecure/server.conf:
-	* orbsvcs/tests/Security/RejectInsecure/server.cpp:
-	* orbsvcs/tests/Security/RejectInsecure/server_i.h:
-	* orbsvcs/tests/Security/RejectInsecure/server_nopasswd.conf:
-
-	  Removed this incomplete/non-functional test.  The
-	  Secure_Invocation I recently added tests most of what this test
-	  was intended to do but in a more straightforward manner.
+        * orbsvcs/tests/Security/RejectInsecure/Makefile:
+        * orbsvcs/tests/Security/RejectInsecure/README:
+        * orbsvcs/tests/Security/RejectInsecure/authorization_test.idl:
+        * orbsvcs/tests/Security/RejectInsecure/authorization_test_i.cpp:
+        * orbsvcs/tests/Security/RejectInsecure/authorization_test_i.h:
+        * orbsvcs/tests/Security/RejectInsecure/authorization_test_i.i:
+        * orbsvcs/tests/Security/RejectInsecure/client.conf:
+        * orbsvcs/tests/Security/RejectInsecure/client.cpp:
+        * orbsvcs/tests/Security/RejectInsecure/client_nopasswd.conf:
+        * orbsvcs/tests/Security/RejectInsecure/server.conf:
+        * orbsvcs/tests/Security/RejectInsecure/server.cpp:
+        * orbsvcs/tests/Security/RejectInsecure/server_i.h:
+        * orbsvcs/tests/Security/RejectInsecure/server_nopasswd.conf:
+
+          Removed this incomplete/non-functional test.  The
+          Secure_Invocation I recently added tests most of what this test
+          was intended to do but in a more straightforward manner.
 
 Thu Mar 22 07:02:17 2001  Carlos O'Ryan  <coryan@uci.edu>
 
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Makefile b/TAO/orbsvcs/examples/Notify/Subscribe/Makefile
index 5ace23b8052..a512fa56b14 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Makefile
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif
 
-LDLIBS = -lTAO_CosNotification -lTAO_CosNaming -lTAO_DynamicAny -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_CosNotification -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_DynamicAny -lTAO_PortableServer -lTAO
 
 LSRC = Subscribe.cpp main.cpp
 
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile
index b177276e40a..f6d287e9f7d 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile
@@ -12,7 +12,7 @@ ifndef TAO_ROOT
   TAO_ROOT = $(ACE_ROOT)/TAO
 endif # ! TAO_ROOT
 
-LDLIBS = -lTAO_FaultTolerance -lTAO_CosNotification -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_IORManip -lTAO_PortableServer -lTAO
+LDLIBS = -lTAO_FaultTolerance -lTAO_CosNotification -lTAO_CosNaming -lTAO_Svc_Utils -lTAO_IORTable -lTAO_IORManip -lTAO_DynamicAny -lTAO_PortableServer -lTAO
 
 PROG_SRCS = IOGRTest.cpp