This commit was manufactured by cvs2svn to create branch

'fix_bug132_iter03'.

51 files changed, 540 insertions, 2492 deletions

diff --git a/ChangeLog b/ChangeLog
index 21591bb8c7a..e7406bee555 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,57 +1,3 @@
-Wed Mar 28 11:34:54 2001  Frank Hunleth <fhunleth@cs.wustl.edu>
-
-        * ace/CDR_Base.inl:
-          Removed memset in ACE_CDR::mb_align when ACE_HAS_PURIFY ==
-          1, since it was causing some TAO unit tests to break (in
-          particular, the Portable_Interceptors/Service_Context_Manipulation
-          test).  After running Cubit and a few other tests, Purify didn't
-          notice any more uninitialized memory accesses.  Fixes bug #828.
-
-Wed Mar 28 11:55:39 2001  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/platform_aix_ibm.GNU: New file, replaces
-          platform_aix_vacpp.GNU for Visual Age C++ 5. Also replaces
-          use of platform_aix4_cset++.GNU for IBM C/C++ Compilers 3.6.6.
-          So, for the supported, IBM-supplied compilers (IBM C/C++ 3.6.6
-          and Visual Age C++ 5) use this file. If you want to try to keep
-          using CSet++ 3.4 or earlier, you can keep using
-          platform_aix4_cset++.GNU, but it's not tested any longer and
-          will disappear at the next ACE version. If you want to use
-          Visual Age C++ 4, you should reconsider, and upgrade to version 5.
-
-        * include/makeinclude/platform_aix_vacpp.GNU: Deleted.
-
-        * netsvcs/lib/TS_Clerk_Handler.h: Moved #include "ace/Connector.h"
-          to be after #include "ace/SOCK_Connector.h" to fix compile error
-          on AIX, Visual Age C++ 5.
-
-        * ace/config-aix-4.x.h: Clarified comments that this file is for
-          Visual Age C++ also. Added ACE_DLL_SUFFIX ".a" to match what
-          is now generated from platform_aix_ibm.GNU.
-
-        * bin/auto_compile:
-        * bin/make_pretty.pl: Add detection of compile/link warnings and
-          errors for AIX using the IBM compilers' code. Ignores the multiply
-          defined symbol warnings from ld if it's an ACE symbol.
-
-        * docs/ACE-development-process.html: Changed to link to Bugzilla so
-          it works from anywhere.
-
-Wed Mar 28 10:13:16 2001  Steve Huston  <shuston@riverace.com>
-
-        * ace/Makefile.bor: Don't try to build the SSL directory if
-          SSL_ROOT is not set.
-
-Wed Mar 28 08:39:26 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * etc/tao_av.doxygen:
-          New configuration file for the AV streaming service.  Many
-          thanks to Craig Rodrigues <crodrigu@bbn.com> for converting that
-          directory.
-
-        * bin/generate_doxygen.pl:
-          Add the new configuration file.
-
 Tue Mar 27 19:54:11 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * bin/auto_run_tests.lst:
@@ -83,9 +29,9 @@ Tue Mar 27 19:15:36 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 Tue Mar 27 15:28:56 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
-        * ace/ACE.cpp (handle_ready): Don't try to dereference through
-          a NULL timeout pointer!  Thanks to Przemyslaw Marciniak
-          <pmarciniak@lucent.com> for reporting this.
+	* ace/ACE.cpp (handle_ready): Don't try to dereference through
+	  a NULL timeout pointer!  Thanks to Przemyslaw Marciniak
+ 	  <pmarciniak@lucent.com> for reporting this.
 
 Tue Mar 27 10:08:44 2001  Carlos O'Ryan  <coryan@uci.edu>
 
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 21591bb8c7a..e7406bee555 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,57 +1,3 @@
-Wed Mar 28 11:34:54 2001  Frank Hunleth <fhunleth@cs.wustl.edu>
-
-        * ace/CDR_Base.inl:
-          Removed memset in ACE_CDR::mb_align when ACE_HAS_PURIFY ==
-          1, since it was causing some TAO unit tests to break (in
-          particular, the Portable_Interceptors/Service_Context_Manipulation
-          test).  After running Cubit and a few other tests, Purify didn't
-          notice any more uninitialized memory accesses.  Fixes bug #828.
-
-Wed Mar 28 11:55:39 2001  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/platform_aix_ibm.GNU: New file, replaces
-          platform_aix_vacpp.GNU for Visual Age C++ 5. Also replaces
-          use of platform_aix4_cset++.GNU for IBM C/C++ Compilers 3.6.6.
-          So, for the supported, IBM-supplied compilers (IBM C/C++ 3.6.6
-          and Visual Age C++ 5) use this file. If you want to try to keep
-          using CSet++ 3.4 or earlier, you can keep using
-          platform_aix4_cset++.GNU, but it's not tested any longer and
-          will disappear at the next ACE version. If you want to use
-          Visual Age C++ 4, you should reconsider, and upgrade to version 5.
-
-        * include/makeinclude/platform_aix_vacpp.GNU: Deleted.
-
-        * netsvcs/lib/TS_Clerk_Handler.h: Moved #include "ace/Connector.h"
-          to be after #include "ace/SOCK_Connector.h" to fix compile error
-          on AIX, Visual Age C++ 5.
-
-        * ace/config-aix-4.x.h: Clarified comments that this file is for
-          Visual Age C++ also. Added ACE_DLL_SUFFIX ".a" to match what
-          is now generated from platform_aix_ibm.GNU.
-
-        * bin/auto_compile:
-        * bin/make_pretty.pl: Add detection of compile/link warnings and
-          errors for AIX using the IBM compilers' code. Ignores the multiply
-          defined symbol warnings from ld if it's an ACE symbol.
-
-        * docs/ACE-development-process.html: Changed to link to Bugzilla so
-          it works from anywhere.
-
-Wed Mar 28 10:13:16 2001  Steve Huston  <shuston@riverace.com>
-
-        * ace/Makefile.bor: Don't try to build the SSL directory if
-          SSL_ROOT is not set.
-
-Wed Mar 28 08:39:26 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * etc/tao_av.doxygen:
-          New configuration file for the AV streaming service.  Many
-          thanks to Craig Rodrigues <crodrigu@bbn.com> for converting that
-          directory.
-
-        * bin/generate_doxygen.pl:
-          Add the new configuration file.
-
 Tue Mar 27 19:54:11 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * bin/auto_run_tests.lst:
@@ -83,9 +29,9 @@ Tue Mar 27 19:15:36 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 Tue Mar 27 15:28:56 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
-        * ace/ACE.cpp (handle_ready): Don't try to dereference through
-          a NULL timeout pointer!  Thanks to Przemyslaw Marciniak
-          <pmarciniak@lucent.com> for reporting this.
+	* ace/ACE.cpp (handle_ready): Don't try to dereference through
+	  a NULL timeout pointer!  Thanks to Przemyslaw Marciniak
+ 	  <pmarciniak@lucent.com> for reporting this.
 
 Tue Mar 27 10:08:44 2001  Carlos O'Ryan  <coryan@uci.edu>
 
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 21591bb8c7a..e7406bee555 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,57 +1,3 @@
-Wed Mar 28 11:34:54 2001  Frank Hunleth <fhunleth@cs.wustl.edu>
-
-        * ace/CDR_Base.inl:
-          Removed memset in ACE_CDR::mb_align when ACE_HAS_PURIFY ==
-          1, since it was causing some TAO unit tests to break (in
-          particular, the Portable_Interceptors/Service_Context_Manipulation
-          test).  After running Cubit and a few other tests, Purify didn't
-          notice any more uninitialized memory accesses.  Fixes bug #828.
-
-Wed Mar 28 11:55:39 2001  Steve Huston  <shuston@riverace.com>
-
-        * include/makeinclude/platform_aix_ibm.GNU: New file, replaces
-          platform_aix_vacpp.GNU for Visual Age C++ 5. Also replaces
-          use of platform_aix4_cset++.GNU for IBM C/C++ Compilers 3.6.6.
-          So, for the supported, IBM-supplied compilers (IBM C/C++ 3.6.6
-          and Visual Age C++ 5) use this file. If you want to try to keep
-          using CSet++ 3.4 or earlier, you can keep using
-          platform_aix4_cset++.GNU, but it's not tested any longer and
-          will disappear at the next ACE version. If you want to use
-          Visual Age C++ 4, you should reconsider, and upgrade to version 5.
-
-        * include/makeinclude/platform_aix_vacpp.GNU: Deleted.
-
-        * netsvcs/lib/TS_Clerk_Handler.h: Moved #include "ace/Connector.h"
-          to be after #include "ace/SOCK_Connector.h" to fix compile error
-          on AIX, Visual Age C++ 5.
-
-        * ace/config-aix-4.x.h: Clarified comments that this file is for
-          Visual Age C++ also. Added ACE_DLL_SUFFIX ".a" to match what
-          is now generated from platform_aix_ibm.GNU.
-
-        * bin/auto_compile:
-        * bin/make_pretty.pl: Add detection of compile/link warnings and
-          errors for AIX using the IBM compilers' code. Ignores the multiply
-          defined symbol warnings from ld if it's an ACE symbol.
-
-        * docs/ACE-development-process.html: Changed to link to Bugzilla so
-          it works from anywhere.
-
-Wed Mar 28 10:13:16 2001  Steve Huston  <shuston@riverace.com>
-
-        * ace/Makefile.bor: Don't try to build the SSL directory if
-          SSL_ROOT is not set.
-
-Wed Mar 28 08:39:26 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * etc/tao_av.doxygen:
-          New configuration file for the AV streaming service.  Many
-          thanks to Craig Rodrigues <crodrigu@bbn.com> for converting that
-          directory.
-
-        * bin/generate_doxygen.pl:
-          Add the new configuration file.
-
 Tue Mar 27 19:54:11 2001  Carlos O'Ryan  <coryan@uci.edu>
 
         * bin/auto_run_tests.lst:
@@ -83,9 +29,9 @@ Tue Mar 27 19:15:36 2001  Carlos O'Ryan  <coryan@uci.edu>
 
 Tue Mar 27 15:28:56 2001  Douglas C. Schmidt  <schmidt@tango.doc.wustl.edu>
 
-        * ace/ACE.cpp (handle_ready): Don't try to dereference through
-          a NULL timeout pointer!  Thanks to Przemyslaw Marciniak
-          <pmarciniak@lucent.com> for reporting this.
+	* ace/ACE.cpp (handle_ready): Don't try to dereference through
+	  a NULL timeout pointer!  Thanks to Przemyslaw Marciniak
+ 	  <pmarciniak@lucent.com> for reporting this.
 
 Tue Mar 27 10:08:44 2001  Carlos O'Ryan  <coryan@uci.edu>
 
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 41fd129cd49..9e05733023f 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,57 +1,3 @@
-Wed Mar 28 09:45:30 2001  Carlos O'Ryan  <coryan@uci.edu>
-
-        * orbsvcs/Naming_Service/NT_Naming_Service.cpp:
-          Borland uses the standard scope rules for variables declared
-          inside for() statements, MSVC is more forgiving.
-
-Wed Mar 28 09:31:54 2001  Frank Hunleth <fhunleth@cs.wustl.edu>
-
-        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp:
-        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp:
-          Added #if ACE_HAS_PURIFY == 1 checks to initialize some
-          structures before they are used.  This just removes the
-          100,000+ warnings with Purify that the cubit clients and
-          servers give.  This should be ok since any performance
-          measurements have ACE_HAS_PURIFY == 0 anyway.
-
-Wed Mar 28 09:31:54 2001  Frank Hunleth <fhunleth@cs.wustl.edu>
-
-        * tests/RTCORBA/Client_Propagated/Client_ORBInitializer.{cpp,h}:
-        * tests/RTCORBA/Client_Propagated/Makefile:
-        * tests/RTCORBA/Client_Propagated/client.dsp:
-        * tests/RTCORBA/Client_Propagated/client.cpp:
-        * tests/RTCORBA/Client_Propagated/interceptors.{cpp,h}:
-          Added portable interceptor code to verify that the client
-          propagated priority is passed in the service context list
-          back from the server.
-
-        * tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp:
-          Added Ossama's changes to replicate Bug #806.  Also added many
-          checks to verify the functionality of the service context
-          manipulation methods for requests and replies, and added checks
-          to verify that proper service context list contents are received
-          from both the client and the server.  The test no longer relies
-          on visual inspection of the results to show proper execution.
-
-        * tao/ClientRequestInfo.{cpp,h}:
-        * tao/GIOP_Message_Base.cpp:
-        * tao/GIOP_Message_Generator_Parser_10.cpp:
-        * tao/GIOP_Message_Generator_Parser_12.cpp:
-        * tao/GIOP_Message_Handler.cpp:
-        * tao/GIOP_Message_Lite.cpp:
-        * tao/IIOP_Transport.cpp:
-        * tao/Invocation.{cpp,h,i}:
-        * tao/RT_Protocols_Hooks.cpp:
-        * tao/Service_Context.{cpp,h}:
-        * tao/TAO_Server_Request.{cpp,h,i}:
-        * tao/operation_details.{h,i}:
-        * tao/PortableServer/Object_Adapter.{cpp,h}:
-        * tao/PortableServer/ServerRequestInfo.{cpp,h}:
-          Separated out request and reply service context lists to fix
-          Bug #806.  Refactored out code duplication in
-          ClientRequestInfo.{cpp,h} and ServerRequestInfo.{cpp,h}
-          using the TAO_Service_Context class.
-
 Wed Mar 28 08:18:00 2001  Craig Rodrigues <crodrigu@bbn.com>
 
         * orbsvcs/orbsvcs/AV/UDP.h:
@@ -790,14 +736,14 @@ Sun Mar 25 11:17:40 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 Sun Mar 25 08:52:48 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
         * orbsvcs/orbsvcs/Makefile.RTSched:
-          Added guards for old g++.
+	  Added guards for old g++.
 
         * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp:
         * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.h:
         * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.cpp:
         * orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h:
