ChangeLogTag:Tue Oct 28 12:02:47 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

1 files changed, 759 insertions, 741 deletions

diff --git a/TAO/tao/PortableServer/ImR_LocatorS.cpp b/TAO/tao/PortableServer/ImR_LocatorS.cpp
index 6ee2d41fb65..58eb3f51c9c 100644
--- a/TAO/tao/PortableServer/ImR_LocatorS.cpp
+++ b/TAO/tao/PortableServer/ImR_LocatorS.cpp
@@ -15,13 +15,19 @@
 //       Irvine, CA
 //       USA
 //       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
 //
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:670
+// TAO_IDL - Generated from 
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:610
 
 #ifndef _TAO_IDL_ORIG_IMR_LOCATORS_CPP_
 #define _TAO_IDL_ORIG_IMR_LOCATORS_CPP_
@@ -32,10 +38,16 @@
 #include "tao/PortableServer/Operation_Table.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/ORB_Core.h"
+#include "tao/Profile.h"
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
+#include "tao/Object_T.h"
+#include "tao/Typecode.h"
+#include "tao/DynamicC.h"
+#include "tao/Basic_Arguments.h"
+#include "tao/Object_Argument_T.h"
+#include "tao/UB_String_Arguments.h"
 #include "tao/PortableInterceptor.h"
-#include "tao/Profile.h"
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
 #include "tao/PICurrent.h"
@@ -44,6 +56,7 @@
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #include "ace/Dynamic_Service.h"
+#include "ace/config-all.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus
@@ -56,7 +69,15 @@
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1731
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:60
+
+// Arg traits specializations.
+namespace TAO
+{
+};
+
+// TAO_IDL - Generated from
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1424
 
 class TAO_ImplementationRepository_Locator_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
@@ -67,7 +88,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_Locator_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: gperf -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_ImplementationRepository_Locator_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_ImplementationRepository_Locator_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -136,44 +157,44 @@ TAO_ImplementationRepository_Locator_Perfect_Hash_OpTable::lookup (const char *s
 
   static const class TAO_operation_db_entry  wordlist[] =
     {
-      {"",0},{"",0},{"",0},{"",0},
-      {"list",  &POA_ImplementationRepository::Locator::list_skel},
-      {"",0},{"",0},{"",0},{"",0},
-      {"find",  &POA_ImplementationRepository::Locator::find_skel},
-      {"",0},{"",0},{"",0},
-      {"remove_server",         &POA_ImplementationRepository::Locator::remove_server_skel},
-      {"",0},
-      {"register_server",       &POA_ImplementationRepository::Locator::register_server_skel},
-      {"",0},
-      {"reregister_server",     &POA_ImplementationRepository::Locator::reregister_server_skel},
-      {"register_activator",    &POA_ImplementationRepository::Locator::register_activator_skel},
-      {"",0},
-      {"shutdown_server",       &POA_ImplementationRepository::Locator::shutdown_server_skel},
-      {"",0},
-      {"server_is_running",     &POA_ImplementationRepository::Locator::server_is_running_skel},
-      {"",0},{"",0},
-      {"remove_server_in_location",     &POA_ImplementationRepository::Locator::remove_server_in_location_skel},
-      {"",0},{"",0},
-      {"server_is_shutting_down",       &POA_ImplementationRepository::Locator::server_is_shutting_down_skel},
-      {"",0},
-      {"activate_server",       &POA_ImplementationRepository::Locator::activate_server_skel},
-      {"",0},
-      {"shutdown_server_in_location",   &POA_ImplementationRepository::Locator::shutdown_server_in_location_skel},
-      {"",0},{"",0},
-      {"_component",  &POA_ImplementationRepository::Locator::_component_skel},
-      {"",0},{"",0},
-      {"_non_existent",  &POA_ImplementationRepository::Locator::_non_existent_skel},
-      {"",0},
-      {"server_is_shutting_down_in_location",   &POA_ImplementationRepository::Locator::server_is_shutting_down_in_location_skel},
-      {"",0},
-      {"activate_server_in_location",   &POA_ImplementationRepository::Locator::activate_server_in_location_skel},
-      {"activate_server_with_startup",  &POA_ImplementationRepository::Locator::activate_server_with_startup_skel},
-      {"",0},
-      {"_is_a",  &POA_ImplementationRepository::Locator::_is_a_skel},
-      {"",0},{"",0},{"",0},{"",0},
-      {"unregister_activator",  &POA_ImplementationRepository::Locator::unregister_activator_skel},
-      {"",0},{"",0},{"",0},{"",0},
-      {"_interface",  &POA_ImplementationRepository::Locator::_interface_skel},
+      {"",0,0,0},{"",0,0,0},{"",0,0,0},{"",0,0,0},
+      {"list", &POA_ImplementationRepository::Locator::list_skel, &POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::list, &POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::list},
+      {"",0,0,0},{"",0,0,0},{"",0,0,0},{"",0,0,0},
+      {"find", &POA_ImplementationRepository::Locator::find_skel, &POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::find, &POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::find},
+      {"",0,0,0},{"",0,0,0},{"",0,0,0},
+      {"remove_server", &POA_ImplementationRepository::Locator::remove_server_skel, &POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::remove_server, &POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::remove_server},
+      {"",0,0,0},
+      {"register_server", &POA_ImplementationRepository::Locator::register_server_skel, &POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::register_server, &POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::register_server},
+      {"",0,0,0},
+      {"reregister_server", &POA_ImplementationRepository::Locator::reregister_server_skel, &POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::reregister_server, &POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::reregister_server},
+      {"register_activator", &POA_ImplementationRepository::Locator::register_activator_skel, &POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::register_activator, &POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::register_activator},
+      {"",0,0,0},
+      {"shutdown_server", &POA_ImplementationRepository::Locator::shutdown_server_skel, &POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::shutdown_server, &POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::shutdown_server},
+      {"",0,0,0},
+      {"server_is_running", &POA_ImplementationRepository::Locator::server_is_running_skel, &POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_running, &POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::server_is_running},
+      {"",0,0,0},{"",0,0,0},
+      {"remove_server_in_location", &POA_ImplementationRepository::Locator::remove_server_in_location_skel, &POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::remove_server_in_location, &POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::remove_server_in_location},
+      {"",0,0,0},{"",0,0,0},
+      {"server_is_shutting_down", &POA_ImplementationRepository::Locator::server_is_shutting_down_skel, &POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_shutting_down, &POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::server_is_shutting_down},
+      {"",0,0,0},
+      {"activate_server", &POA_ImplementationRepository::Locator::activate_server_skel, &POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::activate_server, &POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::activate_server},
+      {"",0,0,0},
+      {"shutdown_server_in_location", &POA_ImplementationRepository::Locator::shutdown_server_in_location_skel, &POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::shutdown_server_in_location, &POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::shutdown_server_in_location},
+      {"",0,0,0},{"",0,0,0},
+      {"_component", &POA_ImplementationRepository::Locator::_component_skel, 0, 0},
+      {"",0,0,0},{"",0,0,0},
+      {"_non_existent", &POA_ImplementationRepository::Locator::_non_existent_skel, 0, 0},
+      {"",0,0,0},
+      {"server_is_shutting_down_in_location", &POA_ImplementationRepository::Locator::server_is_shutting_down_in_location_skel, &POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_shutting_down_in_location, &POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::server_is_shutting_down_in_location},
+      {"",0,0,0},
+      {"activate_server_in_location", &POA_ImplementationRepository::Locator::activate_server_in_location_skel, &POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::activate_server_in_location, &POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::activate_server_in_location},
+      {"activate_server_with_startup", &POA_ImplementationRepository::Locator::activate_server_with_startup_skel, &POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::activate_server_with_startup, &POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::activate_server_with_startup},
+      {"",0,0,0},
+      {"_is_a", &POA_ImplementationRepository::Locator::_is_a_skel, 0, 0},
+      {"",0,0,0},{"",0,0,0},{"",0,0,0},{"",0,0,0},
+      {"unregister_activator", &POA_ImplementationRepository::Locator::unregister_activator_skel, &POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::unregister_activator, &POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::unregister_activator},
+      {"",0,0,0},{"",0,0,0},{"",0,0,0},{"",0,0,0},
+      {"_interface", &POA_ImplementationRepository::Locator::_interface_skel, 0, 0},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -193,12 +214,12 @@ TAO_ImplementationRepository_Locator_Perfect_Hash_OpTable::lookup (const char *s
 static TAO_ImplementationRepository_Locator_Perfect_Hash_OpTable tao_ImplementationRepository_Locator_optable;
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_ss.cpp:52
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interceptors_ss.cpp:52
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_location : public TAO_ServerRequestInfo
 {
@@ -211,51 +232,51 @@ public:
       const char * location
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_location (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_location &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_location &
     );
-
+  
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
-
+  
   const char * server_;
   const char * location_;
 };
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_location::TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_location (
     TAO_ServerRequest &_tao_server_request,
@@ -281,19 +302,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_locati
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (2);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -307,27 +328,27 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_locati
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_activate_server_in_location_exceptiondata[] =
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_activate_server_in_location_exceptiondata[] = 
   {
     ImplementationRepository::_tc_NotFound,
     ImplementationRepository::_tc_CannotActivate
   };
-
+  
   exception_list->length (2);
   for (CORBA::ULong i = 0; i < 2; ++i)
     {
       CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Locator_activate_server_in_location_exceptiondata[i];
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode, CORBA::TypeCode_var> tcp_object (&tcp, 1);
+      TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
       (*exception_list)[i] = tcp_object;
     }
 
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_location::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -338,7 +359,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_locati
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -363,7 +384,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_locati
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location : public TAO_ServerRequestInfo
 {
@@ -376,51 +397,51 @@ public:
       const char * location
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location &
     );
-
+  
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
-
+  
   const char * server_;
   const char * location_;
 };
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location::TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location (
     TAO_ServerRequest &_tao_server_request,
@@ -446,19 +467,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (2);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -472,26 +493,26 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_remove_server_in_location_exceptiondata[] =
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_remove_server_in_location_exceptiondata[] = 
   {
     ImplementationRepository::_tc_NotFound
   };
-
+  
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
       CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Locator_remove_server_in_location_exceptiondata[i];
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode, CORBA::TypeCode_var> tcp_object (&tcp, 1);
+      TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
       (*exception_list)[i] = tcp_object;
     }
 
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -502,7 +523,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -527,7 +548,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location : public TAO_ServerRequestInfo
 {
@@ -540,51 +561,51 @@ public:
       const char * location
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location &
     );
-
+  
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
-
+  
   const char * server_;
   const char * location_;
 };
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location::TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location (
     TAO_ServerRequest &_tao_server_request,
@@ -610,19 +631,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_locati
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (2);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -636,26 +657,26 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_locati
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_shutdown_server_in_location_exceptiondata[] =
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_shutdown_server_in_location_exceptiondata[] = 
   {
     ImplementationRepository::_tc_NotFound
   };
-
+  
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
       CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Locator_shutdown_server_in_location_exceptiondata[i];
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode, CORBA::TypeCode_var> tcp_object (&tcp, 1);
+      TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
       (*exception_list)[i] = tcp_object;
     }
 
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -666,7 +687,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_locati
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -691,7 +712,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_locati
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location : public TAO_ServerRequestInfo
 {
@@ -704,51 +725,51 @@ public:
       const char * location
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location &
     );
-
+  
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
-
+  
   const char * server_;
   const char * location_;
 };
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location::TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location (
     TAO_ServerRequest &_tao_server_request,
@@ -774,19 +795,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (2);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -800,26 +821,26 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_server_is_shutting_down_in_location_exceptiondata[] =
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_server_is_shutting_down_in_location_exceptiondata[] = 
   {
     ImplementationRepository::_tc_NotFound
   };
-
+  
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
       CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Locator_server_is_shutting_down_in_location_exceptiondata[i];
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode, CORBA::TypeCode_var> tcp_object (&tcp, 1);
+      TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
       (*exception_list)[i] = tcp_object;
     }
 
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -830,7 +851,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -855,7 +876,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator : public TAO_ServerRequestInfo
 {
@@ -868,53 +889,54 @@ public:
       CORBA::Object_ptr object_ref
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (CORBA::ULong result);
 
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator &
     );
-
+  
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
-
+  
   const char * location_;
-  CORBA::Object_ptr object_ref_;CORBA::ULong _result;
+  CORBA::Object_ptr object_ref_;
+  CORBA::ULong _result;
 };
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator (
     TAO_ServerRequest &_tao_server_request,
@@ -940,19 +962,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::argum
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (2);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<= object_ref_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -966,26 +988,26 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::excep
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_register_activator_exceptiondata[] =
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_register_activator_exceptiondata[] = 
   {
     ImplementationRepository::_tc_AlreadyRegistered
   };
-
+  
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
       CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Locator_register_activator_exceptiondata[i];
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode, CORBA::TypeCode_var> tcp_object (&tcp, 1);
+      TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
       (*exception_list)[i] = tcp_object;
     }
 
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -996,11 +1018,11 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::resul
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
-
+  
   return safe_result_any._retn ();
 }
 