-          Removed redundant guards  in the files. This should fix a small
-          compilation problem in LYNX-I386 builds.
+	  Removed redundant guards  in the files. This should fix a small
+	  compilation problem in LYNX-I386 builds.
 
 Sun Mar 25 07:42:44 2001  Balachandran Natarajan  <bala@cs.wustl.edu>
 
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
index 5d412224ced..c178c867a41 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
@@ -98,8 +98,7 @@ TAO_NT_Naming_Service::init (int argc,
       argv_save_ = (char **) ACE_OS::malloc (sizeof (char *) * (argc + args.argc ()));
 
       // Copy the values into the internal args buffer.
-      int i;
-      for (i = 0; i < argc; i++)
+      for (int i = 0; i < argc; i++)
         argv_save_[i] = ACE_OS::strdup (argv[i]);
 
       int j = 0;
diff --git a/TAO/orbsvcs/tests/Security/RejectInsecure/authorization_test_i.cpp b/TAO/orbsvcs/tests/Security/RejectInsecure/authorization_test_i.cpp
deleted file mode 100644
index d0ab49a1939..00000000000
--- a/TAO/orbsvcs/tests/Security/RejectInsecure/authorization_test_i.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// $Id$
-
-#include "authorization_test_i.h"
-
-#if !defined(__ACE_INLINE__)
-#include "authorization_test_i.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Authorize, authorization_test_i, "$Id$")
-
-CORBA::Boolean
-Authorization_Server_i::check_access (CORBA::Environment &)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return 0;
-}
-
-void
-Authorization_Server_i::shutdown (CORBA::Environment&)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0);
-}
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
index 5ab7e10e59e..c0bfb09ba5d 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -742,11 +742,6 @@ Cubit_Client::cube_long_sequence (int,
       // gets in the way.
       input[0] = 4;
 
-#if (ACE_HAS_PURIFY == 1)
-      for(int i=1;i<l;i++)
-        input[i]=11;
-#endif /* ACE_HAS_PURIFY == 1 */
-
       Cubit::long_seq_var output;
       Cubit::long_seq_out vout (output);
 
@@ -816,11 +811,6 @@ Cubit_Client::cube_octet_sequence (int,
       // gets in the way.
       input[0] = 4;
 
-#if (ACE_HAS_PURIFY == 1)
-      for(int i=1;i<l;i++)
-        input[i]=10;
-#endif /* ACE_HAS_PURIFY == 1 */
-
       Cubit::octet_seq_var output;
       Cubit::octet_seq_out vout (output);
 
@@ -893,16 +883,6 @@ Cubit_Client::cube_many_sequence (int,
       in.s = 5;
       in.o = 6;
 
-#if (ACE_HAS_PURIFY == 1)
-      for(int i=1;i<l;i++)
-        {
-          Cubit::Many &inb = input[i];
-          inb.l=7;
-          inb.s=8;
-          inb.o=9;
-        }
-#endif /* ACE_HAS_PURIFY == 1 */
-
       Cubit::many_seq_var output;
       Cubit::many_seq_out vout (output);
 
@@ -977,13 +957,7 @@ Cubit_Client::cube_rti_data (int,
 
       for (int j = 0; j < numUpdates; ++j)
         {
-#if (ACE_HAS_PURIFY == 1)
-          Cubit::RtiObjectUpdateMessageHeader o;
-          ACE_OS::memset (&o, 0, sizeof(Cubit::RtiObjectUpdateMessageHeader));
-          input.msgs[j].oumh (o);
-#else
           input.msgs[j].oumh (Cubit::RtiObjectUpdateMessageHeader ());
-#endif /* ACE_HAS_PURIFY == 1 */
           Cubit::RtiObjectUpdateMessageHeader & oumh = input.msgs[j].oumh ();
           oumh.updateLength = 2001; // redundant
           oumh.updateTag = 2002;
@@ -1000,13 +974,7 @@ Cubit_Client::cube_rti_data (int,
 
           for (int k = 0; k < numAttrs; ++k)
             {
-#if (ACE_HAS_PURIFY == 1)
-              Cubit::HandleValuePair h;
-              ACE_OS::memset (&h, 0, sizeof(Cubit::HandleValuePair));
-              oumh.messagePayload[k] = h;
-#else
               oumh.messagePayload[k] = Cubit::HandleValuePair ();
-#endif /* ACE_HAS_PURIFY == 1 */
               Cubit::HandleValuePair &hvp = oumh.messagePayload[k];
               hvp.handle = k * k;
               const char *d1 = "somedata";
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
index 73897ae501b..91ad25fbc62 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
@@ -284,7 +284,7 @@ Cubit_i::cube_long_sequence (const Cubit::long_seq &input,
 
   output->length (input.length ());
 
-#if (ACE_HAS_PURIFY == 1)
+#if 0
   for (CORBA::ULong i = 0; i < input.length (); ++i)
     {
       CORBA::Long x = input[i];
@@ -294,7 +294,7 @@ Cubit_i::cube_long_sequence (const Cubit::long_seq &input,
   CORBA::ULong i = 0;
   CORBA::Long x = input[0];
   output[i] = x * x * x;
-#endif /* ACE_HAS_PURIFY == 1 */
+#endif
 }
 
 // Cube an octet sequence
@@ -319,10 +319,7 @@ Cubit_i::cube_octet_sequence (const Cubit::octet_seq &input,
 
   output->length (input.length ());
 
-#if (ACE_HAS_PURIFY == 1)
-  // For Purify, initialize every output since we're looking for
-  // accesses to uninitialized memory addresses.  Performance
-  // is secondary when compiling for purify.
+#if 0
   for (CORBA::ULong i = 0; i < input.length (); ++i)
     {
       CORBA::Octet x = input[i];
@@ -336,7 +333,7 @@ Cubit_i::cube_octet_sequence (const Cubit::octet_seq &input,
   CORBA::ULong i = 0;
   CORBA::Octet x = input[0];
   output[i] = x * x * x;
-#endif /* ACE_HAS_PURIFY == 1 */
+#endif
 }
 
 void
@@ -352,7 +349,7 @@ Cubit_i::cube_many_sequence (const Cubit::many_seq & input,
 
   output->length (input.length ());
 
-#if (ACE_HAS_PURIFY == 1)
+#if 0
   for (CORBA::ULong i = 0; i < input.length (); ++i)
     {
       const Cubit::Many &in = input[i];
@@ -370,7 +367,7 @@ Cubit_i::cube_many_sequence (const Cubit::many_seq & input,
   out.o = in.o * in.o * in.o;
   out.s = in.s * in.s * in.s;
   out.l = in.l * in.l * in.l;
-#endif /* ACE_HAS_PURIFY == 1 */
+#endif
 }
 
 void
diff --git a/TAO/tao/ClientRequestInfo.cpp b/TAO/tao/ClientRequestInfo.cpp
index bc93568befa..03e6014c8ef 100644
--- a/TAO/tao/ClientRequestInfo.cpp
+++ b/TAO/tao/ClientRequestInfo.cpp
@@ -265,15 +265,33 @@ TAO_ClientRequestInfo::add_request_service_context (
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  // Get the service context from the list
-  TAO_Service_Context &service_context_list =
-    this->invocation_->request_service_context ();
+  IOP::ServiceContextList &service_context_list =
+    this->invocation_->service_info ();
 
-  if (service_context_list.set_context (service_context,replace) == 0)
+  // Copy the service context into the list.
+  CORBA::ULong len = service_context_list.length ();
+
+  // First check if a service context with the same ID exists.
+  for (CORBA::ULong i = 0; i < len; ++i)
     {
-      ACE_THROW (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 11,
-                                       CORBA::COMPLETED_NO));
+      if (service_context_list[i].context_id ==
+          service_context.context_id)
+        {
+          if (replace)
+            {
+              service_context_list[i] = service_context;
+              return;
+            }
+          else
+            ACE_THROW (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 11,
+                                             CORBA::COMPLETED_NO));
+        }
     }
+
+  // No service context with the given ID exists so add one.
+  service_context_list.length (len + 1);
+
+  service_context_list[len] = service_context;
 }
 
 CORBA::ULong
@@ -414,65 +432,68 @@ TAO_ClientRequestInfo::get_request_service_context (
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  // Get the service context from the list
-  TAO_Service_Context &service_context_list =
-    this->invocation_->request_service_context ();
+  IOP::ServiceContextList &service_context_list =
+    this->invocation_->service_info ();
+  CORBA::ULong len = service_context_list.length ();
 
-  return this->get_service_context_i (service_context_list,
-                                      id,
-                                      ACE_TRY_ENV);
+  for (CORBA::ULong i = 0; i < len; ++i)
+    if (service_context_list[i].context_id == id)
+      {
+        IOP::ServiceContext *service_context = 0;
+        ACE_NEW_THROW_EX (service_context,
+                          IOP::ServiceContext,
+                          CORBA::NO_MEMORY (
+                            CORBA::SystemException::_tao_minor_code (
+                              TAO_DEFAULT_MINOR_CODE,
+                              ENOMEM),
+                            CORBA::COMPLETED_NO));
+        ACE_CHECK_RETURN (0);
+
+        IOP::ServiceContext_var safe_service_context = service_context;
+
+        (*service_context) = service_context_list[i];
+
+        return safe_service_context._retn ();
+      }
+
+  ACE_THROW_RETURN (CORBA::BAD_PARAM (TAO_OMG_VMCID | 23,
+                                      CORBA::COMPLETED_NO),
+                    0);
 }
 
-
 IOP::ServiceContext *
 TAO_ClientRequestInfo::get_reply_service_context (
     IOP::ServiceId id,
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  // Get the service context from the list
-  TAO_Service_Context &service_context_list =
-    this->invocation_->reply_service_context ();
-
-  return this->get_service_context_i (service_context_list,
-                                      id,
-                                      ACE_TRY_ENV);
-}
-
-IOP::ServiceContext *
-TAO_ClientRequestInfo::get_service_context_i (
-    TAO_Service_Context &service_context_list,
-    IOP::ServiceId id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Create a new service context to be returned.  Assume
-  // success.
-  IOP::ServiceContext *service_context = 0;
-  ACE_NEW_THROW_EX (service_context,
-                    IOP::ServiceContext,
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
-
-  IOP::ServiceContext_var safe_service_context = service_context;
+  IOP::ServiceContextList &service_context_list =
+    this->invocation_->service_info ();
+  CORBA::ULong len = service_context_list.length ();
 
-  service_context->context_id = id;
-  if (service_context_list.get_context (*service_context) != 0)
-    {
-      // Found.
-      return safe_service_context._retn ();
-    }
-  else
-    {
-      // Not found.
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (TAO_OMG_VMCID | 23,
-                                          CORBA::COMPLETED_NO),
-                        0);
-    }
+  for (CORBA::ULong i = 0; i < len; ++i)
+    if (service_context_list[i].context_id == id)
+      {
+        IOP::ServiceContext *service_context = 0;
+        ACE_NEW_THROW_EX (service_context,
+                          IOP::ServiceContext,
+                          CORBA::NO_MEMORY (
+                            CORBA::SystemException::_tao_minor_code (
+                              TAO_DEFAULT_MINOR_CODE,
+                              ENOMEM),
+                            CORBA::COMPLETED_NO));
+        ACE_CHECK_RETURN (0);
+
+        IOP::ServiceContext_var safe_service_context = service_context;
+
+        (*service_context) = service_context_list[i];
+
+        return safe_service_context._retn ();
+      }
+
+  ACE_THROW_RETURN (CORBA::BAD_PARAM (TAO_OMG_VMCID | 23,
+                                      CORBA::COMPLETED_NO),
+                    0);
 }
 
 void
diff --git a/TAO/tao/ClientRequestInfo.h b/TAO/tao/ClientRequestInfo.h
index 13dae677050..1df7a0508a0 100644
--- a/TAO/tao/ClientRequestInfo.h
+++ b/TAO/tao/ClientRequestInfo.h
@@ -37,7 +37,6 @@
 #include "PortableInterceptorC.h"
 #include "LocalObject.h"
 #include "StringSeqC.h"
-#include "Service_Context.h"
 
 class TAO_GIOP_Invocation;
 
@@ -161,12 +160,6 @@ public:
      ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
-  /// Helper method to get the request and response service contexts.
-  IOP::ServiceContext *get_service_context_i (
-      TAO_Service_Context &service_context_list,
-      IOP::ServiceId id,
-      CORBA::Environment &ACE_TRY_ENV)
-    ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Change the exception status.
   void exception (CORBA::Exception *exception);
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index 4cde6d5f19b..396e58cea40 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -544,8 +544,9 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport,
           reply_params.reply_status_ = TAO_GIOP_LOCATION_FORWARD;
           reply_params.svc_ctx_.length (0);
 
-          // Send back the reply service context.
-          reply_params.service_context_notowned (&request.reply_service_info ());
+          // Sending back the same service context list we received in the
+          // Request.  (Important for RT CORBA).
+          reply_params.service_context_notowned (&request.service_info ());
 
           // Make the GIOP header and Reply header
           this->generate_reply_header (*this->output_,
@@ -579,7 +580,7 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport,
           result = this->send_reply_exception (transport,
                                                orb_core,
                                                request_id,
-                                               &request.reply_service_info (),
+                                               &request.service_info (),
                                                &ACE_ANY_EXCEPTION);
           if (result == -1)
             {
@@ -639,7 +640,7 @@ TAO_GIOP_Message_Base::process_request (TAO_Transport *transport,
           result = this->send_reply_exception (transport,
                                                orb_core,
                                                request_id,
-                                               &request.reply_service_info (),
+                                               &request.service_info (),
                                                &exception);
           if (result == -1)
             {
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
index 4d13a5593ae..50eaaf230da 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
@@ -29,7 +29,7 @@ TAO_GIOP_Message_Generator_Parser_10::write_request_header (
     TAO_OutputCDR &msg)
 {
   // Write the service context list
-  msg << opdetails.request_service_info ();
+  msg << opdetails.service_info ();
 
   // The request ID
   msg << opdetails.request_id ();
@@ -296,7 +296,7 @@ TAO_GIOP_Message_Generator_Parser_10::parse_request_header (
   TAO_InputCDR& input = request.incoming ();
 
   IOP::ServiceContextList &service_info =
-    request.request_service_info ();
+    request.service_info ();
 
   input >> service_info;
 
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
index 26fceb041dc..1c4b85135fd 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
@@ -87,7 +87,7 @@ TAO_GIOP_Message_Generator_Parser_12::write_request_header (
                     opdetails.opname ());
 
   // Write the service context list
-  msg << opdetails.request_service_info ();
+  msg << opdetails.service_info ();
 
   // We align the pointer only if the operation has arguments.
   if (opdetails.argument_flag ())
@@ -346,10 +346,10 @@ TAO_GIOP_Message_Generator_Parser_12::parse_request_header (
   // verify a digital signature, if that is required in this security
   // environment.  It may be required even when using IPSEC security
   // infrastructure.
-  IOP::ServiceContextList &req_service_info =
-    request.request_service_info ();
+  IOP::ServiceContextList &service_info =
+    request.service_info ();
 
-  input >> req_service_info;
+  input >> service_info;
 
   // Check an process if BiDir contexts are available
   if (request.orb_core ()->bidir_giop_policy ())
@@ -585,14 +585,12 @@ int
 TAO_GIOP_Message_Generator_Parser_12::check_bidirectional_context (
     TAO_ServerRequest &request)
 {
-  TAO_Service_Context &service_context = request.request_service_context ();
-
   // Check whether we have the BiDir service context info available in
   // the ServiceContextList
-  if (service_context.is_service_id (IOP::BI_DIR_IIOP)
+  if (request.service_context ().is_service_id (IOP::BI_DIR_IIOP)
       == 1)
     {
-      return this->process_bidir_context (service_context,
+      return this->process_bidir_context (request.service_context (),
                                           request.transport ());
     }
 
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp
index 182b8033dbd..4ef083ccf55 100644
--- a/TAO/tao/GIOP_Message_Lite.cpp
+++ b/TAO/tao/GIOP_Message_Lite.cpp
@@ -605,8 +605,9 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport,
           reply_params.reply_status_ = TAO_GIOP_LOCATION_FORWARD;
           reply_params.svc_ctx_.length (0);
 
-          // Send back the reply service context list.
-          reply_params.service_context_notowned (&request.reply_service_info ());
+          // Sending back the same service context list we received in the
+          // Request.  (Important for RT CORBA).
+          reply_params.service_context_notowned (&request.service_info ());
 
           // Make the GIOP header and Reply header
           this->generate_reply_header (*this->output_,
@@ -640,7 +641,7 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport,
           result = this->send_reply_exception (transport,
                                                orb_core,
                                                request_id,
-                                               &request.reply_service_info (),
+                                               &request.service_info (),
                                                &ACE_ANY_EXCEPTION);
           if (result == -1)
             {
@@ -700,7 +701,7 @@ TAO_GIOP_Message_Lite::process_request (TAO_Transport *transport,
           result = this->send_reply_exception (transport,
                                                orb_core,
                                                request_id,
-                                               &request.reply_service_info (),
+                                               &request.service_info (),
                                                &exception);
           if (result == -1)
             {
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
index d407766977f..16be7c5eb40 100644
--- a/TAO/tao/IIOP_Transport.cpp
+++ b/TAO/tao/IIOP_Transport.cpp
@@ -459,8 +459,8 @@ TAO_IIOP_Transport::set_bidir_context_info (TAO_Operation_Details &opdetails)
     return;
 
   // Add this info in to the svc_list
-  opdetails.request_service_context ().set_context (IOP::BI_DIR_IIOP,
-                                                    cdr);
+  opdetails.service_context ().set_context (IOP::BI_DIR_IIOP,
+                                            cdr);
 
   return;
 }
diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp
index bd6972214ed..707cd3378b0 100644
--- a/TAO/tao/Invocation.cpp
+++ b/TAO/tao/Invocation.cpp
@@ -321,7 +321,7 @@ TAO_GIOP_Invocation::prepare_header (CORBA::Octet response_flags,
   // First lookup at the services to see whether they have anything to
   // add to the service context lists
   this->orb_core_->service_context_list (this->stub_,
-                                         this->request_service_context().service_info (),
+                                         this->service_info (),
                                          this->restart_flag_,
                                          ACE_TRY_ENV);
   ACE_CHECK;
@@ -577,7 +577,7 @@ TAO_GIOP_Invocation::add_rt_service_context (CORBA_Environment &ACE_TRY_ENV)
 
 TAO_GIOP_Synch_Invocation::TAO_GIOP_Synch_Invocation (void)
   : rd_ (0,
-         this->op_details_.reply_service_info ())
+         this->op_details_.service_info ())
 {
 }
 
diff --git a/TAO/tao/Invocation.h b/TAO/tao/Invocation.h
index 84b217935f6..3296c919009 100644
--- a/TAO/tao/Invocation.h
+++ b/TAO/tao/Invocation.h
@@ -116,11 +116,7 @@ public:
 
   /// Accessor to the request ServiceContextList.  Only valid when
   /// sending a request message.
-  TAO_Service_Context& request_service_context (void);
-
-  /// Accessor to the reply ServiceContextList.  Only valid when
-  /// after receiving a reply message.
-  TAO_Service_Context& reply_service_context (void);
+  IOP::ServiceContextList& service_info (void);
 
   /// Return the request id of this invocation.
   CORBA::ULong request_id (void);
diff --git a/TAO/tao/Invocation.i b/TAO/tao/Invocation.i
index 64056d9fac2..3d9276bae1b 100644
--- a/TAO/tao/Invocation.i
+++ b/TAO/tao/Invocation.i
@@ -2,20 +2,14 @@
 //
 // $Id$
 
-ACE_INLINE TAO_Service_Context &
-TAO_GIOP_Invocation::request_service_context (void)
+ACE_INLINE IOP::ServiceContextList &
+TAO_GIOP_Invocation::service_info (void)
 {
-  return this->op_details_.request_service_context ();
-}
-
-ACE_INLINE TAO_Service_Context &
-TAO_GIOP_Invocation::reply_service_context (void)
-{
-  return this->op_details_.reply_service_context ();
+  return this->op_details_.service_info	();
 }
 
 ACE_INLINE CORBA::ULong
-TAO_GIOP_Invocation::request_id (void)
+TAO_GIOP_Invocation::request_id	(void)
 {
   return this->op_details_.request_id ();
 }
@@ -27,7 +21,7 @@ TAO_GIOP_Invocation::operation (void)
 }
 
 ACE_INLINE TAO_OutputCDR &
-TAO_GIOP_Invocation::out_stream (void)
+TAO_GIOP_Invocation::out_stream	(void)
 {
   return this->out_stream_;
 }
@@ -36,7 +30,7 @@ ACE_INLINE void
 TAO_GIOP_Invocation::restart_flag (CORBA::Boolean flag)
 {
   // Set the flag
-  this->restart_flag_ = flag;
+  this->restart_flag_ =	flag;
 }
 
 ACE_INLINE CORBA::Object_ptr
@@ -119,18 +113,18 @@ TAO_GIOP_Synch_Invocation::TAO_GIOP_Synch_Invocation (
     TAO_ORB_Core *orb_core,
     int byte_order
   )
-  : TAO_GIOP_Invocation (stub,
-                         operation,
-                         opname_len,
-                         argument_flag,
-                         orb_core,
-       byte_order),
-    rd_ (orb_core,
-         this->op_details_.reply_service_info   ())
+  : TAO_GIOP_Invocation	(stub,
+			 operation,
+			 opname_len,
+			 argument_flag,
+			 orb_core,
+                         byte_order),
+    rd_	(orb_core,
+	 this->op_details_.service_info	())
 {
 }
 
-ACE_INLINE TAO_InputCDR &
+ACE_INLINE TAO_InputCDR	&
 TAO_GIOP_Synch_Invocation::inp_stream (void)
 {
   return this->rd_.reply_cdr ();
@@ -148,23 +142,23 @@ TAO_GIOP_Twoway_Invocation::TAO_GIOP_Twoway_Invocation (
     int byte_order
   )
   : TAO_GIOP_Synch_Invocation (stub,
-                               operation,
-                               opname_len,
-                               argument_flag,
-                               orb_core,
+			       operation,
+			       opname_len,
+			       argument_flag,
+			       orb_core,
                                byte_order)
 {
 }
 
 ACE_INLINE
-TAO_GIOP_Twoway_Invocation::~TAO_GIOP_Twoway_Invocation (void)
+TAO_GIOP_Twoway_Invocation::~TAO_GIOP_Twoway_Invocation	(void)
 {
 }
 
 // ****************************************************************
 
 ACE_INLINE
-TAO_GIOP_Oneway_Invocation::~TAO_GIOP_Oneway_Invocation (void)
+TAO_GIOP_Oneway_Invocation::~TAO_GIOP_Oneway_Invocation	(void)
 {
 }
 
@@ -179,16 +173,16 @@ TAO_GIOP_Oneway_Invocation::sync_scope (void)
 ACE_INLINE
 TAO_GIOP_Locate_Request_Invocation::
 TAO_GIOP_Locate_Request_Invocation (TAO_Stub *stub,
-                                    TAO_ORB_Core *orb_core)
+				    TAO_ORB_Core *orb_core)
   : TAO_GIOP_Synch_Invocation (stub,
-                               0,
-                               0,
-                               0,
-                               orb_core)
+			       0,
+			       0,
+			       0,
+			       orb_core)
 {
 }
 
 ACE_INLINE
-TAO_GIOP_Locate_Request_Invocation::~TAO_GIOP_Locate_Request_Invocation (void)
+TAO_GIOP_Locate_Request_Invocation::~TAO_GIOP_Locate_Request_Invocation	(void)
 {
 }
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 6b156ac108e..e3532b8b4ee 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -268,9 +268,7 @@ TAO_Object_Adapter::dispatch_servant (const TAO_ObjectKey &key,
   Priority_Model_Processing priority_processing (servant_upcall.poa ());
 
   // Set thread's priority.
-  priority_processing.pre_invoke (req.request_service_context (),
-                                  req.reply_service_context (),
-                                  ACE_TRY_ENV);
+  priority_processing.pre_invoke (req.service_info (), ACE_TRY_ENV);
   ACE_CHECK_RETURN (result);
 
 #endif /* TAO_HAS_RT_CORBA == 1 */
@@ -1446,8 +1444,7 @@ TAO_Object_Adapter::Priority_Model_Processing::~Priority_Model_Processing
 
 void
 TAO_Object_Adapter::Priority_Model_Processing::pre_invoke (
-   TAO_Service_Context &request_service_context,
-   TAO_Service_Context &reply_service_context,
+   IOP::ServiceContextList &service_context_list,
    CORBA::Environment &ACE_TRY_ENV)
 {
   TAO_POA_Policies &poa_policies = this->poa_.policies ();
@@ -1470,36 +1467,38 @@ TAO_Object_Adapter::Priority_Model_Processing::pre_invoke (
       // Attempt to extract client-propagated priority from the
       //  ServiceContextList of the request.
       RTCORBA::Priority target_priority;
-      const IOP::ServiceContext *context;
-
-      if (request_service_context.get_context (IOP::RTCorbaPriority,
-                                               &context) == 1)
-        {
-          // Extract the target priority
-          TAO_InputCDR cdr (ACE_reinterpret_cast
-                            (const char*,
-                             context->context_data.get_buffer ()),
-                            context->context_data.length ());
-          CORBA::Boolean byte_order;
-          if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-            ACE_THROW (CORBA::MARSHAL ());
-          cdr.reset_byte_order (ACE_static_cast(int,byte_order));
-
-          if ((cdr >> target_priority) == 0)
-            ACE_THROW (CORBA::MARSHAL ());
-
-          // Save the target priority in the response service
-          // context to propagate back to the client as specified
-          // by the RTCORBA specification.
-          reply_service_context.set_context (*context);
-        }
-      else
+      int priority_found = 0;
+      for (CORBA::ULong i = 0;
+           i < service_context_list.length () && !priority_found;
+           ++i)
         {
-          // Use default priority if none came in the request.  (Request
-          // must have come from a non-RT ORB.)
-          target_priority = poa_policies.server_priority ();
+          IOP::ServiceContext &context = service_context_list[i];
+
+          if (context.context_id == IOP::RTCorbaPriority)
+            {
+              TAO_InputCDR cdr (ACE_reinterpret_cast
+                                (const char*,
+                                 context.context_data.get_buffer ()),
+                                context.context_data.length ());
+
+              CORBA::Boolean byte_order;
+              if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
+                ACE_THROW (CORBA::MARSHAL ());
+              cdr.reset_byte_order (ACE_static_cast(int,byte_order));
+
+              if ((cdr >> target_priority) == 0)
+                ACE_THROW (CORBA::MARSHAL ());
+
+              priority_found = 1;
+              break;
+            }
         }
 
+      // Use default priority if none came in the request.  (Request
+      // must have come from a non-RT ORB.)
+      if (!priority_found)
+        target_priority = poa_policies.server_priority ();
+
       // Change the priority of the current thread to the
       // client-propagated value for the duration of
       // request.
diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h
index eab83a3cacc..a6b1a382782 100644
--- a/TAO/tao/PortableServer/Object_Adapter.h
+++ b/TAO/tao/PortableServer/Object_Adapter.h
@@ -40,7 +40,6 @@
 
 // RTCORBA
 #include "tao/RTCORBAC.h"
-#include "tao/Service_Context.h"
 
 // Local Object
 #include "tao/LocalObject.h"
@@ -734,8 +733,7 @@ public:
     // <post_invoke> method hasn't been called.  Unlike <post_invoke>,
     // this method cannot propagate exceptions to the user.
 
-    void pre_invoke (TAO_Service_Context &request_service_context,
-                     TAO_Service_Context &reply_service_context,
+    void pre_invoke (IOP::ServiceContextList &service_context_list,
                      CORBA::Environment &ACE_TRY_ENV);
     // Checks if target POA supports RTCORBA::CLIENT_PROPAGATED
     // PriorityModel.  If so, stores the original priority of the
diff --git a/TAO/tao/PortableServer/ServerRequestInfo.cpp b/TAO/tao/PortableServer/ServerRequestInfo.cpp
index 05f48b2e885..8b583fce340 100644
--- a/TAO/tao/PortableServer/ServerRequestInfo.cpp
+++ b/TAO/tao/PortableServer/ServerRequestInfo.cpp
@@ -159,12 +159,34 @@ TAO_ServerRequestInfo::get_request_service_context (
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_Service_Context &service_context_list =
-    this->server_request_.request_service_context ();
+  IOP::ServiceContextList &service_context_list =
+    this->server_request_.service_context ().service_info ();
 
-  return this->get_service_context_i (service_context_list,
-                                      id,
-                                      ACE_TRY_ENV);
+  CORBA::ULong len = service_context_list.length ();
+
+  for (CORBA::ULong i = 0; i < len; ++i)
+    if (service_context_list[i].context_id == id)
+      {
+        IOP::ServiceContext *service_context = 0;
+        ACE_NEW_THROW_EX (service_context,
+                          IOP::ServiceContext,
+                          CORBA::NO_MEMORY (
+                            CORBA::SystemException::_tao_minor_code (
+                              TAO_DEFAULT_MINOR_CODE,
+                              ENOMEM),
+                            CORBA::COMPLETED_NO));
+        ACE_CHECK_RETURN (0);
+
+        IOP::ServiceContext_var safe_service_context = service_context;
+
+        (*service_context) = service_context_list[i];
+
+        return safe_service_context._retn ();
+      }
+
+  ACE_THROW_RETURN (CORBA::BAD_PARAM (TAO_OMG_VMCID | 23,
+                                      CORBA::COMPLETED_NO),
+                    0);
 }
 
 IOP::ServiceContext *
@@ -173,50 +195,37 @@ TAO_ServerRequestInfo::get_reply_service_context (
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_Service_Context &service_context_list =
-    this->server_request_.reply_service_context ();
+  IOP::ServiceContextList &service_context_list =
+    this->server_request_.service_context ().service_info ();
 
-  return this->get_service_context_i (service_context_list,
-                                      id,
-                                      ACE_TRY_ENV);
-}
+  CORBA::ULong len = service_context_list.length ();
 
-IOP::ServiceContext *
-TAO_ServerRequestInfo::get_service_context_i (
-    TAO_Service_Context &service_context_list,
-    IOP::ServiceId id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Create a new service context to be returned.  Assume
-  // success.
-  IOP::ServiceContext *service_context = 0;
-  ACE_NEW_THROW_EX (service_context,
-                    IOP::ServiceContext,
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
+  for (CORBA::ULong i = 0; i < len; ++i)
+    if (service_context_list[i].context_id == id)
+      {
+        IOP::ServiceContext *service_context = 0;
+        ACE_NEW_THROW_EX (service_context,
+                          IOP::ServiceContext,
+                          CORBA::NO_MEMORY (
+                            CORBA::SystemException::_tao_minor_code (
+                              TAO_DEFAULT_MINOR_CODE,
+                              ENOMEM),
+                            CORBA::COMPLETED_NO));
+        ACE_CHECK_RETURN (0);
 
-  IOP::ServiceContext_var safe_service_context = service_context;
+        IOP::ServiceContext_var safe_service_context = service_context;
 
-  service_context->context_id = id;
-  if (service_context_list.get_context (*service_context) != 0)
-    {
-      // Found.
-      return safe_service_context._retn ();
-    }
-  else
-    {
-      // Not found.
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (TAO_OMG_VMCID | 23,
-                                          CORBA::COMPLETED_NO),
-                        0);
-    }
+        (*service_context) = service_context_list[i];
+
+        return safe_service_context._retn ();
+      }
+
+  ACE_THROW_RETURN (CORBA::BAD_PARAM (TAO_OMG_VMCID | 23,
+                                      CORBA::COMPLETED_NO),
+                    0);
 }
 
+
 // Use at own risk. There is no way currently of extracting an
 // exception from an Any. This method is in place just to be compliant
 // with the spec.
@@ -380,15 +389,33 @@ TAO_ServerRequestInfo::add_reply_service_context (
     CORBA::Environment &ACE_TRY_ENV)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  // Get the service context from the list
-  TAO_Service_Context &service_context_list =
-    this->server_request_.reply_service_context ();
+  // Copy the service context into the list.
+  IOP::ServiceContextList &service_context_list =
+    this->server_request_.service_context ().service_info ();
 
-  if (service_context_list.set_context (service_context,replace) == 0)
+  CORBA::ULong len = service_context_list.length ();
+
+  // First check if a service context with the same ID exists.
+  for (CORBA::ULong i = 0; i < len; ++i)
     {
-      ACE_THROW (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 11,
-                                       CORBA::COMPLETED_NO));
+      if (service_context_list[i].context_id ==
+          service_context.context_id)
+        {
+          if (replace)
+            {
+              service_context_list[i] = service_context;
+              return;
+            }
+          else
+            ACE_THROW (CORBA::BAD_INV_ORDER (TAO_OMG_VMCID | 11,
+                                             CORBA::COMPLETED_NO));
+        }
     }
+
+  // No service context with the given ID exists so add one.
+  service_context_list.length (len + 1);
+
+  service_context_list[len] = service_context;
 }
 
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PortableServer/ServerRequestInfo.h b/TAO/tao/PortableServer/ServerRequestInfo.h
index 75705012037..1a06b7aa818 100644
--- a/TAO/tao/PortableServer/ServerRequestInfo.h
+++ b/TAO/tao/PortableServer/ServerRequestInfo.h
@@ -31,7 +31,6 @@
 #include "tao/LocalObject.h"
 #include "tao/StringSeqC.h"
 #include "tao/OctetSeqC.h"
-#include "tao/Service_Context.h"
 #include "portableserver_export.h"
 
 #if defined(_MSC_VER)
@@ -180,14 +179,6 @@ public:
   void forward_reference (CORBA::Object_ptr obj);
 
 protected:
-  /// Helper method to get the request and response service contexts.
-  IOP::ServiceContext *get_service_context_i (
-    TAO_Service_Context &service_context_list,
-    IOP::ServiceId id,
-    CORBA::Environment &ACE_TRY_ENV)
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-protected:
 
   /// Underlying request object that contains much of the information
   /// encapsulated by this ServerRequestInfo class.
diff --git a/TAO/tao/RT_Protocols_Hooks.cpp b/TAO/tao/RT_Protocols_Hooks.cpp
index f90c00ab91e..6786b527142 100644
--- a/TAO/tao/RT_Protocols_Hooks.cpp
+++ b/TAO/tao/RT_Protocols_Hooks.cpp
@@ -45,7 +45,7 @@ TAO_RT_Protocols_Hooks::call_client_protocols_hook (
                                                      recv_buffer_size,
                                                      no_delay,
                                                      protocol_type);
-
+  
   return 0;
 }
 
@@ -166,8 +166,35 @@ TAO_RT_Protocols_Hooks::add_rt_service_context_hook (
           == 0)
         ACE_THROW (CORBA::MARSHAL ());
 
-      TAO_Service_Context &service_context = invocation->request_service_context ();
-      service_context.set_context (IOP::RTCorbaPriority, cdr);
+      // @@ The piece of code that comes here should go. It should
+      // be something like this.
+      // IOP::ServiceContext context;
+      // context.context_id = IOP::RTCorbaPriority;
+      // this->op_details_.service_context ().set_context
+      // (context, cdr);
+      // RT Folks can you please do these changes consistently
+      // wherever you guys are adding service context information
+      // - Bala
+      IOP::ServiceContextList &context_list = invocation->service_info ();
+
+      CORBA::ULong l = context_list.length ();
+      context_list.length (l + 1);
+      context_list[l].context_id = IOP::RTCorbaPriority;
+
+      // Make a *copy* of the CDR stream...
+      CORBA::ULong length = cdr.total_length ();
+      context_list[l].context_data.length (length);
+      CORBA::Octet *buf = context_list[l].context_data.get_buffer ();
+
+      for (const ACE_Message_Block *i = cdr.begin ();
+           i != 0;
+           i = i->cont ())
+        {
+          ACE_OS::memcpy (buf,
+                          i->rd_ptr (),
+                           i->length ());
+          buf += i->length ();
+        }
     }
 }
 
@@ -394,7 +421,7 @@ TAO_RT_Protocols_Hooks::set_priority_mapping (TAO_ORB_Core *orb_core,
 {
   // Obtain a reference to the Priority Mapping Manager.
   CORBA::Object_var obj = orb_core->priority_mapping_manager ();
-
+  
   TAO_Priority_Mapping_Manager_var priority_mapping_manager =
     TAO_Priority_Mapping_Manager::_narrow (obj.in (),
                                            ACE_TRY_ENV);
diff --git a/TAO/tao/Service_Context.cpp b/TAO/tao/Service_Context.cpp
index a66868d404d..bd4fe1fc218 100644
--- a/TAO/tao/Service_Context.cpp
+++ b/TAO/tao/Service_Context.cpp
@@ -57,28 +57,6 @@ TAO_Service_Context::set_context (const IOP::ServiceContext &context)
   this->add_context_i (context);
 }
 
-int
-TAO_Service_Context::set_context (const IOP::ServiceContext &context,
-                                  CORBA::Boolean replace)
-{
-  for (CORBA::ULong i = 0; i != this->service_context_.length (); ++i)
-    {
-      if (context.context_id == this->service_context_[i].context_id)
-        {
-          if (replace)
-            {
-              this->service_context_[i] = context;
-              return 1;
-            }
-          else
-            return 0;
-        }
-    }
-
-  this->add_context_i (context);
-  return 1;
-}
-
 void
 TAO_Service_Context::set_context (IOP::ServiceContext &context)
 {
@@ -156,19 +134,6 @@ TAO_Service_Context::get_context (IOP::ServiceContext& context) const
   return 0;
 }
 
-int
-TAO_Service_Context::get_context (IOP::ServiceId id, const IOP::ServiceContext **context) const
-{
-  for (CORBA::ULong i = 0; i != this->service_context_.length (); ++i)
-    {
-      if (id == this->service_context_[i].context_id)
-        {
-          *context = &this->service_context_[i];
-          return 1;
-        }
-    }
-  return 0;
-}
 
 int
 TAO_Service_Context::encode (TAO_OutputCDR& cdr) const
diff --git a/TAO/tao/Service_Context.h b/TAO/tao/Service_Context.h
index be7814e2045..0581de8d8aa 100644
--- a/TAO/tao/Service_Context.h
+++ b/TAO/tao/Service_Context.h
@@ -64,15 +64,6 @@ public:
   /// sequence.
   void set_context (const IOP::ServiceContext &context);
 
-  /// Insert the component into the list, making a copy of the octet
-  /// sequence.  Search the list before insertion so that the
-  /// insertion does not cause a duplicate context to be in the list.
-  /// If the replace flag is true, update the specified context.
-  /// Return 0 if the component was present and the replace flag
-  /// was not set to true.
-  int set_context (const IOP::ServiceContext &context,
-                   CORBA::Boolean replace);
-
   /// Insert the component into the list, but efficiently stealing the
   /// contents of the octet sequence.
   void set_context (IOP::ServiceContext &context);
@@ -81,10 +72,6 @@ public:
   /// 0 if the component is not present.
   int get_context (IOP::ServiceContext &context) const;
 
-  /// Get a reference to a context identified by id, return
-  /// 0 if the component is not present.
-  int get_context (IOP::ServiceId id, const IOP::ServiceContext **context) const;
-
   /// Set the context from the CDR stream and add that to the service
   /// Context list
   void set_context (IOP::ServiceId id, TAO_OutputCDR &cdr);
@@ -120,7 +107,7 @@ private:
   void set_context_i (IOP::ServiceId id, TAO_OutputCDR &cdr);
   void set_context_i (IOP::ServiceContext &context, TAO_OutputCDR &cdr);
 
-  /// Helper methods to implement get_context()
+  /// Helper methods to implement set_context()
   int get_context_i (IOP::ServiceContext &context) const;
 
 private:
diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp
index 0337b6a1f65..24ded41acd2 100644
--- a/TAO/tao/TAO_Server_Request.cpp
+++ b/TAO/tao/TAO_Server_Request.cpp
@@ -138,8 +138,10 @@ TAO_ServerRequest::init_reply (void)
   reply_params.is_dsi_ = this->is_dsi_;
   reply_params.dsi_nvlist_align_ = this->dsi_nvlist_align_;
 
-  // Send back the reply service context.
-  reply_params.service_context_notowned (&this->reply_service_info ());
+  // Pass in the service context list.  We are sending back what we
+  // received in the Request.  (RTCORBA relies on it.  Check before
+  // modifying...) marina
+  reply_params.service_context_notowned (&this->service_info ());
 
   // Are we going to marshall any data with the reply?
   reply_params.argument_flag_ = this->argument_flag_;
@@ -191,8 +193,10 @@ TAO_ServerRequest::send_no_exception_reply (void)
   // leave a comment why this is important!
   reply_params.svc_ctx_.length (0);
 
-  // Send back the reply service context.
-  reply_params.service_context_notowned (&this->reply_service_info ());
+  // Pass in the service context list.  We are sending back what we
+  // received in the Request.  (RTCORBA relies on it.  Check before
+  // modifying...) marina
+  reply_params.service_context_notowned (&this->service_info ());
 
   reply_params.reply_status_ = TAO_GIOP_NO_EXCEPTION;
 
@@ -251,8 +255,9 @@ TAO_ServerRequest::tao_send_reply_exception (CORBA::Exception &ex)
       reply_params.request_id_ = this->request_id_;
       reply_params.svc_ctx_.length (0);
 
-      // Send back the reply service context.
-      reply_params.service_context_notowned (&this->reply_service_info ());
+      // Send back the service context we received.  (RTCORBA relies on
+      // this).
+      reply_params.service_context_notowned (&this->service_info ());
 
       // We are going to send some data
       reply_params.argument_flag_ = 1;
diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h
index b78d9dd730d..74e15982509 100644
--- a/TAO/tao/TAO_Server_Request.h
+++ b/TAO/tao/TAO_Server_Request.h
@@ -126,16 +126,15 @@ public:
   TAO_ObjectKey &object_key (void);
 
   /**
-   * @todo This two methods should go away.
+   * @todo These two methods should go away.
    */
   //@{
-  IOP::ServiceContextList &request_service_info (void);
-  IOP::ServiceContextList &reply_service_info (void);
+  IOP::ServiceContextList &service_info (void);
+  void service_info (IOP::ServiceContextList &service_info);
   //@}
 
   /// Return the TAO_Service_Context
-  TAO_Service_Context &request_service_context (void);
-  TAO_Service_Context &reply_service_context (void);
+  TAO_Service_Context &service_context (void);
 
   /// Return the underlying transport
   TAO_Transport *transport ();
@@ -240,9 +239,11 @@ private:
   /// created.
   TAO_ORB_Core *orb_core_;
 
+  /// The service context for the request (CORBA Reference?).
+  // IOP::ServiceContextList service_info_;
+
   /// Service Context info
-  TAO_Service_Context request_service_context_;
-  TAO_Service_Context reply_service_context_;
+  TAO_Service_Context service_context_;
 
   /// Unique identifier for a request.
   CORBA::ULong request_id_;
diff --git a/TAO/tao/TAO_Server_Request.i b/TAO/tao/TAO_Server_Request.i
index 0e00e4ec7df..f757b1cc046 100644
--- a/TAO/tao/TAO_Server_Request.i
+++ b/TAO/tao/TAO_Server_Request.i
@@ -80,28 +80,22 @@ TAO_ServerRequest::object_key (void)
   return this->profile_.object_key ();
 }
 
-ACE_INLINE TAO_Service_Context &
-TAO_ServerRequest::request_service_context (void)
-{
-  return this->request_service_context_;
-}
-
-ACE_INLINE TAO_Service_Context &
-TAO_ServerRequest::reply_service_context (void)
+ACE_INLINE IOP::ServiceContextList &
+TAO_ServerRequest::service_info (void)
 {
-  return this->reply_service_context_;
+  return this->service_context_.service_info ();
 }
 
-ACE_INLINE IOP::ServiceContextList &
-TAO_ServerRequest::request_service_info (void)
+ACE_INLINE void
+TAO_ServerRequest::service_info (IOP::ServiceContextList &service_info)
 {
-  return this->request_service_context ().service_info ();
+  this->service_context_.service_info () = service_info;
 }
 
-ACE_INLINE IOP::ServiceContextList &
-TAO_ServerRequest::reply_service_info (void)
+ACE_INLINE TAO_Service_Context &
+TAO_ServerRequest::service_context (void)
 {
-  return this->reply_service_context ().service_info ();
+  return this->service_context_;
 }
 
 ACE_INLINE TAO_Transport *
@@ -110,6 +104,7 @@ TAO_ServerRequest::transport (void)
   return this->transport_;
 }
 
+
 ACE_INLINE CORBA::ULong
 TAO_ServerRequest::request_id (void)
 {
diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h
index b66ddd9c272..ee22933810e 100644
--- a/TAO/tao/operation_details.h
+++ b/TAO/tao/operation_details.h
@@ -62,16 +62,12 @@ public:
   CORBA::Octet response_flags (void) const;
 
   /// Get the service context list
-  IOP::ServiceContextList &request_service_info (void);
-  const IOP::ServiceContextList &request_service_info (void) const;
-  IOP::ServiceContextList &reply_service_info (void);
-  const IOP::ServiceContextList &reply_service_info (void) const;
+  IOP::ServiceContextList &service_info (void);
+  const IOP::ServiceContextList &service_info (void) const;
 
   /// Access the TAO_Service_Context
-  TAO_Service_Context &request_service_context (void);
-  const TAO_Service_Context &request_service_context (void) const;
-  TAO_Service_Context &reply_service_context (void);
-  const TAO_Service_Context &reply_service_context (void) const;
+  TAO_Service_Context &service_context (void);
+  const TAO_Service_Context &service_context (void) const;
 
   void request_id (CORBA::ULong id);
 
@@ -82,6 +78,8 @@ public:
   CORBA::ULong request_id (void);
   CORBA::ULong request_id (void) const;
 
+
+
   /// Get method        for the addressing mode
   TAO_Target_Specification::TAO_Target_Address addressing_mode (void);
   TAO_Target_Specification::TAO_Target_Address
@@ -111,13 +109,9 @@ private:
   /// Response flags
   CORBA::Octet response_flags_;
 
-  /// The ServiceContextList sent to the server side. Only valid
+  /// The ServiceContextList sent to the server side.  Only valid
   /// when sending a request.
-  TAO_Service_Context request_service_info_;
-
-  /// The ServiceContextList received from the server side. Only
-  /// valid when sending a request.
-  TAO_Service_Context reply_service_info_;
+  TAO_Service_Context service_info_;
 
   // The first element of header is service context list;
   // transactional context would be acquired here using the
diff --git a/TAO/tao/operation_details.i b/TAO/tao/operation_details.i
index f2b3af487d0..9135ba81b7d 100644
--- a/TAO/tao/operation_details.i
+++ b/TAO/tao/operation_details.i
@@ -33,56 +33,31 @@ TAO_Operation_Details::argument_flag (void) const
 }
 
 ACE_INLINE IOP::ServiceContextList &
-TAO_Operation_Details::request_service_info (void)
+TAO_Operation_Details::service_info (void)
 {
   // @@ This should go ...
-  return this->request_service_context ().service_info ();
+  return this->service_info_.service_info ();
 }
 
 ACE_INLINE const IOP::ServiceContextList &
-TAO_Operation_Details::request_service_info (void) const
+TAO_Operation_Details::service_info (void) const
 {
   // @@ This should go ...
-  return this->request_service_context ().service_info ();
+  return this->service_info_.service_info ();
 }
 
 ACE_INLINE TAO_Service_Context &
-TAO_Operation_Details::request_service_context (void)
+TAO_Operation_Details::service_context (void)
 {
-  return this->request_service_info_;
+  return this->service_info_;
 }
 
 ACE_INLINE const TAO_Service_Context &
-TAO_Operation_Details::request_service_context (void) const
+TAO_Operation_Details::service_context (void) const
 {
-  return this->request_service_info_;
+  return this->service_info_;
 }
 
-ACE_INLINE IOP::ServiceContextList &
-TAO_Operation_Details::reply_service_info (void)
-{
-  // @@ This should go ...
-  return this->reply_service_context ().service_info ();
-}
-
-ACE_INLINE const IOP::ServiceContextList &
-TAO_Operation_Details::reply_service_info (void) const
-{
-  // @@ This should go ...
-  return this->reply_service_context ().service_info ();
-}
-
-ACE_INLINE TAO_Service_Context &
-TAO_Operation_Details::reply_service_context (void)
-{
-  return this->reply_service_info_;
-}
-
-ACE_INLINE const TAO_Service_Context &
-TAO_Operation_Details::reply_service_context (void) const
-{
-  return this->reply_service_info_;
-}
 
 ACE_INLINE void
 TAO_Operation_Details::request_id (CORBA::ULong id)
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp
index 9b14fa59619..2376a251a28 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/interceptors.cpp
@@ -7,7 +7,8 @@ ACE_RCSID (Service_Context_Manipulation,
            interceptors,
            "$Id$")
 
-const IOP::ServiceId service_id = 0xdeadbeef;
+const CORBA::ULong request_ctx_id = 0xdead;
+const CORBA::ULong reply_ctx_id = 0xbeef;
 const char *request_msg = "The Echo_Request_Interceptor request message";
 const char *reply_msg = "The Echo_Request_Interceptor reply message";
 
@@ -87,17 +88,16 @@ Echo_Client_Request_Interceptor::send_request (
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
-              "%s.send_request "
+              "Echo_Client_Request_Interceptor::send_request "
               "from \"%s\" on object: %s\n",
-              this->myname_,
               operation.in (),
               ior.in ()));
 
   // Populate target member of the ClientRequestInfo.
 
-  // Make the context to send the context to the target
+  // MAke the context to send the context to the target
   IOP::ServiceContext sc;
-  sc.context_id = ::service_id;
+  sc.context_id = request_ctx_id;
 
   CORBA::ULong string_len = ACE_OS::strlen (request_msg) + 1;
   CORBA::Octet *buf = CORBA::OctetSeq::allocbuf (string_len);
@@ -107,24 +107,6 @@ Echo_Client_Request_Interceptor::send_request (
 
   // Add this context to the service context list.
   ri->add_request_service_context (sc, 0, ACE_TRY_ENV);
-
-  // Check that the request service context can be retrieved.
-  IOP::ServiceContext_var sc2 =
-    ri->get_request_service_context (::service_id, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  const char *buf2 =
-    ACE_reinterpret_cast (const char *, sc2->context_data.get_buffer ());
-
-  if (ACE_OS::strcmp (buf2, request_msg) != 0)
-    {
-        ACE_ERROR ((LM_ERROR,
-                    "ERROR: Expected request service context to be: %s.\n"
-                    "  Got: %s\n",
-                    request_msg,
-                    buf2));
-    }
-
 }
 
 void
@@ -155,16 +137,14 @@ Echo_Client_Request_Interceptor::receive_reply (
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
-              "%s.receive_reply from "
+              "Echo_Client_Request_Interceptor::receive_reply from "
               "\"%s\" on object: %s\n",
-              this->myname_,
               operation.in (),
               ior.in ()));
 
-  // Check that the reply service context was received as
-  // expected.
+  IOP::ServiceId id = reply_ctx_id;
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (::service_id, ACE_TRY_ENV);
+    ri->get_reply_service_context (id, ACE_TRY_ENV);
   ACE_CHECK;
 
   const char *buf =
@@ -172,30 +152,6 @@ Echo_Client_Request_Interceptor::receive_reply (
   ACE_DEBUG ((LM_DEBUG,
               "  Received reply service context: %s\n",
               buf));
-
-  if (ACE_OS::strcmp (buf, reply_msg) != 0)
-    {
-        ACE_ERROR ((LM_ERROR,
-                    "ERROR: Expected reply service context to be: %s\n",
-                    reply_msg));
-    }
-
-  // Check that no one has messed with the request service context.
-  IOP::ServiceContext_var sc2 =
-    ri->get_request_service_context (::service_id, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  const char *buf2 =
-    ACE_reinterpret_cast (const char *, sc2->context_data.get_buffer ());
-
-  if (ACE_OS::strcmp (buf2, request_msg) != 0)
-    {
-        ACE_ERROR ((LM_ERROR,
-                    "ERROR: Expected request service context to be: %s.\n"
-                    "  Got: %s\n",
-                    request_msg,
-                    buf2));
-    }
 }
 
 void
@@ -206,8 +162,7 @@ Echo_Client_Request_Interceptor::receive_other (
                    PortableInterceptor::ForwardRequest))
 {
   ACE_DEBUG ((LM_DEBUG,
-              "%s.receive_other\n",
-              this->myname_));
+              "Echo_Client_Request_Interceptor::receive_other\n"));
 }
 
 void
@@ -239,47 +194,10 @@ Echo_Client_Request_Interceptor::receive_exception (
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
-              "%s.received_exception "
+              "Echo_Client_Request_Interceptor::received_exception "
               "from \"%s\" on object: %s\n",
-              this->myname_,
-              operation.in (),
-              ior.in ()));
-
-  // Check that the reply service context was received as
-  // expected.
-  IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (::service_id, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  const char *buf =
-    ACE_reinterpret_cast (const char *, sc->context_data.get_buffer ());
-  ACE_DEBUG ((LM_DEBUG,
-              "  Received reply service context: %s\n",
-              buf));
-
-  if (ACE_OS::strcmp (buf, reply_msg) != 0)
-    {
-        ACE_ERROR ((LM_ERROR,
-                    "ERROR: Expected reply service context to be: %s\n",
-                    reply_msg));
-    }
-
-  // Check that no one has messed with the request service context.
-  IOP::ServiceContext_var sc2 =
-    ri->get_request_service_context (::service_id, ACE_TRY_ENV);
+              operation.in (), ior.in ()));
   ACE_CHECK;
-
-  const char *buf2 =
-    ACE_reinterpret_cast (const char *, sc2->context_data.get_buffer ());
-
-  if (ACE_OS::strcmp (buf2, request_msg) != 0)
-    {
-        ACE_ERROR ((LM_ERROR,
-                    "ERROR: Expected request service context to be: %s.\n"
-                    "  Got: %s\n",
-                    request_msg,
-                    buf2));
-    }
 }
 
 Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
@@ -331,9 +249,9 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
-              "%s.receive_request_service_contexts from "
+              "Echo_Server_Request_Interceptor::"
+              "receive_request_service_contexts from "
               "\"%s\"\n",
-              this->myname_,
               operation.in ()));
 
   // Ignore the "_is_a" operation since it may have been invoked
@@ -342,7 +260,7 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
   if (ACE_OS_String::strcmp ("_is_a", operation.in ()) == 0)
     return;
 
-  IOP::ServiceId id = ::service_id;
+  IOP::ServiceId id = request_ctx_id;
   IOP::ServiceContext_var sc =
     ri->get_request_service_context (id, ACE_TRY_ENV);
   ACE_CHECK;
@@ -353,18 +271,10 @@ Echo_Server_Request_Interceptor::receive_request_service_contexts (
               "  Received service context: %s\n",
               buf));
 
-  if (ACE_OS::strcmp (buf, request_msg) != 0)
-    {
-        ACE_ERROR ((LM_ERROR,
-                    "ERROR: Echo_Server_Request_Interceptor::receive_request_service_contexts: "
-                    "Expected request service context to be: %s\n",
-                    request_msg));
-    }
-
   // Make the context to send the context to the client
   IOP::ServiceContext scc;
 
-  scc.context_id = ::service_id;
+  scc.context_id = reply_ctx_id;
 
   CORBA::ULong string_len = ACE_OS::strlen (reply_msg) + 1;
   CORBA::Octet *buff = CORBA::OctetSeq::allocbuf (string_len);
@@ -401,46 +311,19 @@ Echo_Server_Request_Interceptor::send_reply (
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
-              "%s.send_reply from \"%s\"\n",
-              this->myname_,
+              "Echo_Server_Request_Interceptor::send_reply from \"%s\"",
               ri->operation ()));
 
-  // Check that the reply service context is set as expected.
+  IOP::ServiceId id = reply_ctx_id;
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (::service_id, ACE_TRY_ENV);
+    ri->get_reply_service_context (id, ACE_TRY_ENV);
   ACE_CHECK;
 
   const char *buf = ACE_reinterpret_cast (const char *,
                                           sc->context_data.get_buffer ());
   ACE_DEBUG ((LM_DEBUG,
-              "  Reply service context: %s\n",
+              "  Replying service context: %s\n",
               buf));
-
-  if (ACE_OS::strcmp (buf, reply_msg) != 0)
-    {
-        ACE_ERROR ((LM_ERROR,
-                    "ERROR: Echo_Server_Request_Interceptor::send_reply: "
-                    "Expected reply service context to be: %s\n",
-                    reply_msg));
-    }
-
-  // Check that the request service context hasn't been changed.
-  IOP::ServiceContext_var sc2 =
-    ri->get_request_service_context (::service_id, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  const char *buf2 = ACE_reinterpret_cast (const char *,
-                                           sc2->context_data.get_buffer ());
-
-  if (ACE_OS::strcmp (buf2, request_msg) != 0)
-    {
-        ACE_ERROR ((LM_ERROR,
-                    "ERROR: Echo_Server_Request_Interceptor::send_reply: "
-                    "Expected request service context to be: %s.\n"
-                    "  Got: %s\n",
-                    request_msg,
-                    buf2));
-    }
 }
 
 void
@@ -456,46 +339,9 @@ Echo_Server_Request_Interceptor::send_exception (
   ACE_CHECK;
 
   ACE_DEBUG ((LM_DEBUG,
-              "%s.send_exception from \"%s\"\n",
-              this->myname_,
+              "Echo_Server_Request_Interceptor::send_exception from "
+              "\"%s\"",
               operation.in ()));
-
-  // Check that the reply service context is set as expected.
-  IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (::service_id, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  const char *buf = ACE_reinterpret_cast (const char *,
-                                          sc->context_data.get_buffer ());
-  ACE_DEBUG ((LM_DEBUG,
-              "  Reply service context: %s\n",
-              buf));
-
-  if (ACE_OS::strcmp (buf, reply_msg) != 0)
-    {
-        ACE_ERROR ((LM_ERROR,
-                    "ERROR: Echo_Server_Request_Interceptor::send_exception: "
-                    "Expected reply service context to be: %s\n",
-                    reply_msg));
-    }
-
-  // Check that the request service context hasn't been changed.
-  IOP::ServiceContext_var sc2 =
-    ri->get_request_service_context (::service_id, ACE_TRY_ENV);
-  ACE_CHECK;
-
-  const char *buf2 = ACE_reinterpret_cast (const char *,
-                                           sc2->context_data.get_buffer ());
-
-  if (ACE_OS::strcmp (buf2, request_msg) != 0)
-    {
-        ACE_ERROR ((LM_ERROR,
-                    "ERROR: Echo_Server_Request_Interceptor::send_exception: "
-                    "Expected request service context to be: %s.\n"
-                    "  Got: %s\n",
-                    request_msg,
-                    buf2));
-    }
 }
 
 void
diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
deleted file mode 100644
index 11463bd4333..00000000000
--- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-//
-
-#include "Client_ORBInitializer.h"
-#include "interceptors.h"
-
-ACE_RCSID (Client_Propagated, Client_ORBInitializer, "$Id$")
-
-Client_ORBInitializer::Client_ORBInitializer (void)
-{
-}
-
-void
-Client_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-Client_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    TAO_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_ENV_ARG_DEFN;
-
-  CORBA::String_var orb_id =
-    info->orb_id (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  PortableInterceptor::ClientRequestInterceptor_ptr interceptor =
-    PortableInterceptor::ClientRequestInterceptor::_nil ();
-
-  // Install the Echo client request interceptor
-  ACE_NEW_THROW_EX (interceptor,
-                    Client_Request_Interceptor (orb_id.in ()),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK;
-
-  PortableInterceptor::ClientRequestInterceptor_var
-    client_interceptor = interceptor;
-
-  info->add_client_request_interceptor (client_interceptor.in (),
-                                        ACE_TRY_ENV);
-  ACE_CHECK;
-}
-
diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
deleted file mode 100644
index 4f0a2b8b6bd..00000000000
--- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-//
-
-#ifndef TAO_CLIENT_ORB_INITIALIZER_H
-#define TAO_CLIENT_ORB_INITIALIZER_H
-#include "ace/pre.h"
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableInterceptorC.h"
-#include "tao/LocalObject.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-/// Client ORB initializer.
-class Client_ORBInitializer :
-  public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
-{
-public:
-  /// Constructor
-  Client_ORBInitializer (void);
-
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include "ace/post.h"
-#endif /* TAO_CLIENT_ORB_INITIALIZER_H */
diff --git a/TAO/tests/RTCORBA/Client_Propagated/Makefile b/TAO/tests/RTCORBA/Client_Propagated/Makefile
index b3dcef48e5d..e546515a536 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/Makefile
+++ b/TAO/tests/RTCORBA/Client_Propagated/Makefile
@@ -16,9 +16,9 @@ IDL_FILES = test
 IDL_SRC = testC.cpp testS.cpp
 BIN_UNCHECKED = server client
 
-SRC = $(addsuffix .cpp, $(BIN)) $(IDL_SRC) interceptors.cpp Client_ORBInitializer.cpp
+SRC = $(addsuffix .cpp, $(BIN)) $(IDL_SRC)
 
-CLIENT_OBJS = client.o testC.o interceptors.o Client_ORBInitializer.o
+CLIENT_OBJS = client.o testC.o
 SERVER_OBJS = server.o $(IDL_SRC:.cpp=.o)
 
 BUILD = $(BIN)
@@ -68,33 +68,26 @@ realclean: clean
 .obj/server.o .obj/server.so .shobj/server.o .shobj/server.so: server.cpp testS.h testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/post.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
  $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
  $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
  $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
  $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Flag_Manip.h \
  $(ACE_ROOT)/ace/Flag_Manip.i \
  $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -112,313 +105,202 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/Synch.i \
  $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Thread.h \
  $(ACE_ROOT)/ace/Thread_Adapter.h \
  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Malloc_Allocator.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
  $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
  $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/TAO_Server_Request.h \
  $(TAO_ROOT)/tao/Tagged_Profile.h \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/GIOPC.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
  $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/Profile.h \
  $(TAO_ROOT)/tao/Tagged_Components.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
  $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
  $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
  $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
  $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
  $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
  $(ACE_ROOT)/ace/Timer_Queue.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
  $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
  $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
  $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
  $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
  $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
  $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Functor_T.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
  $(TAO_ROOT)/tao/Cache_Entries.h \
  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
  $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
  $(TAO_ROOT)/tao/Object_Ref_Table.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
  $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
+ $(ACE_ROOT)/ace/Singleton.i \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/operation_details.h \
  $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
- $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/ClientRequestInfo.h \
  $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
  $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
  $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- testC.i \
  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
  $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
- testS_T.h testS_T.i testS_T.cpp testS.i \
+ testS_T.h testS_T.cpp testS_T.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
  $(TAO_ROOT)/tao/Strategies/advanced_resource.h \
  $(TAO_ROOT)/tao/Strategies/strategies_export.h \
- $(TAO_ROOT)/tao/default_resource.h \
- $(TAO_ROOT)/tao/default_resource.i \
- $(TAO_ROOT)/tao/Strategies/advanced_resource.i
+ $(TAO_ROOT)/tao/default_resource.h
 
 .obj/client.o .obj/client.so .shobj/client.o .shobj/client.so: client.cpp testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/post.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
  $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
  $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
  $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
  $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Flag_Manip.h \
  $(ACE_ROOT)/ace/Flag_Manip.i \
  $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -436,301 +318,193 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/Synch.i \
  $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Thread.h \
  $(ACE_ROOT)/ace/Thread_Adapter.h \
  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Malloc_Allocator.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
  $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
  $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/TAO_Server_Request.h \
  $(TAO_ROOT)/tao/Tagged_Profile.h \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/GIOPC.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
  $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/Profile.h \
  $(TAO_ROOT)/tao/Tagged_Components.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
  $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
  $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
  $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
  $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
  $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
  $(ACE_ROOT)/ace/Timer_Queue.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
  $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
  $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
  $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
  $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
  $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
  $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Functor_T.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
  $(TAO_ROOT)/tao/Cache_Entries.h \
  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
  $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
  $(TAO_ROOT)/tao/Object_Ref_Table.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
  $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
+ $(ACE_ROOT)/ace/Singleton.i \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/operation_details.h \
  $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
- $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/ClientRequestInfo.h \
  $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
  $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
  $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- testC.i \
  $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
  $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i \
- Client_ORBInitializer.h \
  $(TAO_ROOT)/tao/Strategies/advanced_resource.h \
  $(TAO_ROOT)/tao/Strategies/strategies_export.h \
- $(TAO_ROOT)/tao/default_resource.h \
- $(TAO_ROOT)/tao/default_resource.i \
- $(TAO_ROOT)/tao/Strategies/advanced_resource.i
+ $(TAO_ROOT)/tao/default_resource.h
 
 .obj/testC.o .obj/testC.so .shobj/testC.o .shobj/testC.so: testC.cpp testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/post.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
  $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
  $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
  $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
  $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Flag_Manip.h \
  $(ACE_ROOT)/ace/Flag_Manip.i \
  $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -748,292 +522,190 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/Synch.i \
  $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Thread.h \
  $(ACE_ROOT)/ace/Thread_Adapter.h \
  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Malloc_Allocator.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
  $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
  $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/TAO_Server_Request.h \
  $(TAO_ROOT)/tao/Tagged_Profile.h \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/GIOPC.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
  $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/Profile.h \
  $(TAO_ROOT)/tao/Tagged_Components.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
  $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
  $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
  $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
  $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
  $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
  $(ACE_ROOT)/ace/Timer_Queue.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
  $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
  $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
  $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
  $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
  $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
  $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Functor_T.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
  $(TAO_ROOT)/tao/Cache_Entries.h \
  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
  $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
  $(TAO_ROOT)/tao/Object_Ref_Table.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
  $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
+ $(ACE_ROOT)/ace/Singleton.i \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/operation_details.h \
  $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
- $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/ClientRequestInfo.h \
  $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
  $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
  $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- testC.i \
- $(TAO_ROOT)/tao/RequestInfo_Util.h
+ $(TAO_ROOT)/tao/RequestInfo_Util.h \
+ testC.i
 
 .obj/testS.o .obj/testS.so .shobj/testS.o .shobj/testS.so: testS.cpp testS.h testC.h \
  $(TAO_ROOT)/tao/corba.h \
  $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/post.h \
  $(ACE_ROOT)/ace/ACE_export.h \
  $(ACE_ROOT)/ace/svc_export.h \
  $(ACE_ROOT)/ace/ace_wchar.h \
  $(ACE_ROOT)/ace/ace_wchar.inl \
  $(ACE_ROOT)/ace/OS_Errno.h \
  $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
+ $(ACE_ROOT)/ace/post.h \
  $(TAO_ROOT)/tao/corbafwd.h \
  $(ACE_ROOT)/ace/CDR_Base.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
  $(ACE_ROOT)/ace/Message_Block.h \
  $(ACE_ROOT)/ace/ACE.h \
  $(ACE_ROOT)/ace/OS.h \
  $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
  $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
  $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
  $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
  $(ACE_ROOT)/ace/Min_Max.h \
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Flag_Manip.h \
  $(ACE_ROOT)/ace/Flag_Manip.i \
  $(ACE_ROOT)/ace/Handle_Ops.h \
@@ -1051,608 +723,192 @@ realclean: clean
  $(ACE_ROOT)/ace/Log_Priority.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/Synch.i \
  $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
+ $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Thread.h \
  $(ACE_ROOT)/ace/Thread_Adapter.h \
  $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
+ $(ACE_ROOT)/ace/Synch_T.i \
  $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
  $(ACE_ROOT)/ace/Malloc_Allocator.h \
  $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
  $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
+ $(ACE_ROOT)/ace/Free_List.i \
  $(ACE_ROOT)/ace/Malloc_T.cpp \
+ $(ACE_ROOT)/ace/Malloc_T.i \
  $(ACE_ROOT)/ace/Memory_Pool.h \
  $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
  $(ACE_ROOT)/ace/Signal.h \
  $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
+ $(ACE_ROOT)/ace/Containers_T.i \
  $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
  $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
+ $(ACE_ROOT)/ace/Message_Block_T.i \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
  $(ACE_ROOT)/ace/CORBA_macros.h \
  $(TAO_ROOT)/tao/varbase.h \
  $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
  $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
  $(TAO_ROOT)/tao/ORB.h \
  $(TAO_ROOT)/tao/Exception.h \
  $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
  $(TAO_ROOT)/tao/Services.h \
  $(TAO_ROOT)/tao/Sequence.h \
  $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
  $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/Services.i \
+ $(TAO_ROOT)/tao/Sequence_T.i \
  $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
  $(TAO_ROOT)/tao/PolicyC.h \
  $(TAO_ROOT)/tao/CurrentC.h \
  $(TAO_ROOT)/tao/Object.h \
  $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
  $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
  $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/CurrentC.i \
  $(TAO_ROOT)/tao/Encodable.h \
  $(TAO_ROOT)/tao/CDR.h \
  $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
  $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
  $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/Any.i \
  $(TAO_ROOT)/tao/NVList.h \
- $(TAO_ROOT)/tao/NVList.i \
  $(TAO_ROOT)/tao/Principal.h \
  $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
  $(TAO_ROOT)/tao/TAO_Server_Request.h \
  $(TAO_ROOT)/tao/Tagged_Profile.h \
  $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
  $(TAO_ROOT)/tao/GIOPC.h \
  $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/GIOPC.i \
- $(TAO_ROOT)/tao/Tagged_Profile.i \
  $(TAO_ROOT)/tao/Service_Context.h \
- $(TAO_ROOT)/tao/Service_Context.inl \
- $(TAO_ROOT)/tao/TAO_Server_Request.i \
  $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
  $(TAO_ROOT)/tao/Stub.h \
  $(TAO_ROOT)/tao/Pluggable.h \
- $(TAO_ROOT)/tao/Pluggable.i \
  $(TAO_ROOT)/tao/MProfile.h \
  $(TAO_ROOT)/tao/Profile.h \
  $(TAO_ROOT)/tao/Tagged_Components.h \
  $(TAO_ROOT)/tao/CONV_FRAMEC.h \
- $(TAO_ROOT)/tao/CONV_FRAMEC.i \
- $(TAO_ROOT)/tao/Tagged_Components.i \
  $(TAO_ROOT)/tao/GIOP_Message_State.h \
- $(TAO_ROOT)/tao/GIOP_Message_State.i \
- $(TAO_ROOT)/tao/Profile.i \
- $(TAO_ROOT)/tao/MProfile.i \
  $(TAO_ROOT)/tao/ORB_Core.h \
  $(TAO_ROOT)/tao/Policy_Manager.h \
- $(TAO_ROOT)/tao/Policy_Manager.i \
  $(TAO_ROOT)/tao/Resource_Factory.h \
  $(ACE_ROOT)/ace/Service_Object.h \
  $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
  $(TAO_ROOT)/tao/Protocol_Factory.h \
  $(TAO_ROOT)/tao/params.h \
- $(TAO_ROOT)/tao/params.i \
  $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
  $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/TAO_Singleton.cpp \
  $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
  $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
  $(ACE_ROOT)/ace/Managed_Object.cpp \
+ $(ACE_ROOT)/ace/Managed_Object.i \
+ $(TAO_ROOT)/tao/TAO_Singleton.inl \
  $(TAO_ROOT)/tao/Adapter.h \
- $(TAO_ROOT)/tao/Adapter.i \
  $(TAO_ROOT)/tao/PolicyFactory_Registry.h \
  $(TAO_ROOT)/tao/PortableInterceptorC.h \
  $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
  $(TAO_ROOT)/tao/MessagingC.h \
  $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
  $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
  $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
  $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
  $(ACE_ROOT)/ace/Map_Manager.h \
- $(ACE_ROOT)/ace/Map_Manager.i \
  $(ACE_ROOT)/ace/Map_Manager.cpp \
  $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
  $(ACE_ROOT)/ace/Timer_Queue.h \
  $(ACE_ROOT)/ace/Timer_Queue_T.h \
  $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
  $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
  $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
+ $(ACE_ROOT)/ace/Timer_Queue_T.i \
  $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
+ $(ACE_ROOT)/ace/Map_Manager.i \
  $(TAO_ROOT)/tao/Parser_Registry.h \
- $(TAO_ROOT)/tao/Parser_Registry.i \
  $(TAO_ROOT)/tao/Service_Callbacks.h \
- $(TAO_ROOT)/tao/Service_Callbacks.i \
  $(TAO_ROOT)/tao/Fault_Tolerance_Service.h \
- $(TAO_ROOT)/tao/Fault_Tolerance_Service.i \
  $(TAO_ROOT)/tao/Transport_Cache_Manager.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
  $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
  $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
  $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
+ $(ACE_ROOT)/ace/Functor_T.i \
  $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
+ $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
  $(TAO_ROOT)/tao/Cache_Entries.h \
  $(TAO_ROOT)/tao/Transport_Descriptor_Interface.h \
  $(TAO_ROOT)/tao/Endpoint.h \
- $(TAO_ROOT)/tao/Endpoint.i \
- $(TAO_ROOT)/tao/Transport_Descriptor_Interface.inl \
- $(TAO_ROOT)/tao/Cache_Entries.inl \
- $(TAO_ROOT)/tao/Transport_Cache_Manager.inl \
  $(TAO_ROOT)/tao/Cleanup_Func_Registry.h \
- $(TAO_ROOT)/tao/Cleanup_Func_Registry.inl \
  $(TAO_ROOT)/tao/Object_Ref_Table.h \
  $(TAO_ROOT)/tao/Interceptor_List.h \
- $(TAO_ROOT)/tao/Interceptor_List.inl \
  $(TAO_ROOT)/tao/RT_Policy_i.h \
  $(TAO_ROOT)/tao/RTCORBAC.h \
- $(TAO_ROOT)/tao/RTCORBAC.i \
- $(TAO_ROOT)/tao/RT_Policy_i.i \
  $(TAO_ROOT)/tao/Protocols_Hooks.h \
  $(ACE_ROOT)/ace/Hash_Map_Manager.h \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
  $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(TAO_ROOT)/tao/ORB_Core.i \
- $(TAO_ROOT)/tao/Stub.i \
+ $(ACE_ROOT)/ace/Singleton.i \
  $(TAO_ROOT)/tao/debug.h \
  $(TAO_ROOT)/tao/Client_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Server_Strategy_Factory.h \
  $(TAO_ROOT)/tao/Invocation.h \
  $(TAO_ROOT)/tao/Synch_Reply_Dispatcher.h \
  $(TAO_ROOT)/tao/Reply_Dispatcher.h \
- $(TAO_ROOT)/tao/Reply_Dispatcher.i \
  $(TAO_ROOT)/tao/TAOC.h \
  $(TAO_ROOT)/tao/Priority_Mapping_Manager.h \
  $(TAO_ROOT)/tao/Priority_Mapping.h \
- $(TAO_ROOT)/tao/Priority_Mapping.i \
- $(TAO_ROOT)/tao/Priority_Mapping_Manager.i \
- $(TAO_ROOT)/tao/TAOC.i \
  $(TAO_ROOT)/tao/operation_details.h \
  $(TAO_ROOT)/tao/target_specification.h \
- $(TAO_ROOT)/tao/target_specification.i \
- $(TAO_ROOT)/tao/operation_details.i \
  $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.h \
- $(TAO_ROOT)/tao/Invocation_Endpoint_Selectors.i \
- $(TAO_ROOT)/tao/Invocation.i \
  $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
  $(TAO_ROOT)/tao/DomainC.h \
  $(TAO_ROOT)/tao/ClientRequestInfo.h \
  $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/ClientRequestInfo.inl \
- $(TAO_ROOT)/tao/DomainC.i \
  $(TAO_ROOT)/tao/WrongTransactionC.h \
  $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
  $(TAO_ROOT)/tao/PortableInterceptor.h \
- $(TAO_ROOT)/tao/PortableInterceptor.i \
  $(TAO_ROOT)/tao/BiDirPolicyC.h \
- $(TAO_ROOT)/tao/BiDirPolicyC.i \
- testC.i \
  $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
  $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
  $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.h \
  $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/RTPortableServerC.i \
  $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
  $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
  $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
  $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.h \
- $(TAO_ROOT)/tao/PortableServer/ServerRequestInfo.inl \
- testS_T.h testS_T.i testS_T.cpp testS.i \
+ testS_T.h testS_T.cpp testS_T.i \
  $(TAO_ROOT)/tao/PortableServer/Object_Adapter.h \
  $(TAO_ROOT)/tao/PortableServer/Key_Adapters.h \
  $(ACE_ROOT)/ace/Map.h \
  $(ACE_ROOT)/ace/Map_T.h \
  $(ACE_ROOT)/ace/Pair.h \
  $(ACE_ROOT)/ace/Pair_T.h \
- $(ACE_ROOT)/ace/Pair_T.i \
  $(ACE_ROOT)/ace/Pair_T.cpp \
+ $(ACE_ROOT)/ace/Pair_T.i \
  $(ACE_ROOT)/ace/Active_Map_Manager.h \
- $(ACE_ROOT)/ace/Active_Map_Manager.i \
  $(ACE_ROOT)/ace/Active_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
  $(ACE_ROOT)/ace/Active_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Map_T.i \
+ $(ACE_ROOT)/ace/Active_Map_Manager_T.i \
  $(ACE_ROOT)/ace/Map_T.cpp \
- $(TAO_ROOT)/tao/PortableServer/Key_Adapters.i \
+ $(ACE_ROOT)/ace/Map_T.i \
  $(TAO_ROOT)/tao/PortableServer/poa_macros.h \
  $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.h \
- $(TAO_ROOT)/tao/PortableServer/Active_Object_Map.i \
- $(TAO_ROOT)/tao/PortableServer/Object_Adapter.i \
  $(TAO_ROOT)/tao/PortableServer/Operation_Table.h \
- $(TAO_ROOT)/tao/RequestInfo_Util.h
-
-.obj/interceptors.o .obj/interceptors.so .shobj/interceptors.o .shobj/interceptors.so: interceptors.cpp interceptors.h \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(ACE_ROOT)/ace/pre.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/OctetSeqC.i
-
-.obj/Client_ORBInitializer.o .obj/Client_ORBInitializer.so .shobj/Client_ORBInitializer.o .shobj/Client_ORBInitializer.so: Client_ORBInitializer.cpp \
- Client_ORBInitializer.h \
- $(ACE_ROOT)/ace/pre.h \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- interceptors.h \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/ORB.i
+ $(TAO_ROOT)/tao/RequestInfo_Util.h \
+ testS.i
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
index 5c8da84901a..5105f05e34f 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
@@ -4,7 +4,6 @@
 #include "tao/RT_CORBA.h"
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
-#include "Client_ORBInitializer.h"
 
 #include "tao/Strategies/advanced_resource.h"
 
@@ -49,7 +48,7 @@ main (int argc, char *argv[])
       int min_priority =
         ACE_Sched_Params::priority_min (ACE_SCHED_OTHER);
 
-      if ((max_priority + min_priority) / 2 + 2 > max_priority)
+	  if ((max_priority + min_priority) / 2 + 2 > max_priority)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "Not enough priority levels on this platform"
@@ -57,20 +56,6 @@ main (int argc, char *argv[])
           return 0;
         }
 
-      // Register the interceptors to check for the RTCORBA
-      // service contexts in the reply messages.
-      PortableInterceptor::ORBInitializer_ptr temp_initializer;
-
-      ACE_NEW_RETURN (temp_initializer,
-                      Client_ORBInitializer,
-                      -1);  // No exceptions yet!
-      PortableInterceptor::ORBInitializer_var initializer =
-        temp_initializer;
-
-      PortableInterceptor::register_orb_initializer (initializer.in (),
-                                                     ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-
       // Initialize and obtain reference to the Test object.
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
@@ -141,10 +126,10 @@ main (int argc, char *argv[])
       RTCORBA::PriorityMapping *pm =
         mapping_manager->mapping ();
 
-      CORBA::Short native_priority =
+	  CORBA::Short native_priority =
         (max_priority + min_priority) / 2;
 
-      CORBA::Short desired_priority = 0;
+	  CORBA::Short desired_priority = 0;
 
       if (pm->to_CORBA (native_priority, desired_priority) == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -184,7 +169,7 @@ main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+                           "Catched exception:");
       return 1;
     }
   ACE_ENDTRY;
@@ -205,6 +190,3 @@ main (int argc, char *argv[])
 }
 
 #endif /* TAO_HAS_RT_CORBA == 1 */
-
-
-
diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.dsp b/TAO/tests/RTCORBA/Client_Propagated/client.dsp
index 8d9ed1ca0a1..586ed512b7c 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/client.dsp
+++ b/TAO/tests/RTCORBA/Client_Propagated/client.dsp
@@ -93,14 +93,6 @@ SOURCE=.\client.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=.\Client_ORBInitializer.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=.\interceptors.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=.\testC.cpp

 # End Source File

 # End Group

@@ -109,14 +101,6 @@ SOURCE=.\testC.cpp
 # PROP Default_Filter "h;hpp;hxx;hm;inl"

 # Begin Source File

 

-SOURCE=.\Client_ORBInitializer.h

-# End Source File

-# Begin Source File

-

-SOURCE=.\interceptors.h

-# End Source File

-# Begin Source File

-

 SOURCE=.\testC.h

 # End Source File

 # End Group

diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
deleted file mode 100644
index 9ac2b144c31..00000000000
--- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp
+++ /dev/null
@@ -1,146 +0,0 @@
-// $Id$
-
-#include "interceptors.h"
-#include "tao/OctetSeqC.h"
-
-ACE_RCSID (Client_Propagated,
-           interceptors,
-           "$Id$")
-
-Client_Request_Interceptor::
-Client_Request_Interceptor (const char *id)
-  : myname_ ("Client_Request_Interceptor"),
-    orb_id_ (CORBA::string_dup (id))
-{
-}
-
-Client_Request_Interceptor::~Client_Request_Interceptor (void)
-{
-}
-
-void
-Client_Request_Interceptor::_add_ref (void)
-{
-  this->_incr_refcnt ();
-  // This is a TAO specific implementation.
-}
-
-void
-Client_Request_Interceptor::_remove_ref (void)
-{
-  this->_decr_refcnt ();
-  // This is a TAO specific implementation.
-}
-
-char *
-Client_Request_Interceptor::name (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return CORBA::string_dup (this->myname_);
-}
-
-void
-Client_Request_Interceptor::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-Client_Request_Interceptor::send_poll (
-    PortableInterceptor::ClientRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Do Nothing
-}
-
-void
-Client_Request_Interceptor::send_request (
-    PortableInterceptor::ClientRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-  // Do Nothing
-}
-
-void
-Client_Request_Interceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_ENV_ARG_DEFN;
-
-  ACE_TRY
-    {
-      // Try to get the RTCorbaPriority context.  If its not there,
-      // report the fact via an exception.
-      IOP::ServiceContext_var sc =
-        ri->get_reply_service_context (IOP::RTCorbaPriority, ACE_TRY_ENV);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
-
-      ACE_DEBUG ((LM_DEBUG, "EXCEPTION was most likely caused by the lack "
-                            "of an IOP::RTCorbaPriority context in the reply.\n"));
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-
-}
-
-void
-Client_Request_Interceptor::receive_other (
-    PortableInterceptor::ClientRequestInfo_ptr
-    TAO_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-}
-
-void
-Client_Request_Interceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    TAO_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-  TAO_ENV_ARG_DEFN;
-
-  if (CORBA::is_nil (this->orb_.in ()))
-    {
-      int argc = 0;
-      this->orb_ = CORBA::ORB_init (argc, 0,
-                                    this->orb_id_.in (),
-                                    ACE_TRY_ENV);
-      ACE_CHECK;
-    }
-
-  CORBA::String_var operation = ri->operation (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::Object_var target = ri->target (ACE_TRY_ENV);
-  ACE_CHECK;
-
-  CORBA::String_var ior =
-    this->orb_->object_to_string (target.in (), ACE_TRY_ENV);
-  ACE_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "%s.received_exception "
-              "from \"%s\" on object: %s\n",
-              this->myname_,
-              operation.in (),
-              ior.in ()));
-  ACE_CHECK;
-
-  // Try to get the RTCorbaPriority context.  If its not there,
-  // report the fact via an exception.
-  IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (IOP::RTCorbaPriority, ACE_TRY_ENV);
-  ACE_CHECK;
-}
diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
deleted file mode 100644
index 9bd520664ae..00000000000
--- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#ifndef INTERCEPTORS_H
-#define INTERCEPTORS_H
-
-#include "tao/PortableInterceptorC.h"
-#include "tao/LocalObject.h"
-#include "tao/ORB.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class Client_Request_Interceptor
-  : public PortableInterceptor::ClientRequestInterceptor,
-    public CORBA::LocalObject
-{
-  /// Client-side interceptor.  Verifies presense of RTCORBA priority
-  /// context in the reply messages.
-public:
-  Client_Request_Interceptor (const char *orb_id);
-  // ctor.
-
-  virtual ~Client_Request_Interceptor ();
-  // dtor.
-
-  virtual void _add_ref (void);
-  // Increment the reference count.
-
-  virtual void _remove_ref (void);
-  // Decrement the reference count.
-
-  virtual char * name (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Canonical name of the interceptor.
-
-  virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr
-                          TAO_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             TAO_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr
-                              TAO_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  virtual void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri
-                                  TAO_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                    PortableInterceptor::ForwardRequest));
-
-private:
-  const char *myname_;
-
-  CORBA::String_var orb_id_;
-  // The ID of the ORB where this interceptor was created, usually
-  // obtained from the ORBInitInfo
-
-  CORBA::ORB_var orb_;
-};
-
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#endif /* TAO_INTERCEPTORS_H */
diff --git a/ace/CDR_Base.inl b/ace/CDR_Base.inl
index bf0f8b8d878..79d10e7294a 100644
--- a/ace/CDR_Base.inl
+++ b/ace/CDR_Base.inl
@@ -156,6 +156,15 @@ ACE_CDR::mb_align (ACE_Message_Block *mb)
                                       ACE_CDR::MAX_ALIGNMENT);
   mb->rd_ptr (start);
   mb->wr_ptr (start);
+
+#if defined (ACE_HAS_PURIFY)
+  // This is a good place to zero the buffer; this is not needed
+  // by IIOP, but makes Purify happy.
+  if (mb->base () != 0)
+    {
+      (void) ACE_OS::memset (mb->base (), 0, mb->size ());
+    }
+#endif /* ACE_HAS_PURIFY */
 }
 
 ACE_INLINE size_t
diff --git a/ace/Makefile.bor b/ace/Makefile.bor
index 8be64966125..23de7130f4e 100644
--- a/ace/Makefile.bor
+++ b/ace/Makefile.bor
@@ -5,14 +5,9 @@
 
 NAME = ace
 
-!ifdef SSL_ROOT
 DIRS =  QoS \
         SSL \
 	RMCast
-!else
-DIRS =  QoS \
-	RMCast
-!endif
 
 OBJFILES = \
 	$(OBJDIR)\ACE.obj \
diff --git a/ace/config-aix-4.x.h b/ace/config-aix-4.x.h
index 484295ec718..34dd276f57b 100644
--- a/ace/config-aix-4.x.h
+++ b/ace/config-aix-4.x.h
@@ -2,8 +2,8 @@
 // $Id$
 
 // The following configuration file is designed to work for OS
-// platforms running AIX 4.x using the IBM C++ compiler (xlC),
-// Visual Age C++ or g++/egcs.
+// platforms running AIX 4.x using the IBM C++ compiler (xlC) or
+// g++/egcs.
 
 #ifndef ACE_CONFIG_H
 #define ACE_CONFIG_H
@@ -26,7 +26,7 @@
 #  define ACE_LACKS_LINEBUFFERED_STREAMBUF
 #  define ACE_LACKS_PRAGMA_ONCE
 
-   // C Set++ 3.1, IBM C/C++ 3.6, and Visual Age C++ 5 batch (__xlC__)
+   // C Set++ 3.1 and IBM C/C++ 3.6
 #  if defined (__xlC__)
 #    if (__xlC__ < 0x0500)
 #      define ACE_LACKS_PLACEMENT_OPERATOR_DELETE
@@ -74,13 +74,6 @@
 #  define AIX
 #endif /* AIX */
 
-// AIX shared libs look strangely like archive libs until you look inside
-// them.
-#if defined (ACE_DLL_SUFFIX)
-#  undef ACE_DLL_SUFFIX
-#endif
-#define ACE_DLL_SUFFIX ".a"
-
 // Use BSD 4.4 socket definitions for pre-AIX 4.2.  The _BSD setting also
 // controls the data type used for waitpid(), wait(), and wait3().
 #if (ACE_AIX_MINOR_VERS < 2)
diff --git a/bin/auto_compile b/bin/auto_compile
index eea6cec93cb..e17b67e253d 100755
--- a/bin/auto_compile
+++ b/bin/auto_compile
@@ -423,11 +423,8 @@ foreach $i (@BUILD_LIST) {
 
     local $current_dir = $i;
     local $last_error = "";
-    local $this_error = 0;
-    local $this_warning = 0;
     while (<MAKE>) {
         chop;
-        $this_error = $this_warning = 0;
         if ($^O eq 'hpux'
             && m/^Warning:[ \t]+[0-9]+ future errors were detected/) {
             next;
@@ -441,13 +438,6 @@ foreach $i (@BUILD_LIST) {
         }
         if (m/error:/i || m/error /i
             || m/^make(\[[0-9]+\])?: \*\*\*/) {
-            $this_error = 1;
-        }
-        if ($^O eq 'aix'
-            && m/\d+-\d+ \([SI]\)/) {
-            $this_error = 1;
-        }
-        if ($this_error) {
             if ($last_error ne $current_dir
                 || STATUS eq "COMPILATION WARNING") {
               $STATUS = "COMPILATION ERROR";
@@ -458,17 +448,6 @@ foreach $i (@BUILD_LIST) {
         if (m/warning:/i
 	    || m/warning /i
 	    || m/Info: /i) {
-            $this_warning = 1;
-            if ($^O eq 'aix'
-                && m/^ld: \d+-\d+ WARNING: Duplicate symbol: .*ACE.*/) {
-                $this_warning = 0;
-            }
-        }
-        if ($^O eq 'aix'
-            && m/\d+-\d+ \(W\)/) {
-            $this_warning = 1;
-        }
-        if ($this_warning) {
           if ($last_error ne $current_dir) {
             if ($STATUS eq "OK") {
               $STATUS = "COMPILATION WARNING";
diff --git a/bin/generate_doxygen.pl b/bin/generate_doxygen.pl
index 465f5e17b54..4d85cf42b95 100755
--- a/bin/generate_doxygen.pl
+++ b/bin/generate_doxygen.pl
@@ -31,8 +31,7 @@ $dot_path = '/usr/local/bin';
              'tao_rtevent',
              'tao_implrepo',
              'tao_strategies',
-	     'tao_smartproxies',
-	     'tao_av');
+	     'tao_smartproxies');
 
 # Modify defaults using the command line arguments
 &parse_args ();
diff --git a/bin/make_pretty.pl b/bin/make_pretty.pl
index 8335fb505de..fdc6b87763f 100755
--- a/bin/make_pretty.pl
+++ b/bin/make_pretty.pl
@@ -113,19 +113,11 @@ sub is_warning ()
     # Look for any warnings we should ignore
     return 3 if (/^LINK : warning LNK4089:/);
 
-    # For some reason, there's a false license warning
-    return 3 if (/\(W\).*Compilation will proceed shortly./);
-
-    # AIX reports a bazillion multiple defines when doing templates.
-    return 3 if ($^O eq 'aix'
-                 && m/^ld: \d+-\d+ WARNING: Duplicate symbol:/);
-
     # Look for lines that also should be color coded, but not counted
     # as warnings.
     return 2 if (/see declaration of/);
 
     # Look for warnings
-
     return 1 if ((/warning/i && !/ warning\(s\)/)
                  || /info: /i
                  || /^make.*\*\*\*/);
@@ -135,12 +127,9 @@ sub is_warning ()
         || /^.*\.inl: /
         || /^.*\.cpp: /
         || /^.*\.java: /) {
-      return 1 if ($^O ne 'aix');
+      return 1;
     }
 
-    # IBM's compilers don't say the word "warning" - check for their code
-    return 1 if ($^O eq 'aix' && m/\d+-\d+ \(W\)/);
-
     # didn't find anything
     return 0;
 }
@@ -154,11 +143,6 @@ sub is_error ()
 {
     # Look for any errors we should ignore
 
-    # AIX reports a bazillion multiple defines when doing templates; some
-    # have the word 'error' in the symbol name - ignore those.
-    return 0 if ($^O eq 'aix'
-                 && m/^ld: \d+-\d+ WARNING: Duplicate symbol:/);
-
     # Look for lines that also should be color coded, but not counted
     # as errors.
     return 2 if (/Types pointed to are unrelated/
@@ -180,9 +164,6 @@ sub is_error ()
                  || /^Fatal\:/
                  || /: fatal:/);
 
-    # Again, IBM's compilers speak in code langauge
-    return 1 if ($^O eq 'aix' && m/\d+-\d+ \([SI]\)/);
-
     # didn't find anything
     return 0;
 }
diff --git a/docs/ACE-development-process.html b/docs/ACE-development-process.html
index f9bdb64b6e0..197873e581b 100644
--- a/docs/ACE-development-process.html
+++ b/docs/ACE-development-process.html
@@ -41,7 +41,8 @@ The ACE+TAO development process looks like:<p>
 <ol>
   <li>Every change to ACE+TAO must have a bug report.  <em>Change</em>
     includes fixes, enhancements, updates, and so on.
-  <li><a href="http://ace.cs.wustl.edu/bugs/index.cgi">Create a bug report</a>.
+  <!-- The link to bugzilla is intentionally local. -->
+  <li><a href="http://ace/bugzilla">Create a bug report</a>.
   <li>Accept the bug report if you are going to implement the change.
   <li>Implement the change in your workspace(s).
   <li>Test the change sufficiently to demonstrate that it both does
diff --git a/etc/tao_av.doxygen b/etc/tao_av.doxygen
deleted file mode 100644
index 39ac4929019..00000000000
--- a/etc/tao_av.doxygen
+++ /dev/null
@@ -1,197 +0,0 @@
-# Doxyfile 1.1.5
-#
-# $Id$
-#
-
-PROJECT_NAME          = TAO_AV
-PROJECT_NUMBER        = Snapshot
-OUTPUT_DIRECTORY      = .
-OUTPUT_LANGUAGE       = English
-DISABLE_INDEX         = NO
-EXTRACT_ALL           = YES
-EXTRACT_PRIVATE       = YES
-EXTRACT_STATIC        = YES
-HIDE_UNDOC_MEMBERS    = NO
-HIDE_UNDOC_CLASSES    = NO
-BRIEF_MEMBER_DESC     = YES
-REPEAT_BRIEF          = YES
-ALWAYS_DETAILED_SEC   = NO
-FULL_PATH_NAMES       = NO
-STRIP_FROM_PATH       = 
-INTERNAL_DOCS         = NO
-CLASS_DIAGRAMS        = YES
-SOURCE_BROWSER        = YES
-INLINE_SOURCES        = YES
-STRIP_CODE_COMMENTS   = NO
-CASE_SENSE_NAMES      = YES
-HIDE_SCOPE_NAMES      = NO
-VERBATIM_HEADERS      = YES
-SHOW_INCLUDE_FILES    = YES
-JAVADOC_AUTOBRIEF     = NO
-INHERIT_DOCS          = YES
-INLINE_INFO           = YES
-SORT_MEMBER_DOCS      = YES
-TAB_SIZE              = 8
-ENABLED_SECTIONS      = 
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-QUIET                 = YES
-WARNINGS              = NO
-WARN_IF_UNDOCUMENTED  = NO
-WARN_FORMAT           = "$file:$line: $text"
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-INPUT                 = TAO/orbsvcs/orbsvcs/AVStreams.idl \
-			TAO/orbsvcs/orbsvcs/Null_MediaCtrl.idl \
-			TAO/orbsvcs/orbsvcs/sfp.idl \
-			TAO/orbsvcs/orbsvcs/AV
-FILE_PATTERNS         = *.cpp *.h *.i *.inl *.pidl *.idl
-RECURSIVE             =
-EXCLUDE               = 
-EXCLUDE_PATTERNS      =
-EXAMPLE_PATH          = 
-EXAMPLE_PATTERNS      = 
-IMAGE_PATH            = 
-INPUT_FILTER          = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-ALPHABETICAL_INDEX    = YES
-COLS_IN_ALPHA_INDEX   = 1
-IGNORE_PREFIX         = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-GENERATE_HTML         = YES
-HTML_OUTPUT           = html/tao/av
-HTML_HEADER           = 
-HTML_FOOTER           =
-HTML_STYLESHEET       = 
-HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-GENERATE_LATEX        = NO
-LATEX_OUTPUT          = latex
-COMPACT_LATEX         = NO
-PAPER_TYPE            = a4wide
-EXTRA_PACKAGES        = 
-LATEX_HEADER          = 
-PDF_HYPERLINKS        = NO
-LATEX_BATCHMODE       = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-GENERATE_RTF          = NO
-RTF_OUTPUT            = rtf
-COMPACT_RTF           = NO
-RTF_HYPERLINKS        = NO
-RTF_STYLESHEET_FILE   = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-GENERATE_MAN          = NO
-MAN_OUTPUT            = man
-MAN_EXTENSION         = .3
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-
-ENABLE_PREPROCESSING  = YES
-MACRO_EXPANSION       = YES
-EXPAND_ONLY_PREDEF    = YES
-SEARCH_INCLUDES       = YES
-INCLUDE_PATH          = TAO .
-PREDEFINED            = 
-EXPAND_AS_DEFINED     = ACE_RCSID \
-			ACE_UNIMPLEMENTED_FUNC \
-			ACE_THROW_SPEC
-
-#---------------------------------------------------------------------------
-# Configuration::addtions related to external references   
-#---------------------------------------------------------------------------
-
-TAGFILES              = html/ace/ACE.tag=../../ace \
-			html/tao/TAO.tag=.. \
-			html/tao/portableserver/TAO_PortableServer.tag=../portableserver
-GENERATE_TAGFILE      = html/tao/av/TAO_AV.tag
-ALLEXTERNALS          = NO
-PERL_PATH             = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
-# available from the path. This tool is part of Graphviz
-
-HAVE_DOT              = YES
-CLASS_GRAPH           = YES
-COLLABORATION_GRAPH   = YES
-INCLUDE_GRAPH         = YES
-INCLUDED_BY_GRAPH     = YES
-GRAPHICAL_HIERARCHY   = YES
-# The tag DOT_PATH can be used to specify the path where the dot tool can be 
-# found. If left blank, it is assumed the dot tool can be found on the path. 
-DOT_PATH              = /usr/local/bin
-MAX_DOT_GRAPH_WIDTH   = 1024
-MAX_DOT_GRAPH_HEIGHT  = 1024
-
-#---------------------------------------------------------------------------
-# Configuration::addtions related to the search engine   
-#---------------------------------------------------------------------------
-
-SEARCHENGINE          = NO
-
-# The CGI_NAME tag should be the name of the CGI script that 
-# starts the search engine (doxysearch) with the correct parameters. 
-# A script with this name will be generated by doxygen. 
-
-CGI_NAME              = search.cgi
-
-# The CGI_URL tag should be the absolute URL to the directory where the 
-# cgi binaries are located. See the documentation of your http daemon for 
-# details. 
-
-CGI_URL               = http://doc.ece.uci.edu/cgi-bin/Doxygen/Current
-
-# The DOC_URL tag should be the absolute URL to the directory where the 
-# documentation is located. If left blank the absolute path to the 
-# documentation, with file:// prepended to it, will be used. 
-
-DOC_URL               = http://doc.ece.uci.edu/Doxygen/Current/
-
-# The DOC_ABSPATH tag should be the absolute path to the directory where the 
-# documentation is located. If left blank the directory on the local machine 
-# will be used. 
-
-DOC_ABSPATH           = /project/doctmp/Doxygen/Current
-
-# The BIN_ABSPATH tag must point to the directory where the doxysearch binary 
-# is installed. 
-
-BIN_ABSPATH           = /usr/bin
-
-# The EXT_DOC_PATHS tag can be used to specify one or more paths to 
-# documentation generated for other projects. This allows doxysearch to search 
-# the documentation for these projects as well. 
-
-EXT_DOC_PATHS         = html/ace
diff --git a/include/makeinclude/platform_aix_ibm.GNU b/include/makeinclude/platform_aix_ibm.GNU
deleted file mode 100644
index d4d3e0cfd4c..00000000000
--- a/include/makeinclude/platform_aix_ibm.GNU
+++ /dev/null
@@ -1,132 +0,0 @@
-# $Id$
-
-# This file is for use with AIX 4.3 and up, using either of the IBM
-# compilers (IBM C/C++ 3.6.6 or Visual Age C++ 5 batch compiler).
-# If you wish to use the CSet++ compiler, please use platform_aix4_cset++.GNU.
-# Note that as of ACE 6.0, the only supported compiler from IBM will
-# be Visual Age C++ 5 and up (either batch or incremental).
-
-ifeq (,$(debug))
-  debug = 1
-endif
-ifeq (,$(distrib))
-  distrib = 0
-endif
-ifeq (,$(exceptions))
-  exceptions = 1
-endif
-ifeq (,$(optimize))
-  optimize = 0
-endif
-ifeq (,$(rtti))
-  rtti = 0
-endif
-ifeq (,$(threads))
-  threads = 1
-endif
-
-# First, find out which compiler we're building with. The settings we
-# use for compiling, as well as how to build shared libraries, depend on
-# the compiler version. There's no easy way to ask lslpp which is installed.
-# Instead, compile a file and see which compiler is set up for use. This
-# trick was submitted by Craig Rodrigues <rodrigc@mediaone.net>, originally
-# from the vacpp compiler newsgroup.
-# It relies on the preprocessor defining __xlC__ to the proper version
-# number of the compiler.
-XLCVERSION := $(shell echo "__xlC__" > ./testAIXCompilerVersion.cpp)
-XLCVERSION := $(shell xlC -E ./testAIXCompilerVersion.cpp | tail -1')
-ACE_AIX_CLEAN := $(shell $(RM) ./testAIXCompilerVersion.cpp)
-
-# In case anything here or in the config depends on OS version number,
-# grab it here and pass it all to the compiler as well.
-AIX_MAJOR_VERS := $(shell uname -v)
-AIX_MINOR_VERS := $(shell uname -r)
-
-# Use of exceptions should be a compiler-specific setting, but for now it's
-# not. IBM C/C++ doesn't have a way to turn exceptions off, and Visual
-# Age C++ V5 building ACE without exception handling causes segv on startup
-# of every test. Until this is straightened out, force exceptions=1 for
-# both compilers.
-exceptions=1
-
-# Yes, believe it or not...
-# The way to make a shared lib on AIX is to make a shared object file and
-# then put that in an archive.
-# Non-shared archives are named lib<x>ns.a - ns = non-shared.
-SOEXT       = a
-# aix_build turns on the funky shared library building code in
-# rules.lib.GNU
-aix_build = 1
-
-ifeq ($(threads),1)
-# Note - the _r form of the compiler command turns on -qthreads and the
-# thread-required preprocessor defines, as well as -lpthreads for linking.
-# If this is Visual Age C++ 5, DLD will get reset below.
-CC	    = xlc_r
-CXX	    = xlC_r
-DLD	    = makeC++SharedLib_r
-else
-CC          = xlc
-CXX         = xlC
-DLD	    = makeC++SharedLib
-endif
-
-ARFLAGS	    = ruv
-AR	    = ar
-LD          = $(CXX)
-RANLIB	    = ranlib
-TEMPINCDIR  = tempinc
-
-CPPFLAGS    += -DACE_AIX_MAJOR_VERS=$(AIX_MAJOR_VERS) -DACE_AIX_MINOR_VERS=$(AIX_MINOR_VERS)
-# -qinitauto seems like an interesting option, but some tests (specifically
-# Process_Strategy_Test) hang with it turned on. This should be investigated
-# at some point.
-DCFLAGS     += -g -qcheck=nobounds:div:null
-
-# Now sort out the compiler differences here...
-ifeq ($(XLCVERSION),0x0306)
- CCFLAGS    += -qlanglvl=ansi -qflag=e:e
- SOFLAGS     = -p 0
-# ibmcxx_build turns on the extra step for instantiating and compiling
-# template instances in rules.lib.GNU.
- ibmcxx_build = 1
- rtti = 0
-else
- ifeq ($(XLCVERSION),0x0500)
-  CCFLAGS    += -qflag=w:w
-  DLD         = $(CXX) -qmkshrobj
-  SOFLAGS     = $(CCFLAGS) $(CPPFLAGS) $(INCLDIRS)
- else
-  CXX = echo "Unrecognized compiler version $(XLCVERSION)\n"
- endif
-endif
-
-# -qextchk is handy, but produces false type mismatches when linking
-# netsvcs, so it's disabled.  IBM reports this fixed in 3.6.4, but it's
-# still producing the warnings... should be looked at.
-CCFLAGS     += $(CFLAGS) -qonce -qtempinc
-ifeq ($(exceptions),0)
-CCFLAGS     += -qnoeh
-endif
-
-ifeq (1,$(rtti))
-  CCFLAGS += -qrtti=dynamiccast
-else  # ! rtti
-  CCFLAGS += -DACE_LACKS_RTTI
-endif # ! rtti
-
-ifeq ($(shared_libs),1)
-ACELIB      = -lACE
-else
-ACELIB      = -lACEns
-endif
-
-LIBS	    += -ltli_r -ldl
-
-# Default OCCFLAGS builds common code for all RS/6000 architectures but
-# this can be set to optimize for your particular computer. The commented
-# out example optimizes for RS/6000 43P.
-# OCCFLAGS is not used by default.  To used it, set optimize=1
-# either in this file or on the command line.
-#OCCFLAGS    += -qarch=ppc -qtune=604
-OCCFLAGS    += -qlibansi -O2 -qarch=com 
diff --git a/include/makeinclude/platform_aix_vacpp.GNU b/include/makeinclude/platform_aix_vacpp.GNU
new file mode 100644
index 00000000000..626940dcc49
--- /dev/null
+++ b/include/makeinclude/platform_aix_vacpp.GNU
@@ -0,0 +1,94 @@
+# $Id$
+
+# AIX 4.3 and higher using the Visual Age C++ 5 batch compiler (xlC_r)
+# *not* using Orbix
+
+ifeq (,$(debug))
+  debug = 1
+endif
+ifeq (,$(distrib))
+  distrib = 0
+endif
+ifeq (,$(exceptions))
+  exceptions = 1
+endif
+ifeq (,$(optimize))
+  optimize = 0
+endif
+ifeq (,$(threads))
+  threads = 1
+endif
+
+# Note - Visual Age C++ pre-V5 didn't have a way to turn exception handling
+# off, and V5 building ACE without exception handling causes segv on startup
+# of every test. Until this is straightened out, force exceptions=1
+exceptions=1
+
+# In case anything here or in the config depends on OS version number,
+# grab it here and pass it all to the compiler as well.
+AIX_MAJOR_VERS := $(shell uname -v)
+AIX_MINOR_VERS := $(shell uname -r)
+
+ifeq ($(threads),1)
+# Note - the _r form of the compiler command turns on -qthreads and the
+# thread-required preprocessor defines, as well as -lpthreads for linking.
+CC	    = xlc_r
+CXX	    = xlC_r
+else
+CC          = xlc
+CXX         = xlC
+endif
+DLD	    = $(CXX) -qmkshrobj
+
+# -qextchk is handy, but produces false type mismatches when linking
+# netsvcs with 3.1.4, so it's disabled.  IBM reports this fixed in 3.6.4.
+CCFLAGS     += $(CFLAGS) -qonce -qtempinc
+ifeq ($(exceptions),0)
+CCFLAGS     += -qnoeh
+endif
+
+CPPFLAGS    += -DACE_AIX_MAJOR_VERS=$(AIX_MAJOR_VERS) -DACE_AIX_MINOR_VERS=$(AIX_MINOR_VERS)
+ifeq (1,$(rtti))
+  CCFLAGS += -qrtti=dynamiccast
+else  # ! rtti
+  CCFLAGS += -DACE_LACKS_RTTI
+endif # ! rtti
+
+# Define options used for debug=1 builds.
+# -qextchk still produces type mismatch errors... should look into this.
+# -qcheck messes up ACE_Allocator::instance?   - no, seems ok
+# How about -qinitauto?
+DCFLAGS     += -g
+
+LD          = $(CXX)
+
+# Yes, believe it or not...
+# The way to make a shared lib on AIX is to make a shared object file and
+# then put that in an archive.
+# Non-shared archives are named lib<x>ns.a - ns = non-shared.
+SOEXT       = a
+
+SOFLAGS = $(CCFLAGS) $(CPPFLAGS) $(INCLDIRS)
+
+aix_build = 1
+ifeq ($(shared_libs),1)
+ACELIB      = -lACE
+else
+ACELIB      = -lACEns
+endif
+
+LIBS	    += -ltli_r -ldl
+
+ARFLAGS	    = ruv
+AR	    = ar
+LDFLAGS	    += -bloadmap:vacpp.map
+# Default OCCFLAGS builds common code for all RS/6000 architectures but
+# this can be set to optimize for your particular computer. The commented
+# out example optimizes for RS/6000 43P.
+# OCCFLAGS is not used by default.  To used it, set optimize=1
+# either in this file or on the command line.
+#OCCFLAGS    += -qarch=ppc -qtune=604
+OCCFLAGS    += -qlibansi -O2 -qarch=com 
+RANLIB	    = ranlib
+#TEMPINCDIR  = tempinc
+SOBUILD = 
diff --git a/netsvcs/lib/TS_Clerk_Handler.h b/netsvcs/lib/TS_Clerk_Handler.h
index 8f1230e1e2e..4d2ba888736 100644
--- a/netsvcs/lib/TS_Clerk_Handler.h
+++ b/netsvcs/lib/TS_Clerk_Handler.h
@@ -17,12 +17,13 @@
 #ifndef ACE_TS_CLERK_HANDLER_H
 #define ACE_TS_CLERK_HANDLER_H
 
+#include "ace/Connector.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/SOCK_Connector.h"
-#include "ace/Connector.h"
 #include "ace/Malloc.h"
 #include "ace/Time_Request_Reply.h"
 
diff --git a/protocols/ace/RMCast/README b/protocols/ace/RMCast/README
deleted file mode 100644
index 2dd0c5d9cfc..00000000000
--- a/protocols/ace/RMCast/README
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id$
-
-	This directory will contain a simple, small-scale reliable
-multicast framework for ACE.  The framework is based on the ASX
-components of the ACE library: the protocol is implemented as a stack
-of interchangeable "modules", each one in charge of a very small task.
-For example, one module implements fragmentation and reassembly, other
-modules implement retransmission, send ACK and NAK messages, and
-maintain receiver membership.
-
-	The modules are replaced to achieve different levels of
-reliability.  For example, the retransmission module can be either the
-"Best_Effort", "Semi_Reliable" or "Reliable" implementation.  In the
-first case no retransmissions are performed, but lost messages are
-detected and reported to the receiver.  The "Semi_Reliable" case
-messages are held for a pre-specified amount of time, and
-re-transmited if requested, but it is possible to loose some messages
-if multiple re-transmissions fail.  As in the "Best_Effort" case the
-lost messages are detected and flagged to the application.  Finally
-in the "Reliable" mode the senders are flowed controlled until enough
-messages are successfully transmitted.
-
-	In general the stack looks like this:
-
-
-SENDER:
-
-----------------------------------------------------------------
-Buffering	:	Save lost messages
-Retransmission	:	Retransmit 
-----------------------------------------------------------------
-Fragmentation   :	Fragment messages in smaller chunks
-Reassembly	:	and ensure that the IOVMAX limit is not
-		:	reached
-----------------------------------------------------------------
-Tranport	:	Encapsulate the specific transport media
-		:	such as TCP/IP, ATM, or shared memory
-		:	Demuxes incoming data to the right chain
-		:	Change control messages and data messages
-		:	to the right dynamic types.
-----------------------------------------------------------------
-
-RECEIVER:
-
-----------------------------------------------------------------
-Lost detection	:	Detect lost messages and send control
-		:	messages back
-----------------------------------------------------------------
-Reassembly	:	Reassemble messages, fragment control
-Fragmentation	:	data
-----------------------------------------------------------------
-Transport	:	Group membership, ACT reception,
-		:	handle keep-alive messages...
-----------------------------------------------------------------
-
-
-@@ TODO: Piggybacking...
diff --git a/protocols/ace/RMCast/RMCast_Export.h b/protocols/ace/RMCast/RMCast_Export.h
deleted file mode 100644
index 51257c4d682..00000000000
--- a/protocols/ace/RMCast/RMCast_Export.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by
-// generate_export_file.pl
-// ------------------------------
-#if !defined (ACE_RMCAST_EXPORT_H)
-#define ACE_RMCAST_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (ACE_RMCAST_HAS_DLL)
-#  define ACE_RMCAST_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && ACE_RMCAST_HAS_DLL */
-
-#if !defined (ACE_RMCAST_HAS_DLL)
-#define ACE_RMCAST_HAS_DLL 1
-#endif /* ! ACE_RMCAST_HAS_DLL */
-
-#if defined (ACE_RMCAST_HAS_DLL)
-#  if (ACE_RMCAST_HAS_DLL == 1)
-#    if defined (ACE_RMCAST_BUILD_DLL)
-#      define ACE_RMCast_Export ACE_Proper_Export_Flag
-#      define ACE_RMCAST_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#      define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#    else
-#      define ACE_RMCast_Export ACE_Proper_Import_Flag
-#      define ACE_RMCAST_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#      define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#    endif /* ACE_RMCAST_BUILD_DLL */
-#  else
-#    define ACE_RMCast_Export
-#    define ACE_RMCAST_SINGLETON_DECLARATION(T)
-#    define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif   /* ! ACE_RMCAST_HAS_DLL == 1 */
-#else
-#  define ACE_RMCast_Export
-#  define ACE_RMCAST_SINGLETON_DECLARATION(T)
-#  define ACE_RMCAST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif     /* ACE_RMCAST_HAS_DLL */
-
-#endif     /* ACE_RMCAST_EXPORT_H */
-
-// End of auto generated file.