@@ -1024,7 +1046,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::targe
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::result (CORBA::ULong result)
 {
   // Update the result.
@@ -1032,7 +1054,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::resul
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:74
 
 class TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator : public TAO_ServerRequestInfo
 {
@@ -1045,53 +1067,54 @@ public:
       CORBA::Object_ptr object_ref
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
-
+  
   virtual Dynamic::ParameterList * arguments (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual Dynamic::ExceptionList * exceptions (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Any * result (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual char * target_most_derived_interface (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   virtual CORBA::Boolean target_is_a (
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
-
+  
   void result (CORBA::ULong result);
 
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator &
     );
-
+  
 private:
   POA_ImplementationRepository::Locator *_tao_impl;
-
+  
   const char * location_;
-  CORBA::Object_ptr object_ref_;CORBA::ULong _result;
+  CORBA::Object_ptr object_ref_;
+  CORBA::ULong _result;
 };
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/interceptors_ss.cpp:438
 
 TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator (
     TAO_ServerRequest &_tao_server_request,
@@ -1117,19 +1140,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::arg
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
   parameter_list->length (2);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<= location_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<= object_ref_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -1143,26 +1166,26 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::exc
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_unregister_activator_exceptiondata[] =
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Locator_unregister_activator_exceptiondata[] = 
   {
     ImplementationRepository::_tc_NotFound
   };
-
+  
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
       CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Locator_unregister_activator_exceptiondata[i];
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode, CORBA::TypeCode_var> tcp_object (&tcp, 1);
+      TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
       (*exception_list)[i] = tcp_object;
     }
 
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -1173,11 +1196,11 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::res
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   CORBA::Any_var safe_result_any = result_any;
-
+  
   (*result_any) <<= this->_result;
-
+  
   return safe_result_any._retn ();
 }
 
@@ -1201,7 +1224,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::tar
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::result (CORBA::ULong result)
 {
   // Update the result.
@@ -1215,10 +1238,11 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::res
 //
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
-POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker *POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::the_TAO_Locator_Strategized_Proxy_Broker (void)
+POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker *
+POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::the_TAO_Locator_Strategized_Proxy_Broker (void)
 {
   static POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
@@ -1226,86 +1250,91 @@ POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker *POA_Impleme
 
 POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::_TAO_Locator_Strategized_Proxy_Broker (void)
 {
-  for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
-    {
-      this->proxy_cache_[i] = 0;
-    }
 }
 
 POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::~_TAO_Locator_Strategized_Proxy_Broker (void)
 {
-  for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
-    {
-      delete this->proxy_cache_[i];
-
-      // Hack to prevent bug mentioned in 1204. Refer to 1204
-      // for details..
-      this->proxy_cache_[i] = 0;
-    }
 }
 
-ImplementationRepository::_TAO_Locator_Proxy_Impl&
-POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::select_proxy (
-    ::ImplementationRepository::Locator *object
+TAO::Collocation_Strategy
+POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::get_strategy (
+    CORBA::Object_ptr obj
     ACE_ENV_ARG_DECL
   )
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  int strategy =
-    TAO_ORB_Core::collocation_strategy (object ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-
-  if (this->proxy_cache_[strategy] != 0)
-    {
-      return *this->proxy_cache_[strategy];
-    }
-
-  this->create_proxy (strategy ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
-
-  return *this->proxy_cache_[strategy];
+  TAO::Collocation_Strategy strategy =
+    TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
+  
+  return strategy;
 }
 
 void
-POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::create_proxy (
-    int strategy
+POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::dispatch (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out forward_obj,
+    TAO::Argument ** args,
+    int num_args,
+    const char * op,
+    size_t op_len,
+    TAO::Collocation_Strategy strategy
     ACE_ENV_ARG_DECL
   )
+  ACE_THROW_SPEC ((CORBA::Exception))
 {
-  ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-
-  if (this->proxy_cache_[strategy] == 0)
-    {
-      switch (strategy)
-        {
-        case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
-          ACE_NEW_THROW_EX (
-              this->proxy_cache_[strategy],
-              POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl,
-              CORBA::NO_MEMORY ()
-          );
-          ACE_CHECK;
-          break;
-
-        case TAO_Collocation_Strategies::CS_DIRECT_STRATEGY:
-          ACE_NEW_THROW_EX (
-              this->proxy_cache_[strategy],
-              POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl,
-              CORBA::NO_MEMORY ()
-          );
-          ACE_CHECK;
-          break;
-
-        case TAO_Collocation_Strategies::CS_REMOTE_STRATEGY:
-        default:
-          ACE_NEW_THROW_EX (
-              this->proxy_cache_[strategy],
-              ::ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl,
-              CORBA::NO_MEMORY ()
-          );
-          ACE_CHECK;
-          break;
-        }
-    }
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  
+  if (strategy == TAO::TAO_CS_THRU_POA_STRATEGY)
+   {
+    servant_upcall.prepare_for_upcall (
+    obj->_stubobj ()->object_key (),
+      op,
+      forward_obj
+      ACE_ENV_ARG_PARAMETER
+      );
+    ACE_CHECK;
+    
+    servant_upcall.pre_invoke_collocated_request (
+    ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_CHECK;
+  }
+
+TAO_Collocated_Skeleton collocated_skel;
+
+if (servant_upcall.servant ()->_find (op,
+      collocated_skel,
+      strategy,
+      op_len) == -1)
+  ACE_THROW (CORBA::BAD_OPERATION ());
+
+ACE_TRY
+  {
+    collocated_skel (
+      servant_upcall.servant (),
+      args, 
+      num_args
+      ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+  }
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+ACE_CATCH (PortableServer::ForwardRequest, forward_request)
+  {
+    forward_obj =
+      CORBA::Object::_duplicate (forward_request.forward_reference.in ());
+    return;
+  }
+#else
+ACE_CATCHANY
+  {
+    ACE_UNUSED_ARG (forward_obj);
+    ACE_RE_THROW;
+  }
+#endif /* TAO_HAS_MINIMUM_CORBA */
+ACE_ENDTRY;
+ACE_CHECK;
 }
 
 //
@@ -1313,26 +1342,32 @@ POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::create_prox
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:598
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:600
 
-ImplementationRepository::_TAO_Locator_Proxy_Broker *
-ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+TAO::Collocation_Proxy_Broker *
+ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function (CORBA::Object_ptr)
 {
-  ACE_UNUSED_ARG (obj);
-  return ::POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::the_TAO_Locator_Strategized_Proxy_Broker();
+  return
+    ::POA_ImplementationRepository::_TAO_Locator_Strategized_Proxy_Broker::the_TAO_Locator_Strategized_Proxy_Broker();
 }
 
 int
 ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_Initializer (size_t)
 {
-  ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function_pointer =
+  ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function_pointer = 
     ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function;
-
+  
   return 0;
 }
 
-static int ImplementationRepository__TAO_Locator_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-  ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_Initializer));
+static int
+ImplementationRepository__TAO_Locator_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+  ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_Initializer (
+      ACE_reinterpret_cast (
+          size_t,
+          ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_Initializer
+        )
+    );
 
 
 ///////////////////////////////////////////////////////////////////////
@@ -1340,20 +1375,21 @@ static int ImplementationRepository__TAO_Locator_Proxy_Broker_Stub_Factory_Initi
 //
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_ss.cpp:37
 
 POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::_TAO_Locator_ThruPOA_Proxy_Impl (void)
 {}
 
 // ThruPOA Implementation of the IDL interface methods
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+// TAO_IDL - Generated from 
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
-void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::activate_server_in_location (
-    CORBA::Object *_collocated_tao_target_,
-    const char * server,
-    const char * location
+void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::activate_server_in_location (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1362,44 +1398,27 @@ void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::activate_ser
     , ImplementationRepository::CannotActivate
   ))
 {
-
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-    );
-  CORBA::Object_var forward_to;
-  servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
-      "activate_server_in_location",
-      forward_to.out ()
-      ACE_ENV_ARG_PARAMETER
-    );
-  ACE_CHECK;
-
-  servant_upcall.pre_invoke_collocated_request (
-      ACE_ENV_SINGLE_ARG_PARAMETER
-    );
-  ACE_CHECK;
-
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Locator_ptr,
-      servant_upcall.servant ()->_downcast (
+      servant->_downcast (
           "IDL:ImplementationRepository/Locator:1.0"
         )
     )->activate_server_in_location (
-
-        server,
-        location
+        ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->arg (),
+        ((TAO::Arg_Traits<ImplementationRepository::Address>::in_arg_val *) args[2])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
+  ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+// TAO_IDL - Generated from 
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
-void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::remove_server_in_location (
-    CORBA::Object *_collocated_tao_target_,
-    const char * server,
-    const char * location
+void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::remove_server_in_location (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1407,44 +1426,27 @@ void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::remove_serve
     , ImplementationRepository::NotFound
   ))
 {
-
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-    );
-  CORBA::Object_var forward_to;
-  servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
-      "remove_server_in_location",
-      forward_to.out ()
-      ACE_ENV_ARG_PARAMETER
-    );
-  ACE_CHECK;
-
-  servant_upcall.pre_invoke_collocated_request (
-      ACE_ENV_SINGLE_ARG_PARAMETER
-    );
-  ACE_CHECK;
-
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Locator_ptr,
-      servant_upcall.servant ()->_downcast (
+      servant->_downcast (
           "IDL:ImplementationRepository/Locator:1.0"
         )
     )->remove_server_in_location (
-
-        server,
-        location
+        ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->arg (),
+        ((TAO::Arg_Traits<ImplementationRepository::Address>::in_arg_val *) args[2])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
+  ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+// TAO_IDL - Generated from 
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
-void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::shutdown_server_in_location (
-    CORBA::Object *_collocated_tao_target_,
-    const char * server,
-    const char * location
+void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::shutdown_server_in_location (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1452,44 +1454,27 @@ void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::shutdown_ser
     , ImplementationRepository::NotFound
   ))
 {
-
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-    );
-  CORBA::Object_var forward_to;
-  servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
-      "shutdown_server_in_location",
-      forward_to.out ()
-      ACE_ENV_ARG_PARAMETER
-    );
-  ACE_CHECK;
-
-  servant_upcall.pre_invoke_collocated_request (
-      ACE_ENV_SINGLE_ARG_PARAMETER
-    );
-  ACE_CHECK;
-
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Locator_ptr,
-      servant_upcall.servant ()->_downcast (
+      servant->_downcast (
           "IDL:ImplementationRepository/Locator:1.0"
         )
     )->shutdown_server_in_location (
-
-        server,
-        location
+        ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->arg (),
+        ((TAO::Arg_Traits<ImplementationRepository::Address>::in_arg_val *) args[2])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
+  ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+// TAO_IDL - Generated from 
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
-void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_shutting_down_in_location (
-    CORBA::Object *_collocated_tao_target_,
-    const char * server,
-    const char * location
+void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_shutting_down_in_location (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1497,44 +1482,27 @@ void POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_sh
     , ImplementationRepository::NotFound
   ))
 {
-
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-    );
-  CORBA::Object_var forward_to;
-  servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
-      "server_is_shutting_down_in_location",
-      forward_to.out ()
-      ACE_ENV_ARG_PARAMETER
-    );
-  ACE_CHECK;
-
-  servant_upcall.pre_invoke_collocated_request (
-      ACE_ENV_SINGLE_ARG_PARAMETER
-    );
-  ACE_CHECK;
-
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Locator_ptr,
-      servant_upcall.servant ()->_downcast (
+      servant->_downcast (
           "IDL:ImplementationRepository/Locator:1.0"
         )
     )->server_is_shutting_down_in_location (
-
-        server,
-        location
+        ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->arg (),
+        ((TAO::Arg_Traits<ImplementationRepository::Address>::in_arg_val *) args[2])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
+  ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+// TAO_IDL - Generated from 
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
-CORBA::ULong POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::register_activator (
-    CORBA::Object *_collocated_tao_target_,
-    const char * location,
-    CORBA::Object_ptr object_ref
+void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::register_activator (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1542,45 +1510,28 @@ CORBA::ULong POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::regi
     , ImplementationRepository::AlreadyRegistered
   ))
 {
-  CORBA::ULong _tao_retval = 0;
-  ACE_UNUSED_ARG (_tao_retval);
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-    );
-  CORBA::Object_var forward_to;
-  servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
-      "register_activator",
-      forward_to.out ()
-      ACE_ENV_ARG_PARAMETER
-    );
-  ACE_CHECK_RETURN (_tao_retval);
-
-  servant_upcall.pre_invoke_collocated_request (
-      ACE_ENV_SINGLE_ARG_PARAMETER
-    );
-  ACE_CHECK_RETURN (_tao_retval);
-
-  return ACE_reinterpret_cast (
-      POA_ImplementationRepository::Locator_ptr,
-      servant_upcall.servant ()->_downcast (
-          "IDL:ImplementationRepository/Locator:1.0"
-        )
-    )->register_activator (
-
-        location,
-        object_ref
-        ACE_ENV_ARG_PARAMETER
-      );
+  ((TAO::Arg_Traits<CORBA::ULong>::ret_val *) args[0])->arg () =
+    ACE_reinterpret_cast (
+        POA_ImplementationRepository::Locator_ptr,
+        servant->_downcast (
+            "IDL:ImplementationRepository/Locator:1.0"
+          )
+      )->register_activator (
+          ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits<CORBA::Object>::in_arg_val *) args[2])->arg ()
+          ACE_ENV_ARG_PARAMETER
+        );
+  ACE_CHECK;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:67
+// TAO_IDL - Generated from 
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
-CORBA::ULong POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::unregister_activator (
-    CORBA::Object *_collocated_tao_target_,
-    const char * location,
-    CORBA::Object_ptr object_ref
+void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::unregister_activator (
+    TAO_Abstract_ServantBase *servant,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1588,39 +1539,24 @@ CORBA::ULong POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::unre
     , ImplementationRepository::NotFound
   ))
 {
-  CORBA::ULong _tao_retval = 0;
-  ACE_UNUSED_ARG (_tao_retval);
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
-    );
-  CORBA::Object_var forward_to;
-  servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
-      "unregister_activator",
-      forward_to.out ()
-      ACE_ENV_ARG_PARAMETER
-    );
-  ACE_CHECK_RETURN (_tao_retval);
-
-  servant_upcall.pre_invoke_collocated_request (
-      ACE_ENV_SINGLE_ARG_PARAMETER
-    );
-  ACE_CHECK_RETURN (_tao_retval);
-
-  return ACE_reinterpret_cast (
-      POA_ImplementationRepository::Locator_ptr,
-      servant_upcall.servant ()->_downcast (
-          "IDL:ImplementationRepository/Locator:1.0"
-        )
-    )->unregister_activator (
+  ((TAO::Arg_Traits<CORBA::ULong>::ret_val *) args[0])->arg () =
+    ACE_reinterpret_cast (
+        POA_ImplementationRepository::Locator_ptr,
+        servant->_downcast (
+            "IDL:ImplementationRepository/Locator:1.0"
+          )
+      )->unregister_activator (
+          ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits<CORBA::Object>::in_arg_val *) args[2])->arg ()
+          ACE_ENV_ARG_PARAMETER
+        );
+  ACE_CHECK;
+}
 
-        location,
-        object_ref
-        ACE_ENV_ARG_PARAMETER
-      );
-}//
+//
 //           End ThruPOA Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
+
 ///////////////////////////////////////////////////////////////////////
 //                 Direct Proxy  Implementation
 //
@@ -1628,147 +1564,173 @@ CORBA::ULong POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::unre
 POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::_TAO_Locator_Direct_Proxy_Impl (void)
 {}
 
-void POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::activate_server_in_location  (
-    CORBA::Object *_collocated_tao_target_,
-    const char * server,
-    const char * location
+// TAO_IDL - Generated from 
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
+
+void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::activate_server_in_location (
+    TAO_Abstract_ServantBase  *servant,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
     , ImplementationRepository::CannotActivate
-  )){
+  ))
+{
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Locator_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Locator:1.0")
+      servant->_downcast (
+          "IDL:ImplementationRepository/Locator:1.0"
+        )
     )->activate_server_in_location (
+        ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->arg (),
+        ((TAO::Arg_Traits<ImplementationRepository::Address>::in_arg_val *) args[2])->arg ()
+        ACE_ENV_ARG_PARAMETER
+      );
+  ACE_CHECK;
+}// TAO_IDL - Generated from 
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
-          server,
-          location
-          ACE_ENV_ARG_PARAMETER
-        );
-
-}
-
-void POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::remove_server_in_location  (
-    CORBA::Object *_collocated_tao_target_,
-    const char * server,
-    const char * location
+void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::remove_server_in_location (
+    TAO_Abstract_ServantBase  *servant,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
-  )){
+  ))
+{
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Locator_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Locator:1.0")
+      servant->_downcast (
+          "IDL:ImplementationRepository/Locator:1.0"
+        )
     )->remove_server_in_location (
+        ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->arg (),
+        ((TAO::Arg_Traits<ImplementationRepository::Address>::in_arg_val *) args[2])->arg ()
+        ACE_ENV_ARG_PARAMETER
+      );
+  ACE_CHECK;
+}// TAO_IDL - Generated from 
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
-          server,
-          location
-          ACE_ENV_ARG_PARAMETER
-        );
-
-}
-
-void POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::shutdown_server_in_location  (
-    CORBA::Object *_collocated_tao_target_,
-    const char * server,
-    const char * location
+void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::shutdown_server_in_location (
+    TAO_Abstract_ServantBase  *servant,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
-  )){
+  ))
+{
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Locator_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Locator:1.0")
+      servant->_downcast (
+          "IDL:ImplementationRepository/Locator:1.0"
+        )
     )->shutdown_server_in_location (
+        ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->arg (),
+        ((TAO::Arg_Traits<ImplementationRepository::Address>::in_arg_val *) args[2])->arg ()
+        ACE_ENV_ARG_PARAMETER
+      );
+  ACE_CHECK;
+}// TAO_IDL - Generated from 
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
-          server,
-          location
-          ACE_ENV_ARG_PARAMETER
-        );
-
-}
-
-void POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::server_is_shutting_down_in_location  (
-    CORBA::Object *_collocated_tao_target_,
-    const char * server,
-    const char * location
+void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::server_is_shutting_down_in_location (
+    TAO_Abstract_ServantBase  *servant,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
-  )){
+  ))
+{
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Locator_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Locator:1.0")
+      servant->_downcast (
+          "IDL:ImplementationRepository/Locator:1.0"
+        )
     )->server_is_shutting_down_in_location (
+        ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->arg (),
+        ((TAO::Arg_Traits<ImplementationRepository::Address>::in_arg_val *) args[2])->arg ()
+        ACE_ENV_ARG_PARAMETER
+      );
+  ACE_CHECK;
+}// TAO_IDL - Generated from 
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
-          server,
-          location
-          ACE_ENV_ARG_PARAMETER
-        );
-
-}
-
-CORBA::ULong POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::register_activator  (
-    CORBA::Object *_collocated_tao_target_,
-    const char * location,
-    CORBA::Object_ptr object_ref
+void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::register_activator (
+    TAO_Abstract_ServantBase  *servant,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::AlreadyRegistered
-  )){
-  return ACE_reinterpret_cast (
-      POA_ImplementationRepository::Locator_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Locator:1.0")
-    )->register_activator (
-
-          location,
-          object_ref
+  ))
+{
+  ((TAO::Arg_Traits<CORBA::ULong>::ret_val *) args[0])->arg () =
+    ACE_reinterpret_cast (
+        POA_ImplementationRepository::Locator_ptr,
+        servant->_downcast (
+            "IDL:ImplementationRepository/Locator:1.0"
+          )
+      )->register_activator (
+          ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits<CORBA::Object>::in_arg_val *) args[2])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
+  ACE_CHECK;
+}// TAO_IDL - Generated from 
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
-}
-
-CORBA::ULong POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::unregister_activator  (
-    CORBA::Object *_collocated_tao_target_,
-    const char * location,
-    CORBA::Object_ptr object_ref
+void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::unregister_activator (
+    TAO_Abstract_ServantBase  *servant,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
-  )){
-  return ACE_reinterpret_cast (
-      POA_ImplementationRepository::Locator_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Locator:1.0")
-    )->unregister_activator (
-
-          location,
-          object_ref
+  ))
+{
+  ((TAO::Arg_Traits<CORBA::ULong>::ret_val *) args[0])->arg () =
+    ACE_reinterpret_cast (
+        POA_ImplementationRepository::Locator_ptr,
+        servant->_downcast (
+            "IDL:ImplementationRepository/Locator:1.0"
+          )
+      )->unregister_activator (
+          ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits<CORBA::Object>::in_arg_val *) args[2])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
-
+  ACE_CHECK;
 }
 
-
 //
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:98
+// TAO_IDL - Generated from 
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:97
 
 POA_ImplementationRepository::Locator::Locator (void)
 {
@@ -1778,15 +1740,16 @@ POA_ImplementationRepository::Locator::Locator (void)
 POA_ImplementationRepository::Locator::Locator (const Locator& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs),
-    ACE_NESTED_CLASS (POA_ImplementationRepository,Administration) (rhs)
-{}
+    ACE_NESTED_CLASS (POA_ImplementationRepository, Administration) (rhs)
+{
+}
 
 POA_ImplementationRepository::Locator::~Locator (void)
 {
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
+// TAO_IDL - Generated from 
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Locator::activate_server_in_location_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -1802,64 +1765,69 @@ void POA_ImplementationRepository::Locator::activate_server_in_location_skel (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-
+  
   CORBA::String_var server;
   CORBA::String_var location;
-
+  
   if (!(
       (_tao_in >> server.out ()) &&
       (_tao_in >> location.out ())
-    ))
-    ACE_THROW (CORBA::MARSHAL ());
+      ))
+      {
+        
+        TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK;
+      }
+      
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_location _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       server.in (),
-
+      
       location.in ()
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
-
+            
 #endif /* TAO_HAS_INTERCEPTORS */
-
+            
             _tao_impl->activate_server_in_location (
-
+                
                 server.in (),
-
+                
                 location.in ()
                 ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
-
+            
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -1875,52 +1843,52 @@ void POA_ImplementationRepository::Locator::activate_server_in_location_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+  
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
+// TAO_IDL - Generated from 
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Locator::remove_server_in_location_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -1936,64 +1904,69 @@ void POA_ImplementationRepository::Locator::remove_server_in_location_skel (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-
+  
   CORBA::String_var server;
   CORBA::String_var location;
-
+  
   if (!(
       (_tao_in >> server.out ()) &&
       (_tao_in >> location.out ())
-    ))
-    ACE_THROW (CORBA::MARSHAL ());
+      ))
+      {
+        
+        TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK;
+      }
+      
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       server.in (),
-
+      
       location.in ()
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
-
+            
 #endif /* TAO_HAS_INTERCEPTORS */
-
+            
             _tao_impl->remove_server_in_location (
-
+                
                 server.in (),
-
+                
                 location.in ()
                 ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
-
+            
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -2009,52 +1982,52 @@ void POA_ImplementationRepository::Locator::remove_server_in_location_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+  
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
+// TAO_IDL - Generated from 
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Locator::shutdown_server_in_location_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -2070,64 +2043,69 @@ void POA_ImplementationRepository::Locator::shutdown_server_in_location_skel (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-
+  
   CORBA::String_var server;
   CORBA::String_var location;
-
+  
   if (!(
       (_tao_in >> server.out ()) &&
       (_tao_in >> location.out ())
-    ))
-    ACE_THROW (CORBA::MARSHAL ());
+      ))
+      {
+        
+        TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK;
+      }
+      
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       server.in (),
-
+      
       location.in ()
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
-
+            
 #endif /* TAO_HAS_INTERCEPTORS */
-
+            
             _tao_impl->shutdown_server_in_location (
-
+                
                 server.in (),
-
+                
                 location.in ()
                 ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
-
+            
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -2143,52 +2121,52 @@ void POA_ImplementationRepository::Locator::shutdown_server_in_location_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+  
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
+// TAO_IDL - Generated from 
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Locator::server_is_shutting_down_in_location_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -2204,64 +2182,69 @@ void POA_ImplementationRepository::Locator::server_is_shutting_down_in_location_
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-
+  
   CORBA::String_var server;
   CORBA::String_var location;
-
+  
   if (!(
       (_tao_in >> server.out ()) &&
       (_tao_in >> location.out ())
-    ))
-    ACE_THROW (CORBA::MARSHAL ());
+      ))
+      {
+        
+        TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK;
+      }
+      
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       server.in (),
-
+      
       location.in ()
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
-
+            
 #endif /* TAO_HAS_INTERCEPTORS */
-
+            
             _tao_impl->server_is_shutting_down_in_location (
-
+                
                 server.in (),
-
+                
                 location.in ()
                 ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
-
+            
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -2277,52 +2260,52 @@ void POA_ImplementationRepository::Locator::server_is_shutting_down_in_location_
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+  
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
+// TAO_IDL - Generated from 
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Locator::register_activator_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -2340,61 +2323,66 @@ void POA_ImplementationRepository::Locator::register_activator_skel (
   CORBA::ULong _tao_retval = 0;
   CORBA::String_var location;
   CORBA::Object_var object_ref;
-
+  
   if (!(
       (_tao_in >> location.out ()) &&
       (_tao_in >> object_ref.out ())
-    ))
-    ACE_THROW (CORBA::MARSHAL ());
+      ))
+      {
+        
+        TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK;
+      }
+      
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       location.in (),
-
+      
       object_ref.in ()
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
-
+            
 #endif /* TAO_HAS_INTERCEPTORS */
-            _tao_retval =
+            _tao_retval = 
             _tao_impl->register_activator (
-
+                
                 location.in (),
-
+                
                 object_ref.in ()
                 ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
-
+            
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           CORBA::ULong _tao_retval_info = _tao_retval;
@@ -2412,59 +2400,64 @@ void POA_ImplementationRepository::Locator::register_activator_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+  
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(
       (_tao_out << _tao_retval)
-    ))
-    ACE_THROW (CORBA::MARSHAL ());
-
+      ))
+      {
+        
+        TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK;
+      }
+      
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
+// TAO_IDL - Generated from 
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Locator::unregister_activator_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -2482,61 +2475,66 @@ void POA_ImplementationRepository::Locator::unregister_activator_skel (
   CORBA::ULong _tao_retval = 0;
   CORBA::String_var location;
   CORBA::Object_var object_ref;
-
+  
   if (!(
       (_tao_in >> location.out ()) &&
       (_tao_in >> object_ref.out ())
-    ))
-    ACE_THROW (CORBA::MARSHAL ());
+      ))
+      {
+        
+        TAO_InputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK;
+      }
+      
 
 #if (TAO_HAS_INTERCEPTORS == 1)
   TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
     ACE_static_cast (TAO_Object_Adapter::Servant_Upcall *, _tao_servant_upcall);
-
+  
   TAO_ServerRequestInterceptor_Adapter _tao_vfr (
       _tao_server_request.orb_core ()->server_request_interceptors (),
       _tao_server_request.interceptor_count ()
     );
-
+  
   TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       location.in (),
-
+      
       object_ref.in ()
       ACE_ENV_ARG_PARAMETER
     );
-
+  
   ACE_TRY
     {
       {
         TAO_PICurrent_Guard _tao_pi_guard (_tao_ri.server_request (),
                                            1  /* Copy TSC to RSC */);
-
+        
         _tao_vfr.receive_request (&_tao_ri ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
-
+        
         if (!_tao_vfr.location_forwarded ())
           {
-
+            
 #endif /* TAO_HAS_INTERCEPTORS */
-            _tao_retval =
+            _tao_retval = 
             _tao_impl->unregister_activator (
-
+                
                 location.in (),
-
+                
                 object_ref.in ()
                 ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
-
+            
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           CORBA::ULong _tao_retval_info = _tao_retval;
@@ -2554,62 +2552,67 @@ void POA_ImplementationRepository::Locator::unregister_activator_skel (
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
           || _tao_status == PortableInterceptor::USER_EXCEPTION)
         {
           ACE_RE_THROW;
         }
     }
-
+  
 # if defined (ACE_HAS_EXCEPTIONS) \
      && defined (ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS)
   ACE_CATCHALL
     {
       CORBA::UNKNOWN ex;
-
+      
       _tao_ri.exception (&ex);
       _tao_vfr.send_exception (
           &_tao_ri
           ACE_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
-
+      
       PortableInterceptor::ReplyStatus _tao_status =
         _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION)
         ACE_TRY_THROW (ex);
     }
 # endif  /* ACE_HAS_EXCEPTIONS && ACE_HAS_BROKEN_UNEXPECTED_EXCEPTIONS */
-
+  
   ACE_ENDTRY;
   ACE_CHECK;
 #endif /* TAO_HAS_INTERCEPTORS */
-
+  
   _tao_server_request.init_reply ();
-
+  
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(
       (_tao_out << _tao_retval)
-    ))
-    ACE_THROW (CORBA::MARSHAL ());
-
+      ))
+      {
+        
+        TAO_OutputCDR::throw_skel_exception (errno ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK;
+      }
+      
+  
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:163
+// TAO_IDL - Generated from 
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:162
 
 void POA_ImplementationRepository::Locator::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -2619,22 +2622,22 @@ void POA_ImplementationRepository::Locator::_is_a_skel (
   POA_ImplementationRepository::Locator *_tao_impl = (POA_ImplementationRepository::Locator *) _tao_servant;
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
-
+  
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
-
+  
   _tao_retval = _tao_impl->_is_a (value.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     ACE_THROW (CORBA::MARSHAL ());
 }
 
 void POA_ImplementationRepository::Locator::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -2644,16 +2647,16 @@ void POA_ImplementationRepository::Locator::_non_existent_skel (
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(_tao_out << CORBA::Any::from_boolean (_tao_retval)))
     ACE_THROW (CORBA::MARSHAL ());
 }
 
 void POA_ImplementationRepository::Locator::_interface_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -2662,27 +2665,27 @@ void POA_ImplementationRepository::Locator::_interface_skel (
   POA_ImplementationRepository::Locator *_tao_impl = (POA_ImplementationRepository::Locator *) _tao_servant;
   CORBA::InterfaceDef_ptr _tao_retval = 0;
   CORBA::Boolean _tao_result = 0;
-
+  
   TAO_IFR_Client_Adapter *_tao_adapter =
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-
+    
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS ());
     }
-
+  
   ACE_TRY
     {
-      _tao_retval =
+      _tao_retval = 
         _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
-
+      
       _tao_server_request.init_reply ();
-
+      
       TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+      
       _tao_result =
         _tao_adapter->interfacedef_cdr_insert (
             _tao_out,
@@ -2694,7 +2697,7 @@ void POA_ImplementationRepository::Locator::_interface_skel (
       _tao_adapter->dispose (_tao_retval);
     }
   ACE_ENDTRY;
-
+  
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -2702,7 +2705,7 @@ void POA_ImplementationRepository::Locator::_interface_skel (
 }
 
 void POA_ImplementationRepository::Locator::_component_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -2712,10 +2715,10 @@ void POA_ImplementationRepository::Locator::_component_skel (
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-
+  
   _tao_server_request.init_reply ();
   TAO_OutputCDR &_tao_out = _tao_server_request.outgoing ();
-
+  
   if (!(_tao_out << _tao_retval._retn ()))
     ACE_THROW (CORBA::MARSHAL ());
 }
@@ -2728,11 +2731,11 @@ CORBA::Boolean POA_ImplementationRepository::Locator::_is_a (
   if (
       !ACE_OS::strcmp (
           (char *)value,
-          "IDL:ImplementationRepository/Locator:1.0"
+          "IDL:ImplementationRepository/Administration:1.0"
         ) ||
       !ACE_OS::strcmp (
           (char *)value,
-          "IDL:ImplementationRepository/Administration:1.0"
+          "IDL:ImplementationRepository/Locator:1.0"
         ) ||
       !ACE_OS::strcmp (
           (char *)value,
@@ -2753,23 +2756,23 @@ void* POA_ImplementationRepository::Locator::_downcast (
   )
 {
   if (ACE_OS::strcmp (logical_type_id,
-                      "IDL:ImplementationRepository/Locator:1.0") == 0)
+                      "IDL:ImplementationRepository/Administration:1.0") == 0)
     {
-      return ACE_static_cast (POA_ImplementationRepository::Locator_ptr, this);
+      return ACE_static_cast (POA_ImplementationRepository::Administration_ptr, this);
     }
-
+  
   if (ACE_OS::strcmp (logical_type_id,
-                      "IDL:ImplementationRepository/Administration:1.0") == 0)
+                      "IDL:ImplementationRepository/Locator:1.0") == 0)
     {
-      return ACE_static_cast (POA_ImplementationRepository::Administration_ptr, this);
+      return ACE_static_cast (POA_ImplementationRepository::Locator_ptr, this);
     }
-
+  
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Object:1.0") == 0)
     {
       return ACE_static_cast(PortableServer::Servant, this);
     }
-
+  
   return 0;
 }
 
@@ -2779,7 +2782,7 @@ const char* POA_ImplementationRepository::Locator::_interface_repository_id (voi
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:532
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:536
 
 void POA_ImplementationRepository::Locator::_dispatch (
     TAO_ServerRequest &req,
@@ -2794,17 +2797,17 @@ void POA_ImplementationRepository::Locator::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:478
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:476
 
 ImplementationRepository::Locator *
 POA_ImplementationRepository::Locator::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   TAO_Stub_Auto_Ptr safe_stub (stub);
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-
+  
   if (stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ())
     {
       ACE_NEW_RETURN (
@@ -2829,9 +2832,24 @@ POA_ImplementationRepository::Locator::_this (ACE_ENV_SINGLE_ARG_DECL)
           0
         );
     }
-
+  
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  return ::ImplementationRepository::Locator::_unchecked_narrow (obj.in ());
+  typedef ::ImplementationRepository::Locator STUB_SCOPED_NAME;
+  return
+    TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
+        obj.in (),
+        ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function_pointer
+      );
 }
+
+// TAO_IDL - Generated from
+// C:\work\ACE+TAO\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1714
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
 #endif /* ifndef */