ChangeLogTag: Tue Sep 2 20:39:57 2003 Jeff Parsons <j.parsons@vanderbilt.edu>

author: parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2003-09-03 01:44:03 +0000
committer: parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> 2003-09-03 01:44:03 +0000
commit: 708df687d05c5898b9b787691066406fd6b8a614 (patch)
tree: 479e70c6b0df8ba1947cc509d9d8d0740d288b2e
parent: 5d077fe8070848525c36a5b52e24ff133a9ec5e1 (diff)
download: ATCD-708df687d05c5898b9b787691066406fd6b8a614.tar.gz
46 files changed, 13770 insertions, 16983 deletions
diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref
index 4bac44f6abc..10be37a1364 100644
--- a/TAO/ChangeLog_ref
+++ b/TAO/ChangeLog_ref
@@ -1,3 +1,78 @@
+Tue Sep  2 20:39:57 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAOACE.dsw:
+
+  	  Added dependency of TAO_IORInterceptor on TAO_Valuetype.
+
+        * tao/IORInterceptor/IORInterceptor.dsp:
+
+	  Added link to TAO_Valuetype library.
+
+        * tao/PortableInterceptorC.h:
+        * tao/IORInterceptor/IORInterceptorC.h:
+
+	  Added template specialization declaration, with export
+	  macro, of 3 PortableInterceptor interfaces - ORBInitializer,
+	  IORInfo and PolicyFactory. While these are not forward
+	  declared (if they were the declaration would be generated),
+	  they are needed by TAO_PortableServer, and thus the
+	  need for the export macros.
+
+        * tao/PortableServer/Default_ORT.pidl:
+        * tao/PortableServer/Default_ORTC.cpp:
+        * tao/PortableServer/Default_ORTC.h:
+        * tao/PortableServer/Default_ORTC.i:
+        * tao/PortableServer/ImR_Activator.pidl:
+        * tao/PortableServer/ImR_ActivatorS.h:
+        * tao/PortableServer/ImR_ActivatorS_T.h:
+        * tao/PortableServer/ImR_Locator.pidl
+        * tao/PortableServer/ImR_LocatorC.cpp:
+        * tao/PortableServer/ImR_LocatorC.h:
+        * tao/PortableServer/ImR_LocatorC.i:
+        * tao/PortableServer/ImR_LocatorS.cpp:
+        * tao/PortableServer/ImR_LocatorS.h:
+        * tao/PortableServer/ImR_LocatorS.i:
+        * tao/PortableServer/ImR_LocatorS_T.cpp:
+        * tao/PortableServer/ImR_LocatorS_T.h:
+        * tao/PortableServer/ImR_LocatorS_T.i:
+        * tao/PortableServer/ImplRepo.pidl:
+        * tao/PortableServer/ImplRepoC.cpp:
+        * tao/PortableServer/ImplRepoC.h:
+        * tao/PortableServer/ImplRepoC.i:
+        * tao/PortableServer/ImplRepoS.cpp:
+        * tao/PortableServer/ImplRepoS.h:
+        * tao/PortableServer/ImplRepoS.i:
+        * tao/PortableServer/ImplRepoS_T.cpp:
+        * tao/PortableServer/ImplRepoS_T.h:
+        * tao/PortableServer/ImplRepoS_T.i:
+        * tao/PortableServer/POA.cpp:
+        * tao/PortableServer/PolicyS.cpp:
+        * tao/PortableServer/PolicyS.h:
+        * tao/PortableServer/PolicyS.i:
+        * tao/PortableServer/PolicyS_T.cpp:
+        * tao/PortableServer/PolicyS_T.h:
+        * tao/PortableServer/PolicyS_T.i:
+        * tao/PortableServer/PortableServer.pidl:
+        * tao/PortableServer/PortableServerC.cpp:
+        * tao/PortableServer/PortableServerC.h:
+        * tao/PortableServer/PortableServerC.i:
+
+	  Regenerated hand-crafted files in TAO_PortableServer.
+
+        * tao/PortableServer/ORB_Manager.cpp:
+
+          Cosmetic changes.
+        * TO_IDL/be/be_codegen.cpp:
+
+	  Changed generation of Object_T.h include in the 
+	  skeleton source file to be unconditional.
+
+        * TAO_IDL/be/be_visitor_interface/interface_ci.cpp:
+
+	  Since local interfaces generate no inline code,
+	  added a check to return from this visitor immediately,
+	  avoiding the generation of empty #ifdef guards.
+
 Tue Sep  2 16:32:01 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* tao/RTCORBA/Network_Priority_Mapping_Manager.h:
diff --git a/TAO/TAOACE.dsw b/TAO/TAOACE.dsw
index 480338bd4ca..f4da9e4c3a9 100644
--- a/TAO/TAOACE.dsw
+++ b/TAO/TAOACE.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "ACE DLL"="..\ace\ace_dll.dsp" - Package Owner=<4>
+Project: "ACE DLL"=..\ace\ace_dll.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -15,7 +15,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "ACEXML DLL"="..\ACEXML\common\ACEXML.dsp" - Package Owner=<4>
+Project: "ACEXML DLL"=..\ACEXML\common\ACEXML.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -30,7 +30,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "ACEXML_Parser DLL"="..\ACEXML\parser\parser\ACEXML_Parser.dsp" - Package Owner=<4>
+Project: "ACEXML_Parser DLL"=..\ACEXML\parser\parser\ACEXML_Parser.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -45,7 +45,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "ACE_QoS DLL"="..\ace\QoS\ACE_QoS.dsp" - Package Owner=<4>
+Project: "ACE_QoS DLL"=..\ace\QoS\ACE_QoS.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -57,7 +57,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "ACE_SSL"="..\ace\SSL\ACE_SSL.dsp" - Package Owner=<4>
+Project: "ACE_SSL"=..\ace\SSL\ACE_SSL.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -72,7 +72,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "AV"=".\orbsvcs\orbsvcs\AV.dsp" - Package Owner=<4>
+Project: "AV"=.\orbsvcs\orbsvcs\AV.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -105,7 +105,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "BiDirGIOP"=".\tao\BiDir_GIOP\TAO_BiDir_GIOP.dsp" - Package Owner=<4>
+Project: "BiDirGIOP"=.\tao\BiDir_GIOP\TAO_BiDir_GIOP.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -120,7 +120,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Concurrency_Service"=".\orbsvcs\Concurrency_Service\Concurrency_Service.dsp" - Package Owner=<4>
+Project: "Concurrency_Service"=.\orbsvcs\Concurrency_Service\Concurrency_Service.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -138,7 +138,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "CosConcurrency"=".\orbsvcs\orbsvcs\CosConcurrency.dsp" - Package Owner=<4>
+Project: "CosConcurrency"=.\orbsvcs\orbsvcs\CosConcurrency.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -159,7 +159,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "CosEvent"=".\orbsvcs\orbsvcs\CosEvent.dsp" - Package Owner=<4>
+Project: "CosEvent"=.\orbsvcs\orbsvcs\CosEvent.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -183,7 +183,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "CosEvent_Service"=".\orbsvcs\CosEvent_Service\CosEvent_Service.dsp" - Package Owner=<4>
+Project: "CosEvent_Service"=.\orbsvcs\CosEvent_Service\CosEvent_Service.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -201,7 +201,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "CosLifeCycle"=".\orbsvcs\orbsvcs\CosLifeCycle.dsp" - Package Owner=<4>
+Project: "CosLifeCycle"=.\orbsvcs\orbsvcs\CosLifeCycle.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -222,7 +222,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "CosLoadBalancing"=".\orbsvcs\orbsvcs\CosLoadBalancing.dsp" - Package Owner=<4>
+Project: "CosLoadBalancing"=.\orbsvcs\orbsvcs\CosLoadBalancing.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -240,7 +240,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "CosNaming"=".\orbsvcs\orbsvcs\CosNaming.dsp" - Package Owner=<4>
+Project: "CosNaming"=.\orbsvcs\orbsvcs\CosNaming.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -261,7 +261,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "CosNotification"=".\orbsvcs\orbsvcs\CosNotification.dsp" - Package Owner=<4>
+Project: "CosNotification"=.\orbsvcs\orbsvcs\CosNotification.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -282,7 +282,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "CosProperty"=".\orbsvcs\orbsvcs\CosProperty.dsp" - Package Owner=<4>
+Project: "CosProperty"=.\orbsvcs\orbsvcs\CosProperty.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -306,7 +306,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "CosTime"=".\orbsvcs\orbsvcs\CosTime.dsp" - Package Owner=<4>
+Project: "CosTime"=.\orbsvcs\orbsvcs\CosTime.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -327,7 +327,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "CosTrading"=".\orbsvcs\orbsvcs\CosTrading.dsp" - Package Owner=<4>
+Project: "CosTrading"=.\orbsvcs\orbsvcs\CosTrading.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -354,7 +354,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Domain"=".\tao\Domain\TAO_Domain.dsp" - Package Owner=<4>
+Project: "Domain"=.\tao\Domain\TAO_Domain.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -372,7 +372,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "DsEventLogAdmin"=".\orbsvcs\orbsvcs\DsEventLogAdmin.dsp" - Package Owner=<4>
+Project: "DsEventLogAdmin"=.\orbsvcs\orbsvcs\DsEventLogAdmin.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -390,7 +390,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "DsLogAdmin"=".\orbsvcs\orbsvcs\DsLogAdmin.dsp" - Package Owner=<4>
+Project: "DsLogAdmin"=.\orbsvcs\orbsvcs\DsLogAdmin.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -411,7 +411,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "DsNotifyLogAdmin"=".\orbsvcs\orbsvcs\DsNotifyLogAdmin.dsp" - Package Owner=<4>
+Project: "DsNotifyLogAdmin"=.\orbsvcs\orbsvcs\DsNotifyLogAdmin.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -429,7 +429,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Dump_Schedule"=".\orbsvcs\Dump_Schedule\Dump_Schedule.dsp" - Package Owner=<4>
+Project: "Dump_Schedule"=.\orbsvcs\Dump_Schedule\Dump_Schedule.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -450,7 +450,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "DynamicAny"=".\tao\DynamicAny\TAO_DynamicAny.dsp" - Package Owner=<4>
+Project: "DynamicAny"=.\tao\DynamicAny\TAO_DynamicAny.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -465,7 +465,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "DynamicInterface"=".\tao\DynamicInterface\TAO_DynamicInterface.dsp" - Package Owner=<4>
+Project: "DynamicInterface"=.\tao\DynamicInterface\TAO_DynamicInterface.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -483,7 +483,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "ETCL DLL"=".\orbsvcs\orbsvcs\ETCL\ETCL.dsp" - Package Owner=<4>
+Project: "ETCL DLL"=.\orbsvcs\orbsvcs\ETCL\ETCL.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -498,7 +498,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Event_Service"=".\orbsvcs\Event_Service\Event_Service.dsp" - Package Owner=<4>
+Project: "Event_Service"=.\orbsvcs\Event_Service\Event_Service.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -528,7 +528,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "FT ORB"=".\orbsvcs\orbsvcs\FT_ORB.dsp" - Package Owner=<4>
+Project: "FT ORB"=.\orbsvcs\orbsvcs\FT_ORB.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -552,7 +552,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Fault Tolerance"=".\orbsvcs\orbsvcs\Fault_Tolerance.dsp" - Package Owner=<4>
+Project: "Fault Tolerance"=.\orbsvcs\orbsvcs\Fault_Tolerance.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -591,7 +591,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "IFRService"=".\orbsvcs\orbsvcs\IFRService.dsp" - Package Owner=<4>
+Project: "IFRService"=.\orbsvcs\orbsvcs\IFRService.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -618,7 +618,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "IFR_Client"=".\tao\IFR_Client\TAO_IFR_Client.dsp" - Package Owner=<4>
+Project: "IFR_Client"=.\tao\IFR_Client\TAO_IFR_Client.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -633,7 +633,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "IFR_Service"=".\orbsvcs\IFR_Service\IFR_Service.dsp" - Package Owner=<4>
+Project: "IFR_Service"=.\orbsvcs\IFR_Service\IFR_Service.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -648,7 +648,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "IORInterceptor"=".\tao\IORInterceptor\TAO_IORInterceptor.dsp" - Package Owner=<4>
+Project: "IORInterceptor"=.\tao\IORInterceptor\TAO_IORInterceptor.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -662,11 +662,14 @@ Package=<4>
     Begin Project Dependency
     Project_Dep_Name TAO DLL
     End Project Dependency
+    Begin Project Dependency
+    Project_Dep_Name Valuetype
+    End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "IORManip"=".\tao\IORManipulation\TAO_IORManip.dsp" - Package Owner=<4>
+Project: "IORManip"=.\tao\IORManipulation\TAO_IORManip.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -681,7 +684,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "IORTable"=".\tao\IORTable\TAO_IORTable.dsp" - Package Owner=<4>
+Project: "IORTable"=.\tao\IORTable\TAO_IORTable.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -696,7 +699,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "ImR_Activator"=".\orbsvcs\ImplRepo_Service\ImR_Activator.dsp" - Package Owner=<4>
+Project: "ImR_Activator"=.\orbsvcs\ImplRepo_Service\ImR_Activator.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -720,7 +723,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "ImplRepo_Service"=".\orbsvcs\ImplRepo_Service\implrepo.dsp" - Package Owner=<4>
+Project: "ImplRepo_Service"=.\orbsvcs\ImplRepo_Service\implrepo.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -753,7 +756,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "LifeCycle_Service"=".\orbsvcs\LifeCycle_Service\LifeCycle_Service.dsp" - Package Owner=<4>
+Project: "LifeCycle_Service"=.\orbsvcs\LifeCycle_Service\LifeCycle_Service.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -774,7 +777,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "LoadManager"=".\orbsvcs\LoadBalancer\LoadManager.dsp" - Package Owner=<4>
+Project: "LoadManager"=.\orbsvcs\LoadBalancer\LoadManager.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -789,7 +792,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "LoadMonitor"=".\orbsvcs\LoadBalancer\LoadMonitor.dsp" - Package Owner=<4>
+Project: "LoadMonitor"=.\orbsvcs\LoadBalancer\LoadMonitor.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -804,7 +807,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Messaging"=".\tao\Messaging\TAO_Messaging.dsp" - Package Owner=<4>
+Project: "Messaging"=.\tao\Messaging\TAO_Messaging.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -819,7 +822,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Metrics"=".\orbsvcs\orbsvcs\Metrics.dsp" - Package Owner=<4>
+Project: "Metrics"=.\orbsvcs\orbsvcs\Metrics.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -849,7 +852,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "NT_Naming_Service"=".\orbsvcs\Naming_Service\NT_Naming_Service.dsp" - Package Owner=<4>
+Project: "NT_Naming_Service"=.\orbsvcs\Naming_Service\NT_Naming_Service.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -864,7 +867,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Naming_Service"=".\orbsvcs\Naming_Service\Naming_Service.dsp" - Package Owner=<4>
+Project: "Naming_Service"=.\orbsvcs\Naming_Service\Naming_Service.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -879,7 +882,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Notify_Service"=".\orbsvcs\Notify_Service\Notify_Service.dsp" - Package Owner=<4>
+Project: "Notify_Service"=.\orbsvcs\Notify_Service\Notify_Service.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -897,7 +900,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "ObjRefTemplate"=".\tao\ObjRefTemplate\TAO_ObjRefTemplate.dsp" - Package Owner=<4>
+Project: "ObjRefTemplate"=.\tao\ObjRefTemplate\TAO_ObjRefTemplate.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -915,7 +918,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "PortableGroup"=".\orbsvcs\orbsvcs\PortableGroup.dsp" - Package Owner=<4>
+Project: "PortableGroup"=.\orbsvcs\orbsvcs\PortableGroup.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -936,7 +939,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "PortableServer"=".\tao\PortableServer\TAO_PortableServer.dsp" - Package Owner=<4>
+Project: "PortableServer"=.\tao\PortableServer\TAO_PortableServer.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -957,7 +960,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "RTCORBA"=".\tao\RTCORBA\TAO_RTCORBA.dsp" - Package Owner=<4>
+Project: "RTCORBA"=.\tao\RTCORBA\TAO_RTCORBA.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -972,7 +975,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "RTCORBAEvent"=".\orbsvcs\orbsvcs\RTCORBAEvent.dsp" - Package Owner=<4>
+Project: "RTCORBAEvent"=.\orbsvcs\orbsvcs\RTCORBAEvent.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -996,7 +999,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "RTEvent"=".\orbsvcs\orbsvcs\RTEvent.dsp" - Package Owner=<4>
+Project: "RTEvent"=.\orbsvcs\orbsvcs\RTEvent.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1026,7 +1029,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "RTEventLog"=".\orbsvcs\orbsvcs\RTEventLog.dsp" - Package Owner=<4>
+Project: "RTEventLog"=.\orbsvcs\orbsvcs\RTEventLog.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1047,7 +1050,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "RTOLDEvent"=".\orbsvcs\orbsvcs\RTOLDEvent.dsp" - Package Owner=<4>
+Project: "RTOLDEvent"=.\orbsvcs\orbsvcs\RTOLDEvent.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1071,7 +1074,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "RTPortableServer"=".\tao\RTPortableServer\TAO_RTPortableServer.dsp" - Package Owner=<4>
+Project: "RTPortableServer"=.\tao\RTPortableServer\TAO_RTPortableServer.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1092,7 +1095,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "RTSched"=".\orbsvcs\orbsvcs\RTSched.dsp" - Package Owner=<4>
+Project: "RTSched"=.\orbsvcs\orbsvcs\RTSched.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1116,7 +1119,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "RTSchedEvent"=".\orbsvcs\orbsvcs\RTSchedEvent.dsp" - Package Owner=<4>
+Project: "RTSchedEvent"=.\orbsvcs\orbsvcs\RTSchedEvent.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1140,7 +1143,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "RTScheduler"=".\tao\RTScheduling\TAO_RTScheduler.dsp" - Package Owner=<4>
+Project: "RTScheduler"=.\tao\RTScheduling\TAO_RTScheduler.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1152,7 +1155,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "RT_Notification DLL"=".\orbsvcs\orbsvcs\RT_Notification.dsp" - Package Owner=<4>
+Project: "RT_Notification DLL"=.\orbsvcs\orbsvcs\RT_Notification.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1173,7 +1176,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "SSLIOP"=".\orbsvcs\orbsvcs\SSLIOP.dsp" - Package Owner=<4>
+Project: "SSLIOP"=.\orbsvcs\orbsvcs\SSLIOP.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1191,7 +1194,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Scheduling_Service"=".\orbsvcs\Scheduling_Service\Scheduling_Service.dsp" - Package Owner=<4>
+Project: "Scheduling_Service"=.\orbsvcs\Scheduling_Service\Scheduling_Service.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1209,7 +1212,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Security"=".\orbsvcs\orbsvcs\Security.dsp" - Package Owner=<4>
+Project: "Security"=.\orbsvcs\orbsvcs\Security.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1230,7 +1233,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "SmartProxies"=".\tao\SmartProxies\SmartProxies.dsp" - Package Owner=<4>
+Project: "SmartProxies"=.\tao\SmartProxies\SmartProxies.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1245,7 +1248,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Svc Utils"=".\orbsvcs\orbsvcs\Svc_Utils.dsp" - Package Owner=<4>
+Project: "Svc Utils"=.\orbsvcs\orbsvcs\Svc_Utils.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1266,7 +1269,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "TAO DLL"=".\tao\TAO.dsp" - Package Owner=<4>
+Project: "TAO DLL"=.\tao\TAO.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1281,7 +1284,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "TAO_IDL Compiler"=".\TAO_IDL\tao_idl.dsp" - Package Owner=<4>
+Project: "TAO_IDL Compiler"=.\TAO_IDL\tao_idl.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1299,7 +1302,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "TAO_IDL_BE_DLL"=".\TAO_IDL\TAO_IDL_BE_DLL.dsp" - Package Owner=<4>
+Project: "TAO_IDL_BE_DLL"=.\TAO_IDL\TAO_IDL_BE_DLL.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1314,7 +1317,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "TAO_IDL_FE_DLL"=".\TAO_IDL\TAO_IDL_FE_DLL.dsp" - Package Owner=<4>
+Project: "TAO_IDL_FE_DLL"=.\TAO_IDL\TAO_IDL_FE_DLL.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1332,7 +1335,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "TAO_IFR_BE_DLL"=".\orbsvcs\IFR_Service\TAO_IFR_BE_DLL.dsp" - Package Owner=<4>
+Project: "TAO_IFR_BE_DLL"=.\orbsvcs\IFR_Service\TAO_IFR_BE_DLL.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1350,7 +1353,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "TAO_Strategies"=".\tao\Strategies\TAO_Strategies.dsp" - Package Owner=<4>
+Project: "TAO_Strategies"=.\tao\Strategies\TAO_Strategies.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1365,7 +1368,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Trading_Service"=".\orbsvcs\Trading_Service\Trading_Service.dsp" - Package Owner=<4>
+Project: "Trading_Service"=.\orbsvcs\Trading_Service\Trading_Service.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1386,7 +1389,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "TypeCodeFactory"=".\tao\TypeCodeFactory\TypeCodeFactory.dsp" - Package Owner=<4>
+Project: "TypeCodeFactory"=.\tao\TypeCodeFactory\TypeCodeFactory.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1401,7 +1404,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "Valuetype"=".\tao\Valuetype\TAO_Valuetype.dsp" - Package Owner=<4>
+Project: "Valuetype"=.\tao\Valuetype\TAO_Valuetype.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1416,7 +1419,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "gperf"="..\apps\gperf\src\gperf.dsp" - Package Owner=<4>
+Project: "gperf"=..\apps\gperf\src\gperf.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1434,7 +1437,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "tao_ifr"=".\orbsvcs\IFR_Service\tao_ifr.dsp" - Package Owner=<4>
+Project: "tao_ifr"=.\orbsvcs\IFR_Service\tao_ifr.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -1452,7 +1455,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "tao_imr"=".\orbsvcs\ImplRepo_Service\tao_imr.dsp" - Package Owner=<4>
+Project: "tao_imr"=.\orbsvcs\ImplRepo_Service\tao_imr.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index 85ee91fa7c1..e88a78f3114 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -1396,6 +1396,8 @@ TAO_CodeGen::gen_skel_src_includes (void)
                               "tao/Stub.h");
   this->gen_standard_include (this->server_skeletons_,
                               "tao/IFR_Client_Adapter.h");
+  this->gen_standard_include (this->server_skeletons_,
+                              "tao/Object_T.h");
 
   if (be_global->gen_thru_poa_collocation () 
       || be_global->gen_direct_collocation ())
@@ -1403,13 +1405,6 @@ TAO_CodeGen::gen_skel_src_includes (void)
       this->gen_arg_file_includes (this->server_skeletons_);
     }
 
-  // Need _unchecked_narrow () for reply handler _this() method.
-  if (be_global->ami_call_back () == I_TRUE)
-    {
-      this->gen_standard_include (this->server_skeletons_,
-                                  "tao/Object_T.h");
-    }
-
   // The following header must always be included.
   this->gen_standard_include (this->server_skeletons_,
                               "tao/PortableInterceptor.h");
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
index cdb88b24344..7e5a2d3b553 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
@@ -51,6 +51,13 @@ be_visitor_interface_ci::visit_interface (be_interface *node)
                          "codegen for scope failed\n"), -1);
     }
 
+  // Nothing to generate for a local interface except from it scope.
+  if (node->is_local ())
+    {
+      node->cli_inline_gen (I_TRUE);
+      return 0;
+    }
+
   // A forward declared interface may have set this flag.
   if (node->cli_inline_gen ())
     {
diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.h b/TAO/tao/IORInterceptor/IORInterceptorC.h
index 19ca9da9274..77e36171b87 100644
--- a/TAO/tao/IORInterceptor/IORInterceptorC.h
+++ b/TAO/tao/IORInterceptor/IORInterceptorC.h
@@ -381,6 +381,22 @@ namespace PortableInterceptor
 // Traits specializations.
 namespace TAO
 {
+  // Hand crafted. Not forward declared but used by PortableServer.
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_IORInterceptor_Export Objref_Traits<PortableInterceptor::IORInfo>
+  {
+    static PortableInterceptor::IORInfo_ptr tao_duplicate (
+        PortableInterceptor::IORInfo_ptr
+      );
+    static void tao_release (
+        PortableInterceptor::IORInfo_ptr
+      );
+    static PortableInterceptor::IORInfo_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
+        PortableInterceptor::IORInfo_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
 };
 
 // TAO_IDL - Generated from
diff --git a/TAO/tao/IORInterceptor/TAO_IORInterceptor.dsp b/TAO/tao/IORInterceptor/TAO_IORInterceptor.dsp
index a7ca48ac023..b276c2f0ef0 100644
--- a/TAO/tao/IORInterceptor/TAO_IORInterceptor.dsp
+++ b/TAO/tao/IORInterceptor/TAO_IORInterceptor.dsp
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 ace.lib TAO.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_IORInterceptor.dll" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 TAO_Valuetype.lib TAO.lib ace.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\TAO_IORInterceptor.dll" /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
 
 !ELSEIF  "$(CFG)" == "IORInterceptor - Win32 Debug"
 
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_IORInterceptord.dll" /pdbtype:sept /libpath:"..\..\tao" /libpath:"..\..\..\ace"
+# ADD LINK32 TAO_Valuetyped.lib TAOd.lib aced.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\TAO_IORInterceptord.dll" /pdbtype:sept /libpath:"..\..\tao\Valuetype" /libpath:"..\..\tao" /libpath:"..\..\..\ace"
 
 !ENDIF 
 
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index c52d5568c50..8d291aa9fe5 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -1861,12 +1861,12 @@ namespace PortableInterceptor
 // Traits specializations.
 namespace TAO
 {
-
+// Hand crafted. Remove export flag.
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits<PortableInterceptor::IORInterceptor>
+  struct Objref_Traits<PortableInterceptor::IORInterceptor>
   {
     static PortableInterceptor::IORInterceptor_ptr tao_duplicate (
         PortableInterceptor::IORInterceptor_ptr
@@ -1882,6 +1882,40 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
+
+  // Hand crafted. These are not forward declared, but used by PortableServer.
+
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_Export Objref_Traits<PortableInterceptor::ORBInitializer>
+  {
+    static PortableInterceptor::ORBInitializer_ptr tao_duplicate (
+        PortableInterceptor::ORBInitializer_ptr
+      );
+    static void tao_release (
+        PortableInterceptor::ORBInitializer_ptr
+      );
+    static PortableInterceptor::ORBInitializer_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
+        PortableInterceptor::ORBInitializer_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_Export Objref_Traits<PortableInterceptor::PolicyFactory>
+  {
+    static PortableInterceptor::PolicyFactory_ptr tao_duplicate (
+        PortableInterceptor::PolicyFactory_ptr
+      );
+    static void tao_release (
+        PortableInterceptor::PolicyFactory_ptr
+      );
+    static PortableInterceptor::PolicyFactory_ptr tao_nil (void);
+    static CORBA::Boolean tao_marshal (
+        PortableInterceptor::PolicyFactory_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
 };
 
 // TAO_IDL - Generated from
diff --git a/TAO/tao/PortableServer/Default_ORT.pidl b/TAO/tao/PortableServer/Default_ORT.pidl
index 365933d6c21..eaa6a5ebb8d 100644
--- a/TAO/tao/PortableServer/Default_ORT.pidl
+++ b/TAO/tao/PortableServer/Default_ORT.pidl
@@ -10,7 +10,10 @@
  * command:
  *
  *   tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1
+ *        -o orig -Ge 1 -GT
+ *        -I../..
+ *        -Wb,export_macro=TAO_PortableServer_Export \
+ *        -Wb,export_include="portableserver_export.h" \
  *        -Wb,pre_include="ace/pre.h"
  *        -Wb,post_include="ace/post.h"
  *        Default_ORT.pidl
@@ -35,12 +38,14 @@
 #ifndef TAO_DEFAULT_ORT_PIDL
 #define TAO_DEFAULT_ORT_PIDL
 
-#include <ObjectReferenceTemplate.pidl>
+#include <tao/ObjRefTemplate/ObjectReferenceTemplate.pidl>
 
 module TAO_Default_ORT
 {
   valuetype ObjectReferenceTemplate
-    : PortableInterceptor::ObjectReferenceTemplate {};
+    : PortableInterceptor::ObjectReferenceTemplate 
+  {
+  };
 };
 
 #endif /* TAO_DEFAULT_ORT_PIDL */
diff --git a/TAO/tao/PortableServer/Default_ORTC.cpp b/TAO/tao/PortableServer/Default_ORTC.cpp
index 1ffa0bb6ae3..2b3b7514301 100644
--- a/TAO/tao/PortableServer/Default_ORTC.cpp
+++ b/TAO/tao/PortableServer/Default_ORTC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:314
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:301
 
 
 #include "Default_ORTC.h"
@@ -42,30 +42,38 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59
+
+// Arg traits specializations.
+namespace TAO
+{
+};
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_TAO_Default_ORT_ObjectReferenceTemplate[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x54414f5f),
-  ACE_NTOHL (0x44656661),
-  ACE_NTOHL (0x756c745f),
-  ACE_NTOHL (0x4f52542f),
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
-  ACE_NTOHL (0x6174653a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x44656661), 
+  ACE_NTOHL (0x756c745f), 
+  ACE_NTOHL (0x4f52542f), 
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
+  ACE_NTOHL (0x6174653a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:TAO_Default_ORT/ObjectReferenceTemplate:1.0
     24,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63745265),
-  ACE_NTOHL (0x66657265),
-  ACE_NTOHL (0x6e636554),
-  ACE_NTOHL (0x656d706c),
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63745265), 
+  ACE_NTOHL (0x66657265), 
+  ACE_NTOHL (0x6e636554), 
+  ACE_NTOHL (0x656d706c), 
   ACE_NTOHL (0x61746500),  // name = ObjectReferenceTemplate
     0, // value modifier
   CORBA::tk_null, // no stateful base valuetype
@@ -81,41 +89,30 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_Default_ORT_ObjectReferenceTemplate (
     sizeof (TAO_Default_ORT::ObjectReferenceTemplate)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (TAO_Default_ORT)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ObjectReferenceTemplate,
-    &_tc_TAO_tc_TAO_Default_ORT_ObjectReferenceTemplate
-  )
-TAO_NAMESPACE_END
+namespace TAO_Default_ORT
+{
+  ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate =
+    &_tc_TAO_tc_TAO_Default_ORT_ObjectReferenceTemplate;
+}
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/valuetype_cs.cpp:94
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_cs.cpp:94
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Value_Var_T<
-        TAO_Default_ORT::ObjectReferenceTemplate,
-        TAO_Default_ORT::tao_ObjectReferenceTemplate_life
-      >;
-  template class
-    TAO_Value_Out_T<
-        TAO_Default_ORT::ObjectReferenceTemplate,
-        TAO_Default_ORT::tao_ObjectReferenceTemplate_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Value_Var_T< \
-        TAO_Default_ORT::ObjectReferenceTemplate, \
-        TAO_Default_ORT::tao_ObjectReferenceTemplate_life \
-      >
-# pragma instantiate \
-    TAO_Value_Out_T< \
-        TAO_Default_ORT::ObjectReferenceTemplate, \
-        TAO_Default_ORT::tao_ObjectReferenceTemplate_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+void
+TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::tao_add_ref (
+    TAO_Default_ORT::ObjectReferenceTemplate * p
+  )
+{
+  CORBA::add_ref (p);
+}
+
+void
+TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>::tao_remove_ref (
+    TAO_Default_ORT::ObjectReferenceTemplate * p
+  )
+{
+  CORBA::remove_ref (p);
+}
 
 TAO_Default_ORT::ObjectReferenceTemplate *
 TAO_Default_ORT::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v)
@@ -145,9 +142,9 @@ TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_narrow (ptrdiff_t type_id)
     {
       return this;
     }
-
+  
   void *rval = 0;
-
+  
   if (rval == 0)
     {
 #if defined (_MSC_VER)
@@ -156,7 +153,7 @@ TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_narrow (ptrdiff_t type_id)
       rval = this->PortableInterceptor::ObjectReferenceTemplate::_tao_obv_narrow (type_id);
 #endif /* _MSC_VER */
     }
-
+  
   return rval;
 }
 
@@ -171,12 +168,12 @@ TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_narrow (ptrdiff_t type_id)
 void
 TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ObjectReferenceTemplate *tmp =
+  ObjectReferenceTemplate *_tao_tmp_pointer =
     ACE_static_cast (
         ObjectReferenceTemplate *,
         _tao_void_pointer
       );
-  delete tmp;
+  CORBA::remove_ref (_tao_tmp_pointer);
 }
 
 CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal_v (TAO_OutputCDR & strm)
@@ -203,29 +200,29 @@ CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal (
         base,
         ObjectReferenceTemplate::_tao_obv_static_repository_id ()
       );
-
+  
   if (retval == 0)
     {
       return 0;
     }
-
+  
   if (factory.in () != 0)
     {
       base = factory->create_for_unmarshal ();
-
+      
       if (base == 0)
         {
           return 0;  // %! except.?
         }
-
+      
       retval = base->_tao_unmarshal_v (strm);
-
+      
       if (retval == 0)
         {
           return 0;
         }
     }
-
+  
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ObjectReferenceTemplate::_downcast (base);
@@ -233,7 +230,10 @@ CORBA::Boolean TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/valuetype_obv_cs.cpp:58
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_obv_cs.cpp:58
+
+OBV_TAO_Default_ORT::ObjectReferenceTemplate::ObjectReferenceTemplate (void)
+{}
 
 OBV_TAO_Default_ORT::ObjectReferenceTemplate::~ObjectReferenceTemplate (void)
 {}
@@ -251,7 +251,7 @@ OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal__TAO_Default_ORT_Ob
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/any_op_cs.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_cs.cpp:57
 
 // Copying insertion.
 void
@@ -294,15 +294,21 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#  pragma instantiate TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>::to_value (
+    CORBA::ValueBase *&_tao_elem
+  ) const
+{
+  CORBA::add_ref (this->value_);
+  _tao_elem = this->value_;
+  return 1;
+}
+
+
 
 // TAO_IDL - Generated from
-// be/be_valuetype.cpp:245
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:263
 
 void
 CORBA::add_ref (TAO_Default_ORT::ObjectReferenceTemplate * vt)
@@ -323,7 +329,7 @@ CORBA::remove_ref (TAO_Default_ORT::ObjectReferenceTemplate * vt)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/cdr_op_cs.cpp:73
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_cs.cpp:73
 
 CORBA::Boolean
 operator<< (
@@ -352,7 +358,7 @@ operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/marshal_cs.cpp:44
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/marshal_cs.cpp:44
 
 CORBA::Boolean
 OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_marshal_state (TAO_OutputCDR &)
@@ -383,3 +389,103 @@ OBV_TAO_Default_ORT::ObjectReferenceTemplate::_tao_unmarshal_state (TAO_InputCDR
       return 0;
     }
 }
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1703
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        CORBA::SetOverrideType
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        CORBA::PolicyError
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        CORBA::InvalidPolicies
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        CORBA::TCKind
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        CORBA::exception_type
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        CORBA::ParameterMode
+      >;  template class
+    TAO_Value_Var_T<
+        TAO_Default_ORT::ObjectReferenceTemplate,
+        TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>
+      >;
+  
+  template class
+    TAO_Value_Out_T<
+        TAO_Default_ORT::ObjectReferenceTemplate,
+        TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        TAO_Default_ORT::ObjectReferenceTemplate
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        CORBA::SetOverrideType \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        CORBA::PolicyError \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        CORBA::InvalidPolicies \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        CORBA::TCKind \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        CORBA::exception_type \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        CORBA::ParameterMode \
+      ># pragma instantiate \
+    TAO_Value_Var_T< \
+        TAO_Default_ORT::ObjectReferenceTemplate, \
+        TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate> \
+      >
+  
+# pragma instantiate \
+    TAO_Value_Out_T< \
+        TAO_Default_ORT::ObjectReferenceTemplate, \
+        TAO::Value_Traits<TAO_Default_ORT::ObjectReferenceTemplate> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        TAO_Default_ORT::ObjectReferenceTemplate \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/PortableServer/Default_ORTC.h b/TAO/tao/PortableServer/Default_ORTC.h
index 5afa9a11388..e1e134d5a0f 100644
--- a/TAO/tao/PortableServer/Default_ORTC.h
+++ b/TAO/tao/PortableServer/Default_ORTC.h
@@ -1,6 +1,7 @@
 // -*- C++ -*-
 //
 // $Id$
+
 // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
 // TAO and the TAO IDL Compiler have been developed by:
 //       Center for Distributed Object Computing
@@ -25,12 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:151
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
 
 #ifndef _TAO_IDL_ORIG_DEFAULT_ORTC_H_
 #define _TAO_IDL_ORIG_DEFAULT_ORTC_H_
+
 #include /**/ "ace/pre.h"
-#include "portableserver_export.h"
 
 #include "tao/ObjRefTemplate/ObjectReferenceTemplateC.h"
 
@@ -38,6 +39,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "portableserver_export.h"
+
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
@@ -61,29 +64,37 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:48
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_ch.cpp:63
 
-TAO_NAMESPACE  TAO_Default_ORT
+namespace TAO
 {
+  class Collocation_Proxy_Broker;
+  
+  template<typename T> class Narrow_Utils;
+}
 
-  // TAO_IDL - Generated from
-  // be/be_valuetype.cpp:282
-
-
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
 
-#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__ODDS_N_ENDS_CH_)
-#define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__ODDS_N_ENDS_CH_
+namespace TAO_Default_ORT
+{
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:300
+  
+  
 
+#if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_)
+#define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE__VAR_OUT_CH_
+  
   class ObjectReferenceTemplate;
-  struct tao_ObjectReferenceTemplate_life;
-
   typedef
     TAO_Value_Var_T<
         ObjectReferenceTemplate
       >
     ObjectReferenceTemplate_var;
-
+  
   typedef
     TAO_Value_Out_T<
         ObjectReferenceTemplate
@@ -91,13 +102,13 @@ TAO_NAMESPACE  TAO_Default_ORT
     ObjectReferenceTemplate_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_valuetype/valuetype_ch.cpp:56
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:56
 
 #if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE_CH_)
 #define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE_CH_
-
+  
   class TAO_PortableServer_Export ObjectReferenceTemplate
     : public virtual PortableInterceptor::ObjectReferenceTemplate
   {
@@ -113,12 +124,12 @@ TAO_NAMESPACE  TAO_Default_ORT
       );
     virtual const char* _tao_obv_repository_id (void) const;
     static const char* _tao_obv_static_repository_id (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_valuetype/valuetype_ch.cpp:272
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ch.cpp:275
+  
   protected:
     ObjectReferenceTemplate (void);
     virtual ~ObjectReferenceTemplate (void);
@@ -129,99 +140,104 @@ TAO_NAMESPACE  TAO_Default_ORT
 #endif /* _MSC_VER */
     virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &);
     virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &);
-
+    
   private:
     ObjectReferenceTemplate (const ObjectReferenceTemplate &);
     void operator= (const ObjectReferenceTemplate &);
-
+    
   protected:
     virtual CORBA::Boolean _tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &) = 0;
     virtual CORBA::Boolean _tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &) = 0;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectReferenceTemplate;
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66
 
-}
-TAO_NAMESPACE_CLOSE // module TAO_Default_ORT
+} // module TAO_Default_ORT
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/obv_module.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/obv_module.cpp:55
 
-TAO_NAMESPACE  OBV_TAO_Default_ORT
+namespace OBV_TAO_Default_ORT
 {
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_valuetype/valuetype_obv_ch.cpp:58
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_obv_ch.cpp:58
 
 #if !defined (_TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OBV_CH_)
 #define _TAO_DEFAULT_ORT_OBJECTREFERENCETEMPLATE___OBV_CH_
-
+  
   // OBV_ class
   class TAO_PortableServer_Export ObjectReferenceTemplate
     : public virtual TAO_Default_ORT::ObjectReferenceTemplate
   {
   public:
+    
+  protected:
+    ObjectReferenceTemplate (void);
     virtual ~ObjectReferenceTemplate (void);
-
+    
   protected:
     virtual CORBA::Boolean _tao_marshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_OutputCDR &);
     virtual CORBA::Boolean _tao_unmarshal__TAO_Default_ORT_ObjectReferenceTemplate (TAO_InputCDR &);
     CORBA::Boolean _tao_marshal_state (TAO_OutputCDR &);
     CORBA::Boolean _tao_unmarshal_state (TAO_InputCDR &);
-
+  
   private:
   };
 
 #endif /* end #if !defined */
+}
 
-  // TAO_IDL - Generated from
-  // be/be_visitor_valuetype/obv_module.cpp:85
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48
 
-}TAO_NAMESPACE_CLOSE
+// Traits specializations.
+namespace TAO
+{
+};
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/any_op_ch.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/any_op_ch.cpp:54
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate *); // copying
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate **); // non-copying
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:48
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
 // TAO_IDL - Generated from
-// be/be_valuetype.cpp:187
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:207
 
-TAO_NAMESPACE CORBA
+namespace CORBA
 {
   TAO_NAMESPACE_STORAGE_CLASS void add_ref (TAO_Default_ORT::ObjectReferenceTemplate *);
   TAO_NAMESPACE_STORAGE_CLASS void remove_ref (TAO_Default_ORT::ObjectReferenceTemplate *);
 }
-TAO_NAMESPACE_CLOSE
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/cdr_op_ch.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_ch.cpp:61
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_Default_ORT::ObjectReferenceTemplate *);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default_ORT::ObjectReferenceTemplate *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:64
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:1018
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:926
 
 #if defined (__ACE_INLINE__)
 #include "Default_ORTC.i"
@@ -237,3 +253,4 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/PortableServer/Default_ORTC.i b/TAO/tao/PortableServer/Default_ORTC.i
index e0ae389356f..efc6e0b5086 100644
--- a/TAO/tao/PortableServer/Default_ORTC.i
+++ b/TAO/tao/PortableServer/Default_ORTC.i
@@ -27,7 +27,7 @@
 
 
 // TAO_IDL - Generated from 
-// be/be_visitor_valuetype/valuetype_ci.cpp:56
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/valuetype_ci.cpp:56
 
 ACE_INLINE
 TAO_Default_ORT::ObjectReferenceTemplate::ObjectReferenceTemplate (void)
@@ -43,34 +43,21 @@ TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_static_repository_id ()
   return "IDL:TAO_Default_ORT/ObjectReferenceTemplate:1.0";
 }
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<TAO_Default_ORT::ObjectReferenceTemplate>::to_value (
-    CORBA::ValueBase *&_tao_elem
-  ) const
-{
-  CORBA::add_ref (this->value_);
-  _tao_elem = this->value_;
-  return 1;
-}
-
 // TAO_IDL - Generated from
-// be/be_valuetype.cpp:217
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_valuetype.cpp:236
 
 #if defined (__ACE_INLINE__)
 
-TAO_NAMESPACE CORBA
+namespace CORBA
 {
   TAO_NAMESPACE_STORAGE_CLASS void add_ref (TAO_Default_ORT::ObjectReferenceTemplate *);
   TAO_NAMESPACE_STORAGE_CLASS void remove_ref (TAO_Default_ORT::ObjectReferenceTemplate *);
 }
-TAO_NAMESPACE_CLOSE
 
 #endif /*__ACE_INLINE__*/
 
 // TAO_IDL - Generated from
-// be/be_visitor_valuetype/cdr_op_ci.cpp:60
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_valuetype/cdr_op_ci.cpp:60
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_Default_ORT::ObjectReferenceTemplate *);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default_ORT::ObjectReferenceTemplate *&);
diff --git a/TAO/tao/PortableServer/ImR_Activator.pidl b/TAO/tao/PortableServer/ImR_Activator.pidl
index 3b25a5204dc..20ced40f70a 100644
--- a/TAO/tao/PortableServer/ImR_Activator.pidl
+++ b/TAO/tao/PortableServer/ImR_Activator.pidl
@@ -11,14 +11,14 @@
  * The command used to generate code from this file is:
  *
  *   tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1
+ *        -o orig -Gp -Gd -Ge 1 -GT
  *        -Wb,export_macro=TAO_PortableServer_Export
  *        -Wb,export_include=portableserver_export.h
  *        -Wb,pre_include="ace/pre.h"
  *        -Wb,post_include="ace/post.h"
  *        ImR_Activator.pidl
  *
- * after the file is generated a patch must be applied. T he patch
+ * after the file is generated a patch must be applied. The patch
  * disables the code under certain configurations, and eliminates
  * cycles in the include dependencies.
  * Those changes are required because the generated code is part of
diff --git a/TAO/tao/PortableServer/ImR_ActivatorS.h b/TAO/tao/PortableServer/ImR_ActivatorS.h
index 227c937c1dc..1c00439665a 100644
--- a/TAO/tao/PortableServer/ImR_ActivatorS.h
+++ b/TAO/tao/PortableServer/ImR_ActivatorS.h
@@ -15,6 +15,12 @@
 //       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
diff --git a/TAO/tao/PortableServer/ImR_ActivatorS_T.h b/TAO/tao/PortableServer/ImR_ActivatorS_T.h
index 5b8777806c4..d569fd450c1 100644
--- a/TAO/tao/PortableServer/ImR_ActivatorS_T.h
+++ b/TAO/tao/PortableServer/ImR_ActivatorS_T.h
@@ -15,6 +15,12 @@
 //       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
diff --git a/TAO/tao/PortableServer/ImR_Locator.pidl b/TAO/tao/PortableServer/ImR_Locator.pidl
index 597fbc37e36..9d778f8f32c 100644
--- a/TAO/tao/PortableServer/ImR_Locator.pidl
+++ b/TAO/tao/PortableServer/ImR_Locator.pidl
@@ -11,7 +11,7 @@
  * The command used to generate code from this file is:
  *
  *   tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1
+ *        -o orig -Gp -Gd -Ge 1 -GT
  *        -Wb,export_macro=TAO_PortableServer_Export
  *        -Wb,export_include=portableserver_export.h
  *        -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/PortableServer/ImR_LocatorC.cpp b/TAO/tao/PortableServer/ImR_LocatorC.cpp
index b0471e1e493..dffe5475b9c 100644
--- a/TAO/tao/PortableServer/ImR_LocatorC.cpp
+++ b/TAO/tao/PortableServer/ImR_LocatorC.cpp
@@ -26,20 +26,19 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:314
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:301
 
 
 #include "ImR_LocatorC.h"
 #include "tao/Stub.h"
-#include "tao/Invocation.h"
-#include "tao/PortableInterceptor.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
-#include "tao/ClientRequestInfo_i.h"
-#include "tao/ClientInterceptorAdapter.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
+#include "tao/Invocation_Adapter.h"
+#include "tao/Object_T.h"
+#include "tao/Any_Impl_T.h"
+#include "tao/Any_Dual_Impl_T.h"
+#include "tao/Any_Basic_Impl_T.h"
+#include "tao/Basic_Arguments.h"
+#include "tao/Object_Argument_T.h"
+#include "tao/UB_String_Arguments.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -50,746 +49,59 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:57
-
-int ImplementationRepository::Locator::_tao_class_id = 0;
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        ImplementationRepository::Locator,
-        ImplementationRepository::tao_Locator_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        ImplementationRepository::Locator,
-        ImplementationRepository::tao_Locator_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        ImplementationRepository::Locator, \
-        ImplementationRepository::tao_Locator_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        ImplementationRepository::Locator, \
-        ImplementationRepository::tao_Locator_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
-
-class TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location : public TAO_ClientRequestInfo_i
-{
-public:
-  TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * server,
-      const char * location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location (const TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location &);
-    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location &);
-    const char * server_;
-    const char * location_;
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:376
-  
-  TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location::TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * server,
-      const char * location
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-      server_ (server),
-      location_ (location)
-{}
-
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  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 ();
-}
-
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  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[] = 
-  {
-    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> tcp_object (&tcp, 1);
-      (*exception_list)[i] = tcp_object;
-    }
-
-  return safe_exception_list._retn ();
-}
-
-CORBA::Any * 
-TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
-
-class TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location : public TAO_ClientRequestInfo_i
-{
-public:
-  TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * server,
-      const char * location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location (const TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location &);
-    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location &);
-    const char * server_;
-    const char * location_;
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:376
-  
-  TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location::TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * server,
-      const char * location
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-      server_ (server),
-      location_ (location)
-{}
-
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  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 ();
-}
-
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  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[] = 
-  {
-    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> tcp_object (&tcp, 1);
-      (*exception_list)[i] = tcp_object;
-    }
-
-  return safe_exception_list._retn ();
-}
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59
 
-CORBA::Any * 
-TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+// Arg traits specializations.
+namespace TAO
 {
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-
+};
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-class TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location : public TAO_ClientRequestInfo_i
-{
-public:
-  TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * server,
-      const char * location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location (const TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location &);
-    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location &);
-    const char * server_;
-    const char * location_;
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:376
-  
-  TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location::TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * server,
-      const char * location
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-      server_ (server),
-      location_ (location)
-{}
-
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  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 ();
-}
-
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  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[] = 
-  {
-    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> tcp_object (&tcp, 1);
-      (*exception_list)[i] = tcp_object;
-    }
-
-  return safe_exception_list._retn ();
-}
-
-CORBA::Any * 
-TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
-
-class TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location : public TAO_ClientRequestInfo_i
-{
-public:
-  TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * server,
-      const char * location
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location (const TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location &);
-    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location &);
-    const char * server_;
-    const char * location_;
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:376
-  
-  TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location::TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * server,
-      const char * location
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-      server_ (server),
-      location_ (location)
-{}
-
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  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 ();
-}
-
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  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[] = 
-  {
-    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> tcp_object (&tcp, 1);
-      (*exception_list)[i] = tcp_object;
-    }
-
-  return safe_exception_list._retn ();
-}
-
-CORBA::Any * 
-TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
-
-class TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator : public TAO_ClientRequestInfo_i
-{
-public:
-  TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * location,
-      CORBA::Object_ptr object_ref
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    void result (::CORBA::ULong result);
-    
-  private:
-    TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator (const TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator &);
-    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator &);
-    const char * location_;
-    CORBA::Object_ptr object_ref_;
-    
-    ::CORBA::ULong _result;
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:376
-  
-  TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator::TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * location,
-      CORBA::Object_ptr object_ref
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-      location_ (location),
-      object_ref_ (object_ref)
-{}
-
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  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 ();
-}
-
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  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[] = 
-  {
-    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> tcp_object (&tcp, 1);
-      (*exception_list)[i] = tcp_object;
-    }
-
-  return safe_exception_list._retn ();
-}
-
-CORBA::Any * 
-TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  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 ();
-}
-
-void 
-TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator::result (CORBA::ULong result)
-{
-  // Update the result. 
-  this->_result = result;
-}
+// Traits specializations for ImplementationRepository::Locator.
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
-
-class TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator : public TAO_ClientRequestInfo_i
-{
-public:
-  TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * location,
-      CORBA::Object_ptr object_ref
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    void result (::CORBA::ULong result);
-    
-  private:
-    TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator (const TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator &);
-    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator &);
-    const char * location_;
-    CORBA::Object_ptr object_ref_;
-    
-    ::CORBA::ULong _result;
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:376
-  
-  TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator::TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * location,
-      CORBA::Object_ptr object_ref
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-      location_ (location),
-      object_ref_ (object_ref)
-{}
-
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+ImplementationRepository::Locator_ptr
+TAO::Objref_Traits<ImplementationRepository::Locator>::tao_duplicate (
+    ImplementationRepository::Locator_ptr p
+  )
 {
-  // Generate the argument list on demand.
-  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 ();
+  return ImplementationRepository::Locator::_duplicate (p);
 }
 
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+void
+TAO::Objref_Traits<ImplementationRepository::Locator>::tao_release (
+    ImplementationRepository::Locator_ptr p
+  )
 {
-  // Generate the exception list on demand.
-  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[] = 
-  {
-    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> tcp_object (&tcp, 1);
-      (*exception_list)[i] = tcp_object;
-    }
-
-  return safe_exception_list._retn ();
+  CORBA::release (p);
 }
 
-CORBA::Any * 
-TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+ImplementationRepository::Locator_ptr
+TAO::Objref_Traits<ImplementationRepository::Locator>::tao_nil (void)
 {
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  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 ();
+  return ImplementationRepository::Locator::_nil ();
 }
 
-void 
-TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator::result (CORBA::ULong result)
+CORBA::Boolean
+TAO::Objref_Traits<ImplementationRepository::Locator>::tao_marshal (
+    ImplementationRepository::Locator_ptr p,
+    TAO_OutputCDR & cdr
+  )
 {
-  // Update the result. 
-  this->_result = result;
+  return p->marshal (cdr);
 }
 
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
-
-///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
-//
-
-ImplementationRepository::_TAO_Locator_Proxy_Impl::_TAO_Locator_Proxy_Impl (void)
-{}
-
-ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::_TAO_Locator_Remote_Proxy_Impl (void)
-{}
-
-// Remote Implementation of the IDL interface methods
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker * 
+(*ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:78
 
-void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::activate_server_in_location (
-    CORBA::Object *_collocated_tao_target_,
+void ImplementationRepository::Locator::activate_server_in_location (
     const char * server,
     const char * location
     ACE_ENV_ARG_DECL
@@ -800,208 +112,66 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::activate_server_i
     , ImplementationRepository::CannotActivate
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Locator_activate_server_in_location_exceptiondata [] = 
-  {
-    {
-      "IDL:ImplementationRepository/NotFound:1.0",
-      ImplementationRepository::NotFound::_alloc
-    },
+  if (!this->is_evaluated ())
     {
-      "IDL:ImplementationRepository/CannotActivate:1.0",
-      ImplementationRepository::CannotActivate::_alloc
+      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  };
-
-TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
-  if (istub == 0)
+  if (this->the_TAO_Locator_Proxy_Broker_ == 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      ImplementationRepository_Locator_setup_collocation (
+          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
+        );
     }
-    
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "activate_server_in_location",
-      27,
-      2,
-      istub->orb_core ()
-    );
   
-  int _invoke_status;
+  TAO::Arg_Traits<void>::ret_val _tao_retval;
+  TAO::Arg_Traits<CORBA::Char *>::in_arg_val _tao_server (server);
+  TAO::Arg_Traits<ImplementationRepository::Address>::in_arg_val _tao_location (location);
   
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors (),
-      &_tao_call,
-      _invoke_status
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
+  TAO::Argument *_tao_signature [] =
+    {
+      &_tao_retval,
+      &_tao_server,
+      &_tao_location
+    };
   
-  for (;;)
+  static TAO_Exception_Data
+  _tao_ImplementationRepository_Locator_activate_server_in_location_exceptiondata [] = 
     {
-      _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_ImplementationRepository_Locator_activate_server_in_location _tao_ri (
-          &_tao_call,
-          _collocated_tao_target_,
-          server,
-          location
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      
-      ACE_TRY
-        {
-          _tao_vfr.send_request (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              _tao_call.restart_flag (1);
-            }
-          else
-            {
-              
-#endif /* TAO_HAS_INTERCEPTORS */
-              
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK;
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << server) &&
-                  (_tao_out << location)
-                  ))
-                {
-                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); 
-                  TAO_INTERCEPTOR_CHECK;
-
-                }
-              
-              _invoke_status =
-                _tao_call.invoke (_tao_ImplementationRepository_Locator_activate_server_in_location_exceptiondata, 2 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        )
-                    );
-                }
-              else if (_invoke_status == TAO_INVOKE_RESTART)
-                {
-                  _tao_call.restart_flag (1);
-                  TAO_INTERCEPTOR (
-                      _tao_ri.reply_status (_invoke_status);
-                      _tao_vfr.receive_other (
-                          &_tao_ri
-                          ACE_ENV_ARG_PARAMETER
-                        );
-                      ACE_TRY_CHECK;
-                    )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
-                  _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
-                      &_tao_ri
-                      ACE_ENV_ARG_PARAMETER
-                    );
-                  ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
-            }
-        }
-      ACE_CATCHANY
-        {
-          _tao_ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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;
-      
-      const PortableInterceptor::ReplyStatus _tao_status =
-        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      {
+        "IDL:ImplementationRepository/NotFound:1.0",
+        ImplementationRepository::NotFound::_alloc,
+        ImplementationRepository::_tc_NotFound
+      },
       
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
-#endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
-    }
+      {
+        "IDL:ImplementationRepository/CannotActivate:1.0",
+        ImplementationRepository::CannotActivate::_alloc,
+        ImplementationRepository::_tc_CannotActivate
+      }
+    };
+  
+  TAO::Invocation_Adapter _tao_call (
+      this,
+      _tao_signature,
+      3,
+      "activate_server_in_location",
+      27,
+      this->the_TAO_Locator_Proxy_Broker_
+    );
+  
+  _tao_call.invoke (
+      _tao_ImplementationRepository_Locator_activate_server_in_location_exceptiondata,
+      2
+      ACE_ENV_ARG_PARAMETER
+    );
+  ACE_CHECK;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:78
 
-void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::remove_server_in_location (
-    CORBA::Object *_collocated_tao_target_,
+void ImplementationRepository::Locator::remove_server_in_location (
     const char * server,
     const char * location
     ACE_ENV_ARG_DECL
@@ -1011,204 +181,60 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::remove_server_in_
     , ImplementationRepository::NotFound
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Locator_remove_server_in_location_exceptiondata [] = 
-  {
+  if (!this->is_evaluated ())
     {
-      "IDL:ImplementationRepository/NotFound:1.0",
-      ImplementationRepository::NotFound::_alloc
+      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  };
-
-TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
-  if (istub == 0)
+  if (this->the_TAO_Locator_Proxy_Broker_ == 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      ImplementationRepository_Locator_setup_collocation (
+          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
+        );
     }
-    
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
+  
+  TAO::Arg_Traits<void>::ret_val _tao_retval;
+  TAO::Arg_Traits<CORBA::Char *>::in_arg_val _tao_server (server);
+  TAO::Arg_Traits<ImplementationRepository::Address>::in_arg_val _tao_location (location);
+  
+  TAO::Argument *_tao_signature [] =
+    {
+      &_tao_retval,
+      &_tao_server,
+      &_tao_location
+    };
+  
+  static TAO_Exception_Data
+  _tao_ImplementationRepository_Locator_remove_server_in_location_exceptiondata [] = 
+    {
+      {
+        "IDL:ImplementationRepository/NotFound:1.0",
+        ImplementationRepository::NotFound::_alloc,
+        ImplementationRepository::_tc_NotFound
+      }
+    };
+  
+  TAO::Invocation_Adapter _tao_call (
+      this,
+      _tao_signature,
+      3,
       "remove_server_in_location",
       25,
-      2,
-      istub->orb_core ()
+      this->the_TAO_Locator_Proxy_Broker_
     );
   
-  int _invoke_status;
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors (),
-      &_tao_call,
-      _invoke_status
+  _tao_call.invoke (
+      _tao_ImplementationRepository_Locator_remove_server_in_location_exceptiondata,
+      1
+      ACE_ENV_ARG_PARAMETER
     );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_ImplementationRepository_Locator_remove_server_in_location _tao_ri (
-          &_tao_call,
-          _collocated_tao_target_,
-          server,
-          location
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      
-      ACE_TRY
-        {
-          _tao_vfr.send_request (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              _tao_call.restart_flag (1);
-            }
-          else
-            {
-              
-#endif /* TAO_HAS_INTERCEPTORS */
-              
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK;
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << server) &&
-                  (_tao_out << location)
-                  ))
-                {
-                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); 
-                  TAO_INTERCEPTOR_CHECK;
-
-                }
-              
-              _invoke_status =
-                _tao_call.invoke (_tao_ImplementationRepository_Locator_remove_server_in_location_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        )
-                    );
-                }
-              else if (_invoke_status == TAO_INVOKE_RESTART)
-                {
-                  _tao_call.restart_flag (1);
-                  TAO_INTERCEPTOR (
-                      _tao_ri.reply_status (_invoke_status);
-                      _tao_vfr.receive_other (
-                          &_tao_ri
-                          ACE_ENV_ARG_PARAMETER
-                        );
-                      ACE_TRY_CHECK;
-                    )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
-                  _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
-                      &_tao_ri
-                      ACE_ENV_ARG_PARAMETER
-                    );
-                  ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
-            }
-        }
-      ACE_CATCHANY
-        {
-          _tao_ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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;
-      
-      const PortableInterceptor::ReplyStatus _tao_status =
-        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
-#endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
-    }
+  ACE_CHECK;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:78
 
-void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::shutdown_server_in_location (
-    CORBA::Object *_collocated_tao_target_,
+void ImplementationRepository::Locator::shutdown_server_in_location (
     const char * server,
     const char * location
     ACE_ENV_ARG_DECL
@@ -1218,204 +244,60 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::shutdown_server_i
     , ImplementationRepository::NotFound
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Locator_shutdown_server_in_location_exceptiondata [] = 
-  {
+  if (!this->is_evaluated ())
     {
-      "IDL:ImplementationRepository/NotFound:1.0",
-      ImplementationRepository::NotFound::_alloc
+      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  };
-
-TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
-  if (istub == 0)
+  if (this->the_TAO_Locator_Proxy_Broker_ == 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      ImplementationRepository_Locator_setup_collocation (
+          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
+        );
     }
-    
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
+  
+  TAO::Arg_Traits<void>::ret_val _tao_retval;
+  TAO::Arg_Traits<CORBA::Char *>::in_arg_val _tao_server (server);
+  TAO::Arg_Traits<ImplementationRepository::Address>::in_arg_val _tao_location (location);
+  
+  TAO::Argument *_tao_signature [] =
+    {
+      &_tao_retval,
+      &_tao_server,
+      &_tao_location
+    };
+  
+  static TAO_Exception_Data
+  _tao_ImplementationRepository_Locator_shutdown_server_in_location_exceptiondata [] = 
+    {
+      {
+        "IDL:ImplementationRepository/NotFound:1.0",
+        ImplementationRepository::NotFound::_alloc,
+        ImplementationRepository::_tc_NotFound
+      }
+    };
+  
+  TAO::Invocation_Adapter _tao_call (
+      this,
+      _tao_signature,
+      3,
       "shutdown_server_in_location",
       27,
-      2,
-      istub->orb_core ()
+      this->the_TAO_Locator_Proxy_Broker_
     );
   
-  int _invoke_status;
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors (),
-      &_tao_call,
-      _invoke_status
+  _tao_call.invoke (
+      _tao_ImplementationRepository_Locator_shutdown_server_in_location_exceptiondata,
+      1
+      ACE_ENV_ARG_PARAMETER
     );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_ImplementationRepository_Locator_shutdown_server_in_location _tao_ri (
-          &_tao_call,
-          _collocated_tao_target_,
-          server,
-          location
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      
-      ACE_TRY
-        {
-          _tao_vfr.send_request (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              _tao_call.restart_flag (1);
-            }
-          else
-            {
-              
-#endif /* TAO_HAS_INTERCEPTORS */
-              
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK;
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << server) &&
-                  (_tao_out << location)
-                  ))
-                {
-                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); 
-                  TAO_INTERCEPTOR_CHECK;
-
-                }
-              
-              _invoke_status =
-                _tao_call.invoke (_tao_ImplementationRepository_Locator_shutdown_server_in_location_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        )
-                    );
-                }
-              else if (_invoke_status == TAO_INVOKE_RESTART)
-                {
-                  _tao_call.restart_flag (1);
-                  TAO_INTERCEPTOR (
-                      _tao_ri.reply_status (_invoke_status);
-                      _tao_vfr.receive_other (
-                          &_tao_ri
-                          ACE_ENV_ARG_PARAMETER
-                        );
-                      ACE_TRY_CHECK;
-                    )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
-                  _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
-                      &_tao_ri
-                      ACE_ENV_ARG_PARAMETER
-                    );
-                  ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
-            }
-        }
-      ACE_CATCHANY
-        {
-          _tao_ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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;
-      
-      const PortableInterceptor::ReplyStatus _tao_status =
-        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
-#endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
-    }
+  ACE_CHECK;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:78
 
-void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::server_is_shutting_down_in_location (
-    CORBA::Object *_collocated_tao_target_,
+void ImplementationRepository::Locator::server_is_shutting_down_in_location (
     const char * server,
     const char * location
     ACE_ENV_ARG_DECL
@@ -1425,204 +307,60 @@ void ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::server_is_shuttin
     , ImplementationRepository::NotFound
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Locator_server_is_shutting_down_in_location_exceptiondata [] = 
-  {
+  if (!this->is_evaluated ())
     {
-      "IDL:ImplementationRepository/NotFound:1.0",
-      ImplementationRepository::NotFound::_alloc
+      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  };
-
-TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
-  if (istub == 0)
+  if (this->the_TAO_Locator_Proxy_Broker_ == 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      ImplementationRepository_Locator_setup_collocation (
+          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
+        );
     }
-    
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
+  
+  TAO::Arg_Traits<void>::ret_val _tao_retval;
+  TAO::Arg_Traits<CORBA::Char *>::in_arg_val _tao_server (server);
+  TAO::Arg_Traits<ImplementationRepository::Address>::in_arg_val _tao_location (location);
+  
+  TAO::Argument *_tao_signature [] =
+    {
+      &_tao_retval,
+      &_tao_server,
+      &_tao_location
+    };
+  
+  static TAO_Exception_Data
+  _tao_ImplementationRepository_Locator_server_is_shutting_down_in_location_exceptiondata [] = 
+    {
+      {
+        "IDL:ImplementationRepository/NotFound:1.0",
+        ImplementationRepository::NotFound::_alloc,
+        ImplementationRepository::_tc_NotFound
+      }
+    };
+  
+  TAO::Invocation_Adapter _tao_call (
+      this,
+      _tao_signature,
+      3,
       "server_is_shutting_down_in_location",
       35,
-      2,
-      istub->orb_core ()
+      this->the_TAO_Locator_Proxy_Broker_
     );
   
-  int _invoke_status;
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors (),
-      &_tao_call,
-      _invoke_status
+  _tao_call.invoke (
+      _tao_ImplementationRepository_Locator_server_is_shutting_down_in_location_exceptiondata,
+      1
+      ACE_ENV_ARG_PARAMETER
     );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_in_location _tao_ri (
-          &_tao_call,
-          _collocated_tao_target_,
-          server,
-          location
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      
-      ACE_TRY
-        {
-          _tao_vfr.send_request (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              _tao_call.restart_flag (1);
-            }
-          else
-            {
-              
-#endif /* TAO_HAS_INTERCEPTORS */
-              
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK;
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << server) &&
-                  (_tao_out << location)
-                  ))
-                {
-                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); 
-                  TAO_INTERCEPTOR_CHECK;
-
-                }
-              
-              _invoke_status =
-                _tao_call.invoke (_tao_ImplementationRepository_Locator_server_is_shutting_down_in_location_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        )
-                    );
-                }
-              else if (_invoke_status == TAO_INVOKE_RESTART)
-                {
-                  _tao_call.restart_flag (1);
-                  TAO_INTERCEPTOR (
-                      _tao_ri.reply_status (_invoke_status);
-                      _tao_vfr.receive_other (
-                          &_tao_ri
-                          ACE_ENV_ARG_PARAMETER
-                        );
-                      ACE_TRY_CHECK;
-                    )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
-                  _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
-                      &_tao_ri
-                      ACE_ENV_ARG_PARAMETER
-                    );
-                  ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
-            }
-        }
-      ACE_CATCHANY
-        {
-          _tao_ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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;
-      
-      const PortableInterceptor::ReplyStatus _tao_status =
-        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
-#endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
-    }
+  ACE_CHECK;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:78
 
-CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::register_activator (
-    CORBA::Object *_collocated_tao_target_,
+CORBA::ULong ImplementationRepository::Locator::register_activator (
     const char * location,
     CORBA::Object_ptr object_ref
     ACE_ENV_ARG_DECL
@@ -1632,225 +370,62 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::register_
     , ImplementationRepository::AlreadyRegistered
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Locator_register_activator_exceptiondata [] = 
-  {
+  if (!this->is_evaluated ())
     {
-      "IDL:ImplementationRepository/AlreadyRegistered:1.0",
-      ImplementationRepository::AlreadyRegistered::_alloc
+      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  };
-
-CORBA::ULong _tao_retval = 0;
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
-  if (istub == 0)
+  if (this->the_TAO_Locator_Proxy_Broker_ == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
+      ImplementationRepository_Locator_setup_collocation (
+          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
+        );
     }
-    
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
+  
+  TAO::Arg_Traits<CORBA::ULong>::ret_val _tao_retval;
+  TAO::Arg_Traits<CORBA::Char *>::in_arg_val _tao_location (location);
+  TAO::Arg_Traits<CORBA::Object>::in_arg_val _tao_object_ref (object_ref);
+  
+  TAO::Argument *_tao_signature [] =
+    {
+      &_tao_retval,
+      &_tao_location,
+      &_tao_object_ref
+    };
+  
+  static TAO_Exception_Data
+  _tao_ImplementationRepository_Locator_register_activator_exceptiondata [] = 
+    {
+      {
+        "IDL:ImplementationRepository/AlreadyRegistered:1.0",
+        ImplementationRepository::AlreadyRegistered::_alloc,
+        ImplementationRepository::_tc_AlreadyRegistered
+      }
+    };
+  
+  TAO::Invocation_Adapter _tao_call (
+      this,
+      _tao_signature,
+      3,
       "register_activator",
       18,
-      2,
-      istub->orb_core ()
+      this->the_TAO_Locator_Proxy_Broker_
     );
   
-  int _invoke_status;
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors (),
-      &_tao_call,
-      _invoke_status
+  _tao_call.invoke (
+      _tao_ImplementationRepository_Locator_register_activator_exceptiondata,
+      1
+      ACE_ENV_ARG_PARAMETER
     );
+  ACE_CHECK_RETURN (_tao_retval.excp ());
   
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_ImplementationRepository_Locator_register_activator _tao_ri (
-          &_tao_call,
-          _collocated_tao_target_,
-          location,
-          object_ref
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK_RETURN (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      
-      ACE_TRY
-        {
-          _tao_vfr.send_request (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              _tao_call.restart_flag (1);
-            }
-          else
-            {
-              
-#endif /* TAO_HAS_INTERCEPTORS */
-              
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << location) &&
-                  (_tao_out << object_ref)
-                  ))
-                {
-                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); 
-                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-                }
-              
-              _invoke_status =
-                _tao_call.invoke (_tao_ImplementationRepository_Locator_register_activator_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        ),
-                      _tao_retval
-                    );
-                }
-              else if (_invoke_status == TAO_INVOKE_RESTART)
-                {
-                  _tao_call.restart_flag (1);
-                  TAO_INTERCEPTOR (
-                      _tao_ri.reply_status (_invoke_status);
-                      _tao_vfr.receive_other (
-                          &_tao_ri
-                          ACE_ENV_ARG_PARAMETER
-                        );
-                      ACE_TRY_CHECK;
-                    )
-                }
-              else
-                {
-                  
-                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-                  _tao_call.transport()->assign_translators (&_tao_in,0);
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval)
-                      ))
-                    {
-                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); 
-                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-                      
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::ULong _tao_retval_info =
-                    _tao_retval;
-                  _tao_ri.result (_tao_retval_info);
-                  
-                  _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
-                      &_tao_ri
-                      ACE_ENV_ARG_PARAMETER
-                    );
-                  ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
-            }
-        }
-      ACE_CATCHANY
-        {
-          _tao_ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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_RETURN (_tao_retval);
-      
-      const PortableInterceptor::ReplyStatus _tao_status =
-        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (_tao_retval);
-      
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
-#endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
-    }
-
-return _tao_retval;
+  return _tao_retval.retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:78
 
-CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::unregister_activator (
-    CORBA::Object *_collocated_tao_target_,
+CORBA::ULong ImplementationRepository::Locator::unregister_activator (
     const char * location,
     CORBA::Object_ptr object_ref
     ACE_ENV_ARG_DECL
@@ -1860,276 +435,60 @@ CORBA::ULong ImplementationRepository::_TAO_Locator_Remote_Proxy_Impl::unregiste
     , ImplementationRepository::NotFound
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Locator_unregister_activator_exceptiondata [] = 
-  {
+  if (!this->is_evaluated ())
     {
-      "IDL:ImplementationRepository/NotFound:1.0",
-      ImplementationRepository::NotFound::_alloc
+      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  };
-
-CORBA::ULong _tao_retval = 0;
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
-  if (istub == 0)
+  if (this->the_TAO_Locator_Proxy_Broker_ == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
+      ImplementationRepository_Locator_setup_collocation (
+          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
+        );
     }
-    
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
+  
+  TAO::Arg_Traits<CORBA::ULong>::ret_val _tao_retval;
+  TAO::Arg_Traits<CORBA::Char *>::in_arg_val _tao_location (location);
+  TAO::Arg_Traits<CORBA::Object>::in_arg_val _tao_object_ref (object_ref);
+  
+  TAO::Argument *_tao_signature [] =
+    {
+      &_tao_retval,
+      &_tao_location,
+      &_tao_object_ref
+    };
+  
+  static TAO_Exception_Data
+  _tao_ImplementationRepository_Locator_unregister_activator_exceptiondata [] = 
+    {
+      {
+        "IDL:ImplementationRepository/NotFound:1.0",
+        ImplementationRepository::NotFound::_alloc,
+        ImplementationRepository::_tc_NotFound
+      }
+    };
+  
+  TAO::Invocation_Adapter _tao_call (
+      this,
+      _tao_signature,
+      3,
       "unregister_activator",
       20,
-      2,
-      istub->orb_core ()
+      this->the_TAO_Locator_Proxy_Broker_
     );
   
-  int _invoke_status;
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors (),
-      &_tao_call,
-      _invoke_status
+  _tao_call.invoke (
+      _tao_ImplementationRepository_Locator_unregister_activator_exceptiondata,
+      1
+      ACE_ENV_ARG_PARAMETER
     );
+  ACE_CHECK_RETURN (_tao_retval.excp ());
   
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_ImplementationRepository_Locator_unregister_activator _tao_ri (
-          &_tao_call,
-          _collocated_tao_target_,
-          location,
-          object_ref
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK_RETURN (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      
-      ACE_TRY
-        {
-          _tao_vfr.send_request (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              _tao_call.restart_flag (1);
-            }
-          else
-            {
-              
-#endif /* TAO_HAS_INTERCEPTORS */
-              
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << location) &&
-                  (_tao_out << object_ref)
-                  ))
-                {
-                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); 
-                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-                }
-              
-              _invoke_status =
-                _tao_call.invoke (_tao_ImplementationRepository_Locator_unregister_activator_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        ),
-                      _tao_retval
-                    );
-                }
-              else if (_invoke_status == TAO_INVOKE_RESTART)
-                {
-                  _tao_call.restart_flag (1);
-                  TAO_INTERCEPTOR (
-                      _tao_ri.reply_status (_invoke_status);
-                      _tao_vfr.receive_other (
-                          &_tao_ri
-                          ACE_ENV_ARG_PARAMETER
-                        );
-                      ACE_TRY_CHECK;
-                    )
-                }
-              else
-                {
-                  
-                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-                  _tao_call.transport()->assign_translators (&_tao_in,0);
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval)
-                      ))
-                    {
-                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); 
-                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-                      
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::ULong _tao_retval_info =
-                    _tao_retval;
-                  _tao_ri.result (_tao_retval_info);
-                  
-                  _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
-                      &_tao_ri
-                      ACE_ENV_ARG_PARAMETER
-                    );
-                  ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
-            }
-        }
-      ACE_CATCHANY
-        {
-          _tao_ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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_RETURN (_tao_retval);
-      
-      const PortableInterceptor::ReplyStatus _tao_status =
-        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (_tao_retval);
-      
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
-#endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
-    }
-
-return _tao_retval;
+  return _tao_retval.retn ();
 }
 
-//
-//            End  Base & Remote  Proxy Implemeentation. 
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
-
-///////////////////////////////////////////////////////////////////////
-//           Remote & Base  Proxy Broker Implementation
-//
-
-ImplementationRepository::_TAO_Locator_Proxy_Broker::_TAO_Locator_Proxy_Broker (void)
-{
-}
-
-ImplementationRepository::_TAO_Locator_Proxy_Broker::~_TAO_Locator_Proxy_Broker (void)
-{
-}
-
-ImplementationRepository::_TAO_Locator_Proxy_Broker * (*ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-ImplementationRepository::_TAO_Locator_Remote_Proxy_Broker *
-ImplementationRepository::_TAO_Locator_Remote_Proxy_Broker::the_TAO_Locator_Remote_Proxy_Broker (void)
-{
-  static ::ImplementationRepository::_TAO_Locator_Remote_Proxy_Broker remote_proxy_broker;
-  return &remote_proxy_broker;
-}
-
-ImplementationRepository::_TAO_Locator_Remote_Proxy_Broker::_TAO_Locator_Remote_Proxy_Broker (void)
-{
-}
-
-ImplementationRepository::_TAO_Locator_Remote_Proxy_Broker::~_TAO_Locator_Remote_Proxy_Broker (void)
-{
-}
-
-ImplementationRepository::_TAO_Locator_Proxy_Impl&
-ImplementationRepository::_TAO_Locator_Remote_Proxy_Broker::select_proxy (
-    ::ImplementationRepository::Locator *
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return this->remote_proxy_impl_;
-}
-
-//
-//           End Remote & Base Proxy Broker Implementation
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:239
-
 ImplementationRepository::Locator::Locator (int collocated)
+ : the_TAO_Locator_Proxy_Broker_ (0)
 {
   this->ImplementationRepository_Locator_setup_collocation (collocated);
 }
@@ -2138,11 +497,10 @@ void
 ImplementationRepository::Locator::ImplementationRepository_Locator_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_Locator_Proxy_Broker_ =
-      ::ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function_pointer (this);
-  else
-    this->the_TAO_Locator_Proxy_Broker_ =
-      ::ImplementationRepository::_TAO_Locator_Remote_Proxy_Broker::the_TAO_Locator_Remote_Proxy_Broker ();
+    {
+      this->the_TAO_Locator_Proxy_Broker_ =
+        ::ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function_pointer (this);
+    }
   
   this->ImplementationRepository_Administration_setup_collocation (collocated);
 }
@@ -2153,120 +511,24 @@ ImplementationRepository::Locator::~Locator (void)
 void 
 ImplementationRepository::Locator::_tao_any_destructor (void *_tao_void_pointer)
 {
-  Locator *tmp = ACE_static_cast (Locator *, _tao_void_pointer);
-  CORBA::release (tmp);
+  Locator *_tao_tmp_pointer =
+    ACE_static_cast (Locator *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 ImplementationRepository::Locator_ptr
 ImplementationRepository::Locator::_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL
   )
 {
-  if (CORBA::is_nil (obj))
-    {
-      return Locator::_nil ();
-    }
-  
-  if (! obj->_is_local ())
-    {
-      CORBA::Boolean is_a =
-        obj->_is_a (
-            "IDL:ImplementationRepository/Locator:1.0"
-            ACE_ENV_ARG_PARAMETER
-          );
-      ACE_CHECK_RETURN (Locator::_nil ());
-      
-      if (is_a == 0)
-        {
-          return Locator::_nil ();
-        }
-    }
-  
-  return Locator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-ImplementationRepository::Locator_ptr 
-ImplementationRepository::Locator::_unchecked_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (obj))
-    {
-      return Locator::_nil ();
-    }
-  
-  Locator_ptr default_proxy = Locator::_nil ();
-  
-  // Code for lazily evaluated IOR's
-  if (!obj->is_evaluated ())
-    {
-      ACE_NEW_RETURN (
-          default_proxy,
-          ::ImplementationRepository::Locator (
-              obj->steal_ior (),
-              obj->orb_core ()
-            ),
-          Locator::_nil ()
-        );
-      
-      return default_proxy;
-    }
-  
-  if (! obj->_is_local ())
-    {
-      TAO_Stub* stub = obj->_stubobj ();
-      
-      if (stub != 0)
-        {
-          stub->_incr_refcnt ();
-        }
-      
-      if (
-          !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-          stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&
-          ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function_pointer != 0
-        )
-        {
-          ACE_NEW_RETURN (
-              default_proxy,
-              ::ImplementationRepository::Locator (
-                  stub,
-                  1,
-                  obj->_servant ()
-                ),
-              Locator::_nil ()
-            );
-        }
-      
-      if (CORBA::is_nil (default_proxy))
-        {
-          ACE_NEW_RETURN (
-              default_proxy,
-              ::ImplementationRepository::Locator (
-                  stub,
-                  0,
-                  obj->_servant ()
-                ),
-              Locator::_nil ()
-            );
-        }
-      
-      return default_proxy;
-    }
-  else 
-    return
-      ACE_reinterpret_cast (
-          Locator_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &Locator::_tao_class_id
-                )
-            )
-        );
+  return
+    TAO::Narrow_Utils<Locator>::narrow (
+        _tao_objref,
+        "IDL:ImplementationRepository/Locator:1.0",
+        ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function_pointer
+        ACE_ENV_ARG_PARAMETER
+      );
 }
 
 ImplementationRepository::Locator_ptr
@@ -2289,11 +551,11 @@ 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,
@@ -2312,51 +574,6 @@ ImplementationRepository::Locator::_is_a (
     }
 }
 
-void *ImplementationRepository::Locator::_tao_QueryInterface (ptrdiff_t type)
-{
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::ImplementationRepository, Locator)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &::ImplementationRepository::Administration::_tao_class_id)
-            )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                ImplementationRepository::Administration_ptr,
-                this
-              )
-          );
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-  
-  if (retv != 0)
-    {
-      this->_add_ref ();
-    }
-  
-  return retv;
-}
-
 const char* ImplementationRepository::Locator::_interface_repository_id (void) const
 {
   return "IDL:ImplementationRepository/Locator:1.0";
@@ -2369,206 +586,7 @@ ImplementationRepository::Locator::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
-
-void ImplementationRepository::Locator::activate_server_in_location (
-    const char * server,
-    const char * location
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , ImplementationRepository::NotFound
-    , ImplementationRepository::CannotActivate
-  ))
-{
-  if (!this->is_evaluated ())
-    {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
-      this->ImplementationRepository_Locator_setup_collocation (
-          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
-        );
-    }
-  
-  _TAO_Locator_Proxy_Impl &proxy = 
-    this->the_TAO_Locator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-  proxy.activate_server_in_location (
-      this,
-      server,
-      location
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
-
-void ImplementationRepository::Locator::remove_server_in_location (
-    const char * server,
-    const char * location
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , ImplementationRepository::NotFound
-  ))
-{
-  if (!this->is_evaluated ())
-    {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
-      this->ImplementationRepository_Locator_setup_collocation (
-          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
-        );
-    }
-  
-  _TAO_Locator_Proxy_Impl &proxy = 
-    this->the_TAO_Locator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-  proxy.remove_server_in_location (
-      this,
-      server,
-      location
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
-
-void ImplementationRepository::Locator::shutdown_server_in_location (
-    const char * server,
-    const char * location
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , ImplementationRepository::NotFound
-  ))
-{
-  if (!this->is_evaluated ())
-    {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
-      this->ImplementationRepository_Locator_setup_collocation (
-          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
-        );
-    }
-  
-  _TAO_Locator_Proxy_Impl &proxy = 
-    this->the_TAO_Locator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-  proxy.shutdown_server_in_location (
-      this,
-      server,
-      location
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
-
-void ImplementationRepository::Locator::server_is_shutting_down_in_location (
-    const char * server,
-    const char * location
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , ImplementationRepository::NotFound
-  ))
-{
-  if (!this->is_evaluated ())
-    {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
-      this->ImplementationRepository_Locator_setup_collocation (
-          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
-        );
-    }
-  
-  _TAO_Locator_Proxy_Impl &proxy = 
-    this->the_TAO_Locator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-  proxy.server_is_shutting_down_in_location (
-      this,
-      server,
-      location
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
-
-CORBA::ULong ImplementationRepository::Locator::register_activator (
-    const char * location,
-    CORBA::Object_ptr object_ref
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , ImplementationRepository::AlreadyRegistered
-  ))
-{
-  if (!this->is_evaluated ())
-    {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
-      this->ImplementationRepository_Locator_setup_collocation (
-          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
-        );
-    }
-  
-  _TAO_Locator_Proxy_Impl &proxy = 
-    this->the_TAO_Locator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return proxy.register_activator (
-      this,
-      location,
-      object_ref
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
-
-CORBA::ULong ImplementationRepository::Locator::unregister_activator (
-    const char * location,
-    CORBA::Object_ptr object_ref
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , ImplementationRepository::NotFound
-  ))
-{
-  if (!this->is_evaluated ())
-    {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
-      this->ImplementationRepository_Locator_setup_collocation (
-          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
-        );
-    }
-  
-  _TAO_Locator_Proxy_Impl &proxy = 
-    this->the_TAO_Locator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return proxy.unregister_activator (
-      this,
-      location,
-      object_ref
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_Locator[] =
 {
@@ -2598,17 +616,14 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Locator (
     sizeof (ImplementationRepository::Locator)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (ImplementationRepository)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_Locator,
-    &_tc_TAO_tc_ImplementationRepository_Locator
-  )
-TAO_NAMESPACE_END
+namespace ImplementationRepository
+{
+  ::CORBA::TypeCode_ptr _tc_Locator =
+    &_tc_TAO_tc_ImplementationRepository_Locator;
+}
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -2652,15 +667,18 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Impl_T<ImplementationRepository::Locator>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Impl_T<ImplementationRepository::Locator>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<ImplementationRepository::Locator>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -2676,29 +694,105 @@ CORBA::Boolean operator>> (
     ImplementationRepository::Locator_ptr &_tao_objref
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    
-    if ((strm >> obj.inout ()) == 0)
-      {
-        return 0;
-      }
+  CORBA::Object_var obj;
+  
+  if ((strm >> obj.inout ()) == 0)
+    {
+      return 0;
+    }
+  
+  typedef ::ImplementationRepository::Locator RHS_SCOPED_NAME;
+  
+  // Narrow to the right type.
+  _tao_objref =
+    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
+        obj.in (),
+        ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function_pointer
+      );
     
-    // Narrow to the right type.
-    _tao_objref =
-      ImplementationRepository::Locator::_unchecked_narrow (
-          obj.in ()
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
+  return 1;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1703
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        ImplementationRepository::AlreadyRegistered
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        ImplementationRepository::CannotActivate
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        ImplementationRepository::NotFound
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        ImplementationRepository::ActivationMode
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        ImplementationRepository::Locator,
+        TAO::Objref_Traits<ImplementationRepository::Locator>
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        ImplementationRepository::Locator,
+        TAO::Objref_Traits<ImplementationRepository::Locator>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        ImplementationRepository::Locator
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        ImplementationRepository::AlreadyRegistered \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        ImplementationRepository::CannotActivate \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        ImplementationRepository::NotFound \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        ImplementationRepository::ActivationMode \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        ImplementationRepository::Locator, \
+        TAO::Objref_Traits<ImplementationRepository::Locator> \
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        ImplementationRepository::Locator, \
+        TAO::Objref_Traits<ImplementationRepository::Locator> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        ImplementationRepository::Locator \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/PortableServer/ImR_LocatorC.h b/TAO/tao/PortableServer/ImR_LocatorC.h
index 83972803741..5deb2fde3c2 100644
--- a/TAO/tao/PortableServer/ImR_LocatorC.h
+++ b/TAO/tao/PortableServer/ImR_LocatorC.h
@@ -26,11 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:151
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
 
 #ifndef _TAO_IDL_ORIG_IMR_LOCATORC_H_
 #define _TAO_IDL_ORIG_IMR_LOCATORC_H_
+
 #include /**/ "ace/pre.h"
+
 #include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -62,27 +64,37 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:48
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_ch.cpp:63
 
-TAO_NAMESPACE  ImplementationRepository
+namespace TAO
 {
+  class Collocation_Proxy_Broker;
+  
+  template<typename T> class Narrow_Utils;
+}
 
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:570
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
 
-#if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR__ODDS_N_ENDS_CH_)
-#define _IMPLEMENTATIONREPOSITORY_LOCATOR__ODDS_N_ENDS_CH_
+namespace ImplementationRepository
+{
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601
 
+#if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR__VAR_OUT_CH_)
+#define _IMPLEMENTATIONREPOSITORY_LOCATOR__VAR_OUT_CH_
+  
   class Locator;
   typedef Locator *Locator_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Locator
       >
     Locator_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Locator
@@ -90,49 +102,39 @@ TAO_NAMESPACE  ImplementationRepository
     Locator_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:50
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_LOCATOR_CH_
-
-  class _TAO_Locator_Proxy_Impl;
-  class _TAO_Locator_Remote_Proxy_Impl;
-  class _TAO_Locator_Proxy_Broker;
-  class _TAO_Locator_Remote_Proxy_Broker;
-
+  
   class TAO_PortableServer_Export Locator
     : public virtual ImplementationRepository::Administration
   {
   public:
+    friend class TAO::Narrow_Utils<Locator>;
     typedef Locator_ptr _ptr_type;
     typedef Locator_var _var_type;
-    static int _tao_class_id;
-
+    
     // The static operations.
     static Locator_ptr _duplicate (Locator_ptr obj);
-
+    
     static Locator_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
-    static Locator_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
+    
     static Locator_ptr _nil (void)
       {
         return (Locator_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void activate_server_in_location (
         const char * server,
         const char * location
@@ -143,10 +145,10 @@ TAO_NAMESPACE  ImplementationRepository
         , ImplementationRepository::NotFound
         , ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void remove_server_in_location (
         const char * server,
         const char * location
@@ -156,10 +158,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void shutdown_server_in_location (
         const char * server,
         const char * location
@@ -169,10 +171,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void server_is_shutting_down_in_location (
         const char * server,
         const char * location
@@ -182,10 +184,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::ULong register_activator (
         const char * location,
         CORBA::Object_ptr object_ref
@@ -195,10 +197,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::AlreadyRegistered
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::ULong unregister_activator (
         const char * location,
         CORBA::Object_ptr object_ref
@@ -208,382 +210,99 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:207
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
-    _TAO_Locator_Proxy_Broker *the_TAO_Locator_Proxy_Broker_;
-
+    TAO::Collocation_Proxy_Broker *the_TAO_Locator_Proxy_Broker_;
+  
   protected:
     Locator (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_Locator_setup_collocation (int collocated);
-
+    
     Locator (IOP::IOR *ior,
       TAO_ORB_Core *orb_core = 0);
-
+      
     Locator (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
     virtual ~Locator (void);
-
-    friend class _TAO_Locator_Remote_Proxy_Impl;
-    friend class _TAO_Locator_ThruPOA_Proxy_Impl;
-    friend class _TAO_Locator_Direct_Proxy_Impl;
-
+  
   private:
     Locator (const Locator &);
     void operator= (const Locator &);
   };
 
-  // The Proxy Implementations are used by each interface to
-  // perform a call. Each different implementation encapsulates
-  // an invocation logic.
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                    Base Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
-  class TAO_PortableServer_Export _TAO_Locator_Proxy_Impl
-    : public virtual ImplementationRepository::_TAO_Administration_Proxy_Impl
-  {
-  public:
-    virtual ~_TAO_Locator_Proxy_Impl (void) {}
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual void activate_server_in_location (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server,
-        const char * location
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-        , ImplementationRepository::CannotActivate
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual void remove_server_in_location (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server,
-        const char * location
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual void shutdown_server_in_location (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server,
-        const char * location
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual void server_is_shutting_down_in_location (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server,
-        const char * location
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual CORBA::ULong register_activator (
-        CORBA::Object *_collocated_tao_target_,
-        const char * location,
-        CORBA::Object_ptr object_ref
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::AlreadyRegistered
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual CORBA::ULong unregister_activator (
-        CORBA::Object *_collocated_tao_target_,
-        const char * location,
-        CORBA::Object_ptr object_ref
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-      )) = 0;
-
-  protected:
-    _TAO_Locator_Proxy_Impl (void);
-  };
-
-  //
-  //               End Base Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                Remote Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
-  class TAO_PortableServer_Export _TAO_Locator_Remote_Proxy_Impl
-    : public virtual _TAO_Locator_Proxy_Impl,
-      public virtual TAO_Remote_Object_Proxy_Impl,
-      public virtual ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl
-  {
-  public:
-    _TAO_Locator_Remote_Proxy_Impl (void);
-
-    virtual ~_TAO_Locator_Remote_Proxy_Impl (void) {}
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual void activate_server_in_location (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server,
-        const char * location
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-        , ImplementationRepository::CannotActivate
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual void remove_server_in_location (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server,
-        const char * location
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual void shutdown_server_in_location (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server,
-        const char * location
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual void server_is_shutting_down_in_location (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server,
-        const char * location
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual CORBA::ULong register_activator (
-        CORBA::Object *_collocated_tao_target_,
-        const char * location,
-        CORBA::Object_ptr object_ref
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::AlreadyRegistered
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual CORBA::ULong unregister_activator (
-        CORBA::Object *_collocated_tao_target_,
-        const char * location,
-        CORBA::Object_ptr object_ref
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-      ));
-  };
-
-  //
-  //             End Remote Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-  // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
-  // collocation scheme, the proxy to be used can vary on
-  // a call by call basis.
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
-  class TAO_PortableServer_Export _TAO_Locator_Proxy_Broker
-  {
-  public:
-    virtual ~_TAO_Locator_Proxy_Broker (void);
-    virtual _TAO_Locator_Proxy_Impl &select_proxy (
-        Locator *object
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      ) = 0;
-
-  protected:
-    _TAO_Locator_Proxy_Broker (void);
-
-  };
-
-  //
-  //              End Base Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
-  class TAO_PortableServer_Export _TAO_Locator_Remote_Proxy_Broker
-    : public virtual _TAO_Locator_Proxy_Broker
-  {
-  public:
-    _TAO_Locator_Remote_Proxy_Broker (void);
-
-    virtual ~_TAO_Locator_Remote_Proxy_Broker (void);
-
-    virtual _TAO_Locator_Proxy_Impl &select_proxy (
-        Locator *object
-        ACE_ENV_ARG_DECL
-      );
-
-  private:
-    _TAO_Locator_Remote_Proxy_Impl remote_proxy_impl_;
-
-  public:
-    // This member function is used to get an handle to the unique instance
-    // of the Remote Proxy Broker that is available for a given
-    // interface.
-    static _TAO_Locator_Remote_Proxy_Broker *the_TAO_Locator_Remote_Proxy_Broker (void);
-  };
-
-  //
-  //              End Remote Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Locator;
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66
 
-}
-TAO_NAMESPACE_CLOSE // module ImplementationRepository
+} // module ImplementationRepository
 
 // Proxy Broker Factory function pointer declarations.
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:121
 
 extern TAO_PortableServer_Export
-ImplementationRepository::_TAO_Locator_Proxy_Broker *
+TAO::Collocation_Proxy_Broker *
 (*ImplementationRepository__TAO_Locator_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48
+
+// Traits specializations.
+namespace TAO
+{
+};
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Locator_ptr); // copying
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Locator_ptr *); // non-copying
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Locator_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:48
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Locator_ptr );
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Locator_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:64
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:1018
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:926
 
 #if defined (__ACE_INLINE__)
 #include "ImR_LocatorC.i"
@@ -599,3 +318,4 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, Implementat
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/PortableServer/ImR_LocatorC.i b/TAO/tao/PortableServer/ImR_LocatorC.i
index c1ee1a9c692..a9aa8d22717 100644
--- a/TAO/tao/PortableServer/ImR_LocatorC.i
+++ b/TAO/tao/PortableServer/ImR_LocatorC.i
@@ -27,7 +27,7 @@
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR___CI_)
 #define _IMPLEMENTATIONREPOSITORY_LOCATOR___CI_
@@ -39,35 +39,28 @@ ImplementationRepository::Locator::Locator (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant, oc)
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant, oc),
+    the_TAO_Locator_Proxy_Broker_ (0)
+  
 {
   this->ImplementationRepository_Locator_setup_collocation (_tao_collocated);
 }
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<ImplementationRepository::Locator>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
 ACE_INLINE
 ImplementationRepository::Locator::Locator (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc)
+  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+    the_TAO_Locator_Proxy_Broker_ (0)
+  
 {
 }
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
diff --git a/TAO/tao/PortableServer/ImR_LocatorS.cpp b/TAO/tao/PortableServer/ImR_LocatorS.cpp
index 0d9187983fd..169f6d26006 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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:619
 
 #ifndef _TAO_IDL_ORIG_IMR_LOCATORS_CPP_
 #define _TAO_IDL_ORIG_IMR_LOCATORS_CPP_
@@ -32,10 +38,14 @@
 #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/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"
@@ -56,7 +66,15 @@
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1731
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59
+
+// Arg traits specializations.
+namespace TAO
+{
+};
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1403
 
 class TAO_ImplementationRepository_Locator_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
@@ -67,7 +85,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 +154,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)
@@ -211,45 +229,45 @@ 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_;
 };
@@ -281,19 +299,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,15 +325,15 @@ 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)
     {
@@ -327,7 +345,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_activate_server_in_locati
   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 +356,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;
 }
 
@@ -376,45 +394,45 @@ 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_;
 };
@@ -446,19 +464,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,14 +490,14 @@ 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)
     {
@@ -491,7 +509,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_remove_server_in_location
   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 +520,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;
 }
 
@@ -540,45 +558,45 @@ 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_;
 };
@@ -610,19 +628,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,14 +654,14 @@ 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)
     {
@@ -655,7 +673,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_shutdown_server_in_locati
   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 +684,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;
 }
 
@@ -704,45 +722,45 @@ 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_;
 };
@@ -774,19 +792,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,14 +818,14 @@ 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)
     {
@@ -819,7 +837,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_server_is_shutting_down_i
   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 +848,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;
 }
 
@@ -868,49 +886,50 @@ 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
@@ -940,19 +959,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,14 +985,14 @@ 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)
     {
@@ -985,7 +1004,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::excep
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Locator_register_activator::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -996,11 +1015,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 +1043,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.
@@ -1045,49 +1064,50 @@ 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
@@ -1117,19 +1137,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,14 +1163,14 @@ 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)
     {
@@ -1162,7 +1182,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::exc
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -1173,11 +1193,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 +1221,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.
@@ -1218,7 +1238,8 @@ TAO_ServerRequestInfo_ImplementationRepository_Locator_unregister_activator::res
 // W:\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 +1247,73 @@ 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_new (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_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
-
-  if (this->proxy_cache_[strategy] == 0)
+  ACE_THROW_SPEC ((CORBA::Exception))
+{
+  TAO_Collocated_Skeleton collocated_skel;
+  
+  if (obj->_servant ()->_find (op,
+        collocated_skel,
+        strategy,
+        op_len) == -1)
+    ACE_THROW (CORBA::BAD_OPERATION ());
+  
+  ACE_TRY
     {
-      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;
-        }
+      collocated_skel (
+        obj,
+        forward_obj,
+        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 +1321,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
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:603
 
-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
+        )
+    );
 
 
 ///////////////////////////////////////////////////////////////////////
@@ -1347,13 +1361,15 @@ POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::_TAO_Locator_Thru
 
 // 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 
+// W:\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 (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out forward,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1362,44 +1378,45 @@ 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 ()
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-  CORBA::Object_var forward_to;
+  
   servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
+      obj->_stubobj ()->object_key (),
       "activate_server_in_location",
-      forward_to.out ()
+      forward
       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 (
           "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 
+// W:\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 (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out forward,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1407,44 +1424,45 @@ 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 ()
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-  CORBA::Object_var forward_to;
+  
   servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
+      obj->_stubobj ()->object_key (),
       "remove_server_in_location",
-      forward_to.out ()
+      forward
       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 (
           "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 
+// W:\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 (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out forward,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1452,44 +1470,45 @@ 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 ()
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-  CORBA::Object_var forward_to;
+  
   servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
+      obj->_stubobj ()->object_key (),
       "shutdown_server_in_location",
-      forward_to.out ()
+      forward
       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 (
           "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 
+// W:\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 (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out forward,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1497,44 +1516,45 @@ 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 ()
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-  CORBA::Object_var forward_to;
+  
   servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
+      obj->_stubobj ()->object_key (),
       "server_is_shutting_down_in_location",
-      forward_to.out ()
+      forward
       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 (
           "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 
+// W:\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 (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out forward,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1542,45 +1562,46 @@ 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 ()
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-  CORBA::Object_var forward_to;
+  
   servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
+      obj->_stubobj ()->object_key (),
       "register_activator",
-      forward_to.out ()
+      forward
       ACE_ENV_ARG_PARAMETER
     );
-  ACE_CHECK_RETURN (_tao_retval);
-
+  ACE_CHECK;
+  
   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
-      );
+  ACE_CHECK;
+  
+  ((TAO::Arg_Traits<CORBA::ULong>::ret_val *) args[0])->arg () =
+    ACE_reinterpret_cast (
+        POA_ImplementationRepository::Locator_ptr,
+        servant_upcall.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 
+// W:\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 (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out forward,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1588,39 +1609,41 @@ 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 ()
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-  CORBA::Object_var forward_to;
+  
   servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
+      obj->_stubobj ()->object_key (),
       "unregister_activator",
-      forward_to.out ()
+      forward
       ACE_ENV_ARG_PARAMETER
     );
-  ACE_CHECK_RETURN (_tao_retval);
-
+  ACE_CHECK;
+  
   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 (
+  ACE_CHECK;
+  
+  ((TAO::Arg_Traits<CORBA::ULong>::ret_val *) args[0])->arg () =
+    ACE_reinterpret_cast (
+        POA_ImplementationRepository::Locator_ptr,
+        servant_upcall.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,146 +1651,202 @@ 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 
+// W:\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 (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
     , ImplementationRepository::CannotActivate
-  )){
+  ))
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Locator_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Locator:1.0")
+      servant_upcall.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 
+// W:\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 (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
-  )){
+  ))
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Locator_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Locator:1.0")
+      servant_upcall.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 
+// W:\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 (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
-  )){
+  ))
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Locator_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Locator:1.0")
+      servant_upcall.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 
+// W:\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 (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
-  )){
+  ))
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Locator_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Locator:1.0")
+      servant_upcall.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 
+// W:\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 (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out,
+    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_Object_Adapter::Servant_Upcall servant_upcall (
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  
+  ((TAO::Arg_Traits<CORBA::ULong>::ret_val *) args[0])->arg () =
+    ACE_reinterpret_cast (
+        POA_ImplementationRepository::Locator_ptr,
+        servant_upcall.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/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 (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out,
+    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_Object_Adapter::Servant_Upcall servant_upcall (
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  
+  ((TAO::Arg_Traits<CORBA::ULong>::ret_val *) args[0])->arg () =
+    ACE_reinterpret_cast (
+        POA_ImplementationRepository::Locator_ptr,
+        servant_upcall.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
+// TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:98
 
 POA_ImplementationRepository::Locator::Locator (void)
@@ -1778,15 +1857,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 
+// W:\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 +1882,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 +1960,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 
+// W:\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 +2021,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 +2099,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 
+// W:\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 +2160,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 +2238,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 
+// W:\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 +2299,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 +2377,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 
+// W:\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 +2440,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 +2517,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 
+// W:\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 +2592,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 +2669,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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:165
 
 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 +2739,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 +2764,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 +2782,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 +2814,7 @@ void POA_ImplementationRepository::Locator::_interface_skel (
       _tao_adapter->dispose (_tao_retval);
     }
   ACE_ENDTRY;
-
+  
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -2702,7 +2822,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 +2832,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 +2848,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 +2873,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 +2899,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
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:539
 
 void POA_ImplementationRepository::Locator::_dispatch (
     TAO_ServerRequest &req,
@@ -2794,17 +2914,17 @@ void POA_ImplementationRepository::Locator::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:478
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:479
 
 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 +2949,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
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1740
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ImR_LocatorS.h b/TAO/tao/PortableServer/ImR_LocatorS.h
index a7993ccef5d..81615c6a9ae 100644
--- a/TAO/tao/PortableServer/ImR_LocatorS.h
+++ b/TAO/tao/PortableServer/ImR_LocatorS.h
@@ -15,12 +15,18 @@
 //       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:443
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_IMR_LOCATORS_H_
 #define _TAO_IDL_ORIG_IMR_LOCATORS_H_
@@ -33,6 +39,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Collocation_Proxy_Broker.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/PortableServer/Servant_Base.h"
 #include "tao/PortableServer/Collocated_Object.h"
@@ -53,10 +60,12 @@
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:49
 
-TAO_NAMESPACE  POA_ImplementationRepository
+namespace POA_ImplementationRepository
 {
+  
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:86
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:87
   
   class Locator;
   typedef Locator *Locator_ptr;
@@ -72,6 +81,11 @@ TAO_NAMESPACE  POA_ImplementationRepository
     Locator (void);
   
   public:
+    // Useful for template programming.
+    typedef ::ImplementationRepository::Locator _stub_type;
+    typedef ::ImplementationRepository::Locator_ptr _stub_ptr_type;
+    typedef ::ImplementationRepository::Locator_var _stub_var_type;
+    
     Locator (const Locator& rhs);
     virtual ~Locator (void);
     
@@ -246,9 +260,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1899
     
-    static void activate_server_skel (
+    static void
+    activate_server_skel (
         TAO_ServerRequest &req, 
         void *obj,
         void *context
@@ -256,9 +271,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1899
     
-    static void activate_server_with_startup_skel (
+    static void
+    activate_server_with_startup_skel (
         TAO_ServerRequest &req, 
         void *obj,
         void *context
@@ -266,9 +282,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1899
     
-    static void register_server_skel (
+    static void
+    register_server_skel (
         TAO_ServerRequest &req, 
         void *obj,
         void *context
@@ -276,9 +293,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1899
     
-    static void reregister_server_skel (
+    static void
+    reregister_server_skel (
         TAO_ServerRequest &req, 
         void *obj,
         void *context
@@ -286,9 +304,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1899
     
-    static void remove_server_skel (
+    static void
+    remove_server_skel (
         TAO_ServerRequest &req, 
         void *obj,
         void *context
@@ -296,9 +315,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1899
     
-    static void shutdown_server_skel (
+    static void
+    shutdown_server_skel (
         TAO_ServerRequest &req, 
         void *obj,
         void *context
@@ -306,9 +326,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1899
     
-    static void server_is_running_skel (
+    static void
+    server_is_running_skel (
         TAO_ServerRequest &req, 
         void *obj,
         void *context
@@ -316,9 +337,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1899
     
-    static void server_is_shutting_down_skel (
+    static void
+    server_is_shutting_down_skel (
         TAO_ServerRequest &req, 
         void *obj,
         void *context
@@ -326,9 +348,10 @@ TAO_NAMESPACE  POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1899
     
-    static void find_skel (
+    static void
+    find_skel (
         TAO_ServerRequest &req, 
         void *obj,
         void *context
@@ -336,178 +359,351 @@ TAO_NAMESPACE  POA_ImplementationRepository
       );
     
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1899
     
-    static void list_skel (
+    static void
+    list_skel (
         TAO_ServerRequest &req, 
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-  };  
+  };
   
   ///////////////////////////////////////////////////////////////////////
   //               Strategized Proxy Broker Declaration 
   //
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:39
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:37
   
-  class TAO_PortableServer_Export _TAO_Locator_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_Locator_Proxy_Broker
+  class TAO_PortableServer_Export _TAO_Locator_Strategized_Proxy_Broker
+    : public virtual TAO::Collocation_Proxy_Broker
   {
   public: 
     _TAO_Locator_Strategized_Proxy_Broker (void);
     
     virtual ~_TAO_Locator_Strategized_Proxy_Broker (void);
     
-    virtual ::ImplementationRepository::_TAO_Locator_Proxy_Impl &select_proxy (
-      ::ImplementationRepository::Locator *object
+    TAO::Collocation_Strategy
+    get_strategy (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::SystemException));
+    
+    void
+    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));
+  
+  static
+  _TAO_Locator_Strategized_Proxy_Broker *
+  the_TAO_Locator_Strategized_Proxy_Broker (void);
+};
+
+//
+//            End Strategized Proxy Broker Declaration 
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+//                    ThruPOA Proxy Impl. Declaration
+//
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+
+class TAO_PortableServer_Export _TAO_Locator_ThruPOA_Proxy_Impl
+  : public virtual TAO_ThruPOA_Object_Proxy_Impl,
+    public virtual ::POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl
+{
+public:
+  _TAO_Locator_ThruPOA_Proxy_Impl (void);
+  
+  virtual ~_TAO_Locator_ThruPOA_Proxy_Impl (void) {}
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+  
+  static void
+  activate_server_in_location (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
-    );
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+      , ImplementationRepository::NotFound
+      , ImplementationRepository::CannotActivate
+    ));
   
-  private:
-    // Helper methods that takes care to create the proxy
-    // as soon as their use is necessary.
-    void create_proxy (
-      int collocation_strategy
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+  
+  static void
+  remove_server_in_location (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
-    );
-    
-    // Caches the proxy implementations. The proxy implementation
-    // are totally stateless, and those can be shared by all the
-    // instances of a given IDL interface type.
-    ::ImplementationRepository::_TAO_Locator_Proxy_Impl
-    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-    
-    TAO_SYNCH_MUTEX mutex_;
-    // This funxtion is used to get an handle to the unique instance
-    // of the Strategized Proxy Broker that is available for a given
-    // interface.
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+      , ImplementationRepository::NotFound
+    ));
   
-  public:
-    static _TAO_Locator_Strategized_Proxy_Broker *the_TAO_Locator_Strategized_Proxy_Broker (void);
-  };
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  //
-  //            End Strategized Proxy Broker Declaration 
-  ///////////////////////////////////////////////////////////////////////
+  static void
+  shutdown_server_in_location (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+      , ImplementationRepository::NotFound
+    ));
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  ///////////////////////////////////////////////////////////////////////
-  //                    ThruPOA  Impl. Declaration
-  //
+  static void
+  server_is_shutting_down_in_location (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+      , ImplementationRepository::NotFound
+    ));
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  class TAO_PortableServer_Export _TAO_Locator_ThruPOA_Proxy_Impl : 
-    public virtual ::ImplementationRepository::_TAO_Locator_Proxy_Impl,
-    public virtual TAO_ThruPOA_Object_Proxy_Impl,
-    public virtual ::POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl
-  {
-  public:
-    _TAO_Locator_ThruPOA_Proxy_Impl (void);
-    
-    virtual ~_TAO_Locator_ThruPOA_Proxy_Impl (void) {}
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    virtual void activate_server_in_location (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server,
-        const char * location
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-        , ImplementationRepository::CannotActivate
-      ));
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    virtual void remove_server_in_location (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server,
-        const char * location
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-      ));
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    virtual void shutdown_server_in_location (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server,
-        const char * location
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-      ));
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    virtual void server_is_shutting_down_in_location (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server,
-        const char * location
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-      ));
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    virtual CORBA::ULong register_activator (
-        CORBA::Object *_collocated_tao_target_,
-        const char * location,
-        CORBA::Object_ptr object_ref
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::AlreadyRegistered
-      ));
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    virtual CORBA::ULong unregister_activator (
-        CORBA::Object *_collocated_tao_target_,
-        const char * location,
-        CORBA::Object_ptr object_ref
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-      ));
-  };
+  static void
+  register_activator (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+      , ImplementationRepository::AlreadyRegistered
+    ));
   
-  //
-  //                ThruPOA  Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+  
+  static void
+  unregister_activator (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+      , ImplementationRepository::NotFound
+    ));
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2080
+  
+  static void
+  activate_server (
+      CORBA::Object_ptr obj, 
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      ImplementationRepository::NotFound,
+      ImplementationRepository::CannotActivate
+    ));
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2080
+  
+  static void
+  activate_server_with_startup (
+      CORBA::Object_ptr obj, 
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      ImplementationRepository::NotFound,
+      ImplementationRepository::CannotActivate
+    ));
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2080
+  
+  static void
+  register_server (
+      CORBA::Object_ptr obj, 
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      ImplementationRepository::AlreadyRegistered
+    ));
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2080
+  
+  static void
+  reregister_server (
+      CORBA::Object_ptr obj, 
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2080
+  
+  static void
+  remove_server (
+      CORBA::Object_ptr obj, 
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      ImplementationRepository::NotFound
+    ));
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2080
+  
+  static void
+  shutdown_server (
+      CORBA::Object_ptr obj, 
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      ImplementationRepository::NotFound
+    ));
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2080
+  
+  static void
+  server_is_running (
+      CORBA::Object_ptr obj, 
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      ImplementationRepository::NotFound
+    ));
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2080
+  
+  static void
+  server_is_shutting_down (
+      CORBA::Object_ptr obj, 
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      ImplementationRepository::NotFound
+    ));
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2080
+  
+  static void
+  find (
+      CORBA::Object_ptr obj, 
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      ImplementationRepository::NotFound
+    ));
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2080
+  
+  static void
+  list (
+      CORBA::Object_ptr obj, 
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+};
+
+//
+//                ThruPOA  Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
+
 ///////////////////////////////////////////////////////////////////////
 //                    Direct  Impl. Declaration
 //
 
-class TAO_PortableServer_Export _TAO_Locator_Direct_Proxy_Impl : 
-  public virtual ImplementationRepository::_TAO_Locator_Proxy_Impl,
-  public virtual TAO_Direct_Object_Proxy_Impl,
-  public virtual POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl
-  
+class TAO_PortableServer_Export _TAO_Locator_Direct_Proxy_Impl
+  : public virtual TAO_Direct_Object_Proxy_Impl,
+    public virtual ::POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl
+    
 {
 public:
   _TAO_Locator_Direct_Proxy_Impl (void);
@@ -517,10 +713,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual void activate_server_in_location (
-      CORBA::Object *_collocated_tao_target_,
-      const char * server,
-      const char * location
+  static void
+  activate_server_in_location (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -532,10 +730,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual void remove_server_in_location (
-      CORBA::Object *_collocated_tao_target_,
-      const char * server,
-      const char * location
+  static void
+  remove_server_in_location (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -546,10 +746,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual void shutdown_server_in_location (
-      CORBA::Object *_collocated_tao_target_,
-      const char * server,
-      const char * location
+  static void
+  shutdown_server_in_location (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -560,10 +762,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual void server_is_shutting_down_in_location (
-      CORBA::Object *_collocated_tao_target_,
-      const char * server,
-      const char * location
+  static void
+  server_is_shutting_down_in_location (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -574,10 +778,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual CORBA::ULong register_activator (
-      CORBA::Object *_collocated_tao_target_,
-      const char * location,
-      CORBA::Object_ptr object_ref
+  static void
+  register_activator (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -588,17 +794,179 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual CORBA::ULong unregister_activator (
-      CORBA::Object *_collocated_tao_target_,
-      const char * location,
-      CORBA::Object_ptr object_ref
+  static void
+  unregister_activator (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
       , ImplementationRepository::NotFound
-    ));};
-
+    ));
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2080
+  
+  static void
+  activate_server (
+      CORBA::Object_ptr obj, 
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      ImplementationRepository::NotFound,
+      ImplementationRepository::CannotActivate
+    ));
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2080
+  
+  static void
+  activate_server_with_startup (
+      CORBA::Object_ptr obj, 
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      ImplementationRepository::NotFound,
+      ImplementationRepository::CannotActivate
+    ));
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2080
+  
+  static void
+  register_server (
+      CORBA::Object_ptr obj, 
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      ImplementationRepository::AlreadyRegistered
+    ));
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2080
+  
+  static void
+  reregister_server (
+      CORBA::Object_ptr obj, 
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2080
+  
+  static void
+  remove_server (
+      CORBA::Object_ptr obj, 
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      ImplementationRepository::NotFound
+    ));
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2080
+  
+  static void
+  shutdown_server (
+      CORBA::Object_ptr obj, 
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      ImplementationRepository::NotFound
+    ));
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2080
+  
+  static void
+  server_is_running (
+      CORBA::Object_ptr obj, 
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      ImplementationRepository::NotFound
+    ));
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2080
+  
+  static void
+  server_is_shutting_down (
+      CORBA::Object_ptr obj, 
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      ImplementationRepository::NotFound
+    ));
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2080
+  
+  static void
+  find (
+      CORBA::Object_ptr obj, 
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      ImplementationRepository::NotFound
+    ));
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2080
+  
+  static void
+  list (
+      CORBA::Object_ptr obj, 
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+};
 
 //
 //                Direct  Proxy Impl. Declaration
@@ -609,11 +977,10 @@ public:
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:80
 
-}
-TAO_NAMESPACE_CLOSE // module ImplementationRepository
+} // module ImplementationRepository
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1044
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:961
 
 #include "ImR_LocatorS_T.h"
 
diff --git a/TAO/tao/PortableServer/ImR_LocatorS.i b/TAO/tao/PortableServer/ImR_LocatorS.i
index f8328837605..39d9685f377 100644
--- a/TAO/tao/PortableServer/ImR_LocatorS.i
+++ b/TAO/tao/PortableServer/ImR_LocatorS.i
@@ -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_interface.cpp:2228
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1899
 
 ACE_INLINE void POA_ImplementationRepository::Locator::activate_server_skel (
     TAO_ServerRequest &req,
@@ -40,7 +46,7 @@ ACE_INLINE void POA_ImplementationRepository::Locator::activate_server_skel (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1899
 
 ACE_INLINE void POA_ImplementationRepository::Locator::activate_server_with_startup_skel (
     TAO_ServerRequest &req,
@@ -59,7 +65,7 @@ ACE_INLINE void POA_ImplementationRepository::Locator::activate_server_with_star
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1899
 
 ACE_INLINE void POA_ImplementationRepository::Locator::register_server_skel (
     TAO_ServerRequest &req,
@@ -78,7 +84,7 @@ ACE_INLINE void POA_ImplementationRepository::Locator::register_server_skel (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1899
 
 ACE_INLINE void POA_ImplementationRepository::Locator::reregister_server_skel (
     TAO_ServerRequest &req,
@@ -97,7 +103,7 @@ ACE_INLINE void POA_ImplementationRepository::Locator::reregister_server_skel (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1899
 
 ACE_INLINE void POA_ImplementationRepository::Locator::remove_server_skel (
     TAO_ServerRequest &req,
@@ -116,7 +122,7 @@ ACE_INLINE void POA_ImplementationRepository::Locator::remove_server_skel (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1899
 
 ACE_INLINE void POA_ImplementationRepository::Locator::shutdown_server_skel (
     TAO_ServerRequest &req,
@@ -135,7 +141,7 @@ ACE_INLINE void POA_ImplementationRepository::Locator::shutdown_server_skel (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1899
 
 ACE_INLINE void POA_ImplementationRepository::Locator::server_is_running_skel (
     TAO_ServerRequest &req,
@@ -154,7 +160,7 @@ ACE_INLINE void POA_ImplementationRepository::Locator::server_is_running_skel (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1899
 
 ACE_INLINE void POA_ImplementationRepository::Locator::server_is_shutting_down_skel (
     TAO_ServerRequest &req,
@@ -173,7 +179,7 @@ ACE_INLINE void POA_ImplementationRepository::Locator::server_is_shutting_down_s
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1899
 
 ACE_INLINE void POA_ImplementationRepository::Locator::find_skel (
     TAO_ServerRequest &req,
@@ -192,7 +198,7 @@ ACE_INLINE void POA_ImplementationRepository::Locator::find_skel (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:2228
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1899
 
 ACE_INLINE void POA_ImplementationRepository::Locator::list_skel (
     TAO_ServerRequest &req,
@@ -210,3 +216,521 @@ ACE_INLINE void POA_ImplementationRepository::Locator::list_skel (
     );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1200
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::activate_server (
+    CORBA::Object_ptr obj, 
+    CORBA::Object_out obj_forward,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ImplementationRepository::NotFound,
+    ImplementationRepository::CannotActivate
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server (
+      obj,
+      obj_forward,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1200
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::activate_server (
+    CORBA::Object_ptr obj, 
+    CORBA::Object_out obj_forward,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ImplementationRepository::NotFound,
+    ImplementationRepository::CannotActivate
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server (
+      obj,
+      obj_forward,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1200
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::activate_server_with_startup (
+    CORBA::Object_ptr obj, 
+    CORBA::Object_out obj_forward,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ImplementationRepository::NotFound,
+    ImplementationRepository::CannotActivate
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server_with_startup (
+      obj,
+      obj_forward,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1200
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::activate_server_with_startup (
+    CORBA::Object_ptr obj, 
+    CORBA::Object_out obj_forward,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ImplementationRepository::NotFound,
+    ImplementationRepository::CannotActivate
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server_with_startup (
+      obj,
+      obj_forward,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1200
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::register_server (
+    CORBA::Object_ptr obj, 
+    CORBA::Object_out obj_forward,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ImplementationRepository::AlreadyRegistered
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::register_server (
+      obj,
+      obj_forward,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1200
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::register_server (
+    CORBA::Object_ptr obj, 
+    CORBA::Object_out obj_forward,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ImplementationRepository::AlreadyRegistered
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::register_server (
+      obj,
+      obj_forward,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1200
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::reregister_server (
+    CORBA::Object_ptr obj, 
+    CORBA::Object_out obj_forward,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::reregister_server (
+      obj,
+      obj_forward,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1200
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::reregister_server (
+    CORBA::Object_ptr obj, 
+    CORBA::Object_out obj_forward,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregister_server (
+      obj,
+      obj_forward,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1200
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::remove_server (
+    CORBA::Object_ptr obj, 
+    CORBA::Object_out obj_forward,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remove_server (
+      obj,
+      obj_forward,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1200
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::remove_server (
+    CORBA::Object_ptr obj, 
+    CORBA::Object_out obj_forward,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_server (
+      obj,
+      obj_forward,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1200
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::shutdown_server (
+    CORBA::Object_ptr obj, 
+    CORBA::Object_out obj_forward,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutdown_server (
+      obj,
+      obj_forward,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1200
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::shutdown_server (
+    CORBA::Object_ptr obj, 
+    CORBA::Object_out obj_forward,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_server (
+      obj,
+      obj_forward,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1200
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_running (
+    CORBA::Object_ptr obj, 
+    CORBA::Object_out obj_forward,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_running (
+      obj,
+      obj_forward,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1200
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::server_is_running (
+    CORBA::Object_ptr obj, 
+    CORBA::Object_out obj_forward,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_running (
+      obj,
+      obj_forward,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1200
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::server_is_shutting_down (
+    CORBA::Object_ptr obj, 
+    CORBA::Object_out obj_forward,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_shutting_down (
+      obj,
+      obj_forward,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1200
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::server_is_shutting_down (
+    CORBA::Object_ptr obj, 
+    CORBA::Object_out obj_forward,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_shutting_down (
+      obj,
+      obj_forward,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1200
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::find (
+    CORBA::Object_ptr obj, 
+    CORBA::Object_out obj_forward,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find (
+      obj,
+      obj_forward,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1200
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::find (
+    CORBA::Object_ptr obj, 
+    CORBA::Object_out obj_forward,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException,
+    ImplementationRepository::NotFound
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find (
+      obj,
+      obj_forward,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1200
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_ThruPOA_Proxy_Impl::list (
+    CORBA::Object_ptr obj, 
+    CORBA::Object_out obj_forward,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list (
+      obj,
+      obj_forward,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
+
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1200
+
+ACE_INLINE void
+POA_ImplementationRepository::_TAO_Locator_Direct_Proxy_Impl::list (
+    CORBA::Object_ptr obj, 
+    CORBA::Object_out obj_forward,
+    TAO::Argument ** args,
+    int num_args
+    ACE_ENV_ARG_DECL
+  )
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
+{
+  POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list (
+      obj,
+      obj_forward,
+      args,
+      num_args
+      ACE_ENV_ARG_PARAMETER
+    );
+}
diff --git a/TAO/tao/PortableServer/ImR_LocatorS_T.cpp b/TAO/tao/PortableServer/ImR_LocatorS_T.cpp
index 3b32af55826..c5b083541b5 100644
--- a/TAO/tao/PortableServer/ImR_LocatorS_T.cpp
+++ b/TAO/tao/PortableServer/ImR_LocatorS_T.cpp
@@ -15,12 +15,18 @@
 //       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:777
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:694
 
 #ifndef _TAO_IDL_ORIG_IMR_LOCATORS_T_CPP_
 #define _TAO_IDL_ORIG_IMR_LOCATORS_T_CPP_
diff --git a/TAO/tao/PortableServer/ImR_LocatorS_T.h b/TAO/tao/PortableServer/ImR_LocatorS_T.h
index c7b3c194349..922f037c371 100644
--- a/TAO/tao/PortableServer/ImR_LocatorS_T.h
+++ b/TAO/tao/PortableServer/ImR_LocatorS_T.h
@@ -15,12 +15,18 @@
 //       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:604
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:553
 
 #ifndef _TAO_IDL_ORIG_IMR_LOCATORS_T_H_
 #define _TAO_IDL_ORIG_IMR_LOCATORS_T_H_
@@ -39,7 +45,7 @@
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_sth.cpp:116
 
 #if defined (ACE_HAS_USING_KEYWORD)
-TAO_NAMESPACE  POA_ImplementationRepository
+namespace POA_ImplementationRepository
 {
   
   // TAO_IDL - Generated from
@@ -85,9 +91,8 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
-    void activate_server_in_location (
-        const char * server,
-        const char * location
+    void activate_server (
+        const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -99,61 +104,59 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
-    void remove_server_in_location (
+    char * activate_server_with_startup (
         const char * server,
-        const char * location
+        CORBA::Long check_startup
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
         , ImplementationRepository::NotFound
+        , ImplementationRepository::CannotActivate
       ));
     
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
-    void shutdown_server_in_location (
+    void register_server (
         const char * server,
-        const char * location
+        const ImplementationRepository::StartupOptions & options
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
-        , ImplementationRepository::NotFound
+        , ImplementationRepository::AlreadyRegistered
       ));
     
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
-    void server_is_shutting_down_in_location (
+    void reregister_server (
         const char * server,
-        const char * location
+        const ImplementationRepository::StartupOptions & options
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
-        , ImplementationRepository::NotFound
       ));
     
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
-    CORBA::ULong register_activator (
-        const char * location,
-        CORBA::Object_ptr object_ref
+    void remove_server (
+        const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
-        , ImplementationRepository::AlreadyRegistered
+        , ImplementationRepository::NotFound
       ));
     
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
-    CORBA::ULong unregister_activator (
-        const char * location,
-        CORBA::Object_ptr object_ref
+    void shutdown_server (
+        const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -164,49 +167,49 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
-    void activate_server (
-        const char * server
+    char * server_is_running (
+        const char * server,
+        const char * addr,
+        ImplementationRepository::ServerObject_ptr server_object
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
         , ImplementationRepository::NotFound
-        , ImplementationRepository::CannotActivate
       ));
     
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
-    char * activate_server_with_startup (
-        const char * server,
-        CORBA::Long check_startup
+    void server_is_shutting_down (
+        const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
         , ImplementationRepository::NotFound
-        , ImplementationRepository::CannotActivate
       ));
     
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
-    void register_server (
+    void find (
         const char * server,
-        const ImplementationRepository::StartupOptions & options
+        ImplementationRepository::ServerInformation_out info
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
-        , ImplementationRepository::AlreadyRegistered
+        , ImplementationRepository::NotFound
       ));
     
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
-    void reregister_server (
-        const char * server,
-        const ImplementationRepository::StartupOptions & options
+    void list (
+        CORBA::ULong how_many,
+        ImplementationRepository::ServerInformationList_out server_list,
+        ImplementationRepository::ServerInformationIterator_out server_iterator
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -216,20 +219,23 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
-    void remove_server (
-        const char * server
+    void activate_server_in_location (
+        const char * server,
+        const char * location
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
         , ImplementationRepository::NotFound
+        , ImplementationRepository::CannotActivate
       ));
     
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
-    void shutdown_server (
-        const char * server
+    void remove_server_in_location (
+        const char * server,
+        const char * location
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -240,10 +246,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
-    char * server_is_running (
+    void shutdown_server_in_location (
         const char * server,
-        const char * addr,
-        ImplementationRepository::ServerObject_ptr server_object
+        const char * location
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -254,8 +259,9 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
-    void server_is_shutting_down (
-        const char * server
+    void server_is_shutting_down_in_location (
+        const char * server,
+        const char * location
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -266,27 +272,27 @@ TAO_NAMESPACE  POA_ImplementationRepository
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
-    void find (
-        const char * server,
-        ImplementationRepository::ServerInformation_out info
+    CORBA::ULong register_activator (
+        const char * location,
+        CORBA::Object_ptr object_ref
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
-        , ImplementationRepository::NotFound
+        , ImplementationRepository::AlreadyRegistered
       ));
     
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_sh.cpp:60
     
-    void list (
-        CORBA::ULong how_many,
-        ImplementationRepository::ServerInformationList_out server_list,
-        ImplementationRepository::ServerInformationIterator_out server_iterator
+    CORBA::ULong unregister_activator (
+        const char * location,
+        CORBA::Object_ptr object_ref
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
+        , ImplementationRepository::NotFound
       ));
   
   private:
@@ -298,12 +304,11 @@ TAO_NAMESPACE  POA_ImplementationRepository
     Locator_tie (const Locator_tie &);
     void operator= (const Locator_tie &);
   };
-}
-TAO_NAMESPACE_CLOSE // module ImplementationRepository
+} // module ImplementationRepository
 #endif /* ACE_HAS_USING_KEYWORD */
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1141
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1058
 
 #if defined (__ACE_INLINE__)
 #include "ImR_LocatorS_T.i"
diff --git a/TAO/tao/PortableServer/ImR_LocatorS_T.i b/TAO/tao/PortableServer/ImR_LocatorS_T.i
index 050e64e1084..ad5cc44f7c6 100644
--- a/TAO/tao/PortableServer/ImR_LocatorS_T.i
+++ b/TAO/tao/PortableServer/ImR_LocatorS_T.i
@@ -15,6 +15,12 @@
 //       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
@@ -119,9 +125,8 @@ POA_ImplementationRepository::Locator_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_D
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
-void POA_ImplementationRepository::Locator_tie<T>::activate_server_in_location  (
-    const char * server,
-    const char * location
+void POA_ImplementationRepository::Locator_tie<T>::activate_server  (
+    const char * server
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -130,9 +135,8 @@ void POA_ImplementationRepository::Locator_tie<T>::activate_server_in_location
     , ImplementationRepository::CannotActivate
   ))
 {
-  this->ptr_->activate_server_in_location (
-    server,
-    location
+  this->ptr_->activate_server (
+    server
     ACE_ENV_ARG_PARAMETER
   );
 }
@@ -141,19 +145,20 @@ void POA_ImplementationRepository::Locator_tie<T>::activate_server_in_location
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
-void POA_ImplementationRepository::Locator_tie<T>::remove_server_in_location  (
+char * POA_ImplementationRepository::Locator_tie<T>::activate_server_with_startup  (
     const char * server,
-    const char * location
+    CORBA::Long check_startup
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
+    , ImplementationRepository::CannotActivate
   ))
 {
-  this->ptr_->remove_server_in_location (
+  return this->ptr_->activate_server_with_startup (
     server,
-    location
+    check_startup
     ACE_ENV_ARG_PARAMETER
   );
 }
@@ -162,19 +167,19 @@ void POA_ImplementationRepository::Locator_tie<T>::remove_server_in_location  (
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
-void POA_ImplementationRepository::Locator_tie<T>::shutdown_server_in_location  (
+void POA_ImplementationRepository::Locator_tie<T>::register_server  (
     const char * server,
-    const char * location
+    const ImplementationRepository::StartupOptions & options
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
-    , ImplementationRepository::NotFound
+    , ImplementationRepository::AlreadyRegistered
   ))
 {
-  this->ptr_->shutdown_server_in_location (
+  this->ptr_->register_server (
     server,
-    location
+    options
     ACE_ENV_ARG_PARAMETER
   );
 }
@@ -183,19 +188,18 @@ void POA_ImplementationRepository::Locator_tie<T>::shutdown_server_in_location
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
-void POA_ImplementationRepository::Locator_tie<T>::server_is_shutting_down_in_location  (
+void POA_ImplementationRepository::Locator_tie<T>::reregister_server  (
     const char * server,
-    const char * location
+    const ImplementationRepository::StartupOptions & options
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
-    , ImplementationRepository::NotFound
   ))
 {
-  this->ptr_->server_is_shutting_down_in_location (
+  this->ptr_->reregister_server (
     server,
-    location
+    options
     ACE_ENV_ARG_PARAMETER
   );
 }
@@ -204,19 +208,17 @@ void POA_ImplementationRepository::Locator_tie<T>::server_is_shutting_down_in_lo
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
-CORBA::ULong POA_ImplementationRepository::Locator_tie<T>::register_activator  (
-    const char * location,
-    CORBA::Object_ptr object_ref
+void POA_ImplementationRepository::Locator_tie<T>::remove_server  (
+    const char * server
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
-    , ImplementationRepository::AlreadyRegistered
+    , ImplementationRepository::NotFound
   ))
 {
-  return this->ptr_->register_activator (
-    location,
-    object_ref
+  this->ptr_->remove_server (
+    server
     ACE_ENV_ARG_PARAMETER
   );
 }
@@ -225,9 +227,8 @@ CORBA::ULong POA_ImplementationRepository::Locator_tie<T>::register_activator  (
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
-CORBA::ULong POA_ImplementationRepository::Locator_tie<T>::unregister_activator  (
-    const char * location,
-    CORBA::Object_ptr object_ref
+void POA_ImplementationRepository::Locator_tie<T>::shutdown_server  (
+    const char * server
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -235,9 +236,8 @@ CORBA::ULong POA_ImplementationRepository::Locator_tie<T>::unregister_activator
     , ImplementationRepository::NotFound
   ))
 {
-  return this->ptr_->unregister_activator (
-    location,
-    object_ref
+  this->ptr_->shutdown_server (
+    server
     ACE_ENV_ARG_PARAMETER
   );
 }
@@ -246,18 +246,21 @@ CORBA::ULong POA_ImplementationRepository::Locator_tie<T>::unregister_activator
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
-void POA_ImplementationRepository::Locator_tie<T>::activate_server  (
-    const char * server
+char * POA_ImplementationRepository::Locator_tie<T>::server_is_running  (
+    const char * server,
+    const char * addr,
+    ImplementationRepository::ServerObject_ptr server_object
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
-    , ImplementationRepository::CannotActivate
   ))
 {
-  this->ptr_->activate_server (
-    server
+  return this->ptr_->server_is_running (
+    server,
+    addr,
+    server_object
     ACE_ENV_ARG_PARAMETER
   );
 }
@@ -266,20 +269,17 @@ void POA_ImplementationRepository::Locator_tie<T>::activate_server  (
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
-char * POA_ImplementationRepository::Locator_tie<T>::activate_server_with_startup  (
-    const char * server,
-    CORBA::Long check_startup
+void POA_ImplementationRepository::Locator_tie<T>::server_is_shutting_down  (
+    const char * server
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
-    , ImplementationRepository::CannotActivate
   ))
 {
-  return this->ptr_->activate_server_with_startup (
-    server,
-    check_startup
+  this->ptr_->server_is_shutting_down (
+    server
     ACE_ENV_ARG_PARAMETER
   );
 }
@@ -288,19 +288,19 @@ char * POA_ImplementationRepository::Locator_tie<T>::activate_server_with_startu
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
-void POA_ImplementationRepository::Locator_tie<T>::register_server  (
+void POA_ImplementationRepository::Locator_tie<T>::find  (
     const char * server,
-    const ImplementationRepository::StartupOptions & options
+    ImplementationRepository::ServerInformation_out info
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
-    , ImplementationRepository::AlreadyRegistered
+    , ImplementationRepository::NotFound
   ))
 {
-  this->ptr_->register_server (
+  this->ptr_->find (
     server,
-    options
+    info
     ACE_ENV_ARG_PARAMETER
   );
 }
@@ -309,18 +309,20 @@ void POA_ImplementationRepository::Locator_tie<T>::register_server  (
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
-void POA_ImplementationRepository::Locator_tie<T>::reregister_server  (
-    const char * server,
-    const ImplementationRepository::StartupOptions & options
+void POA_ImplementationRepository::Locator_tie<T>::list  (
+    CORBA::ULong how_many,
+    ImplementationRepository::ServerInformationList_out server_list,
+    ImplementationRepository::ServerInformationIterator_out server_iterator
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  this->ptr_->reregister_server (
-    server,
-    options
+  this->ptr_->list (
+    how_many,
+    server_list,
+    server_iterator
     ACE_ENV_ARG_PARAMETER
   );
 }
@@ -329,17 +331,20 @@ void POA_ImplementationRepository::Locator_tie<T>::reregister_server  (
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
-void POA_ImplementationRepository::Locator_tie<T>::remove_server  (
-    const char * server
+void POA_ImplementationRepository::Locator_tie<T>::activate_server_in_location  (
+    const char * server,
+    const char * location
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
+    , ImplementationRepository::CannotActivate
   ))
 {
-  this->ptr_->remove_server (
-    server
+  this->ptr_->activate_server_in_location (
+    server,
+    location
     ACE_ENV_ARG_PARAMETER
   );
 }
@@ -348,8 +353,9 @@ void POA_ImplementationRepository::Locator_tie<T>::remove_server  (
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
-void POA_ImplementationRepository::Locator_tie<T>::shutdown_server  (
-    const char * server
+void POA_ImplementationRepository::Locator_tie<T>::remove_server_in_location  (
+    const char * server,
+    const char * location
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -357,8 +363,9 @@ void POA_ImplementationRepository::Locator_tie<T>::shutdown_server  (
     , ImplementationRepository::NotFound
   ))
 {
-  this->ptr_->shutdown_server (
-    server
+  this->ptr_->remove_server_in_location (
+    server,
+    location
     ACE_ENV_ARG_PARAMETER
   );
 }
@@ -367,10 +374,9 @@ void POA_ImplementationRepository::Locator_tie<T>::shutdown_server  (
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
-char * POA_ImplementationRepository::Locator_tie<T>::server_is_running  (
+void POA_ImplementationRepository::Locator_tie<T>::shutdown_server_in_location  (
     const char * server,
-    const char * addr,
-    ImplementationRepository::ServerObject_ptr server_object
+    const char * location
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -378,10 +384,9 @@ char * POA_ImplementationRepository::Locator_tie<T>::server_is_running  (
     , ImplementationRepository::NotFound
   ))
 {
-  return this->ptr_->server_is_running (
+  this->ptr_->shutdown_server_in_location (
     server,
-    addr,
-    server_object
+    location
     ACE_ENV_ARG_PARAMETER
   );
 }
@@ -390,8 +395,9 @@ char * POA_ImplementationRepository::Locator_tie<T>::server_is_running  (
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
-void POA_ImplementationRepository::Locator_tie<T>::server_is_shutting_down  (
-    const char * server
+void POA_ImplementationRepository::Locator_tie<T>::server_is_shutting_down_in_location  (
+    const char * server,
+    const char * location
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -399,8 +405,9 @@ void POA_ImplementationRepository::Locator_tie<T>::server_is_shutting_down  (
     , ImplementationRepository::NotFound
   ))
 {
-  this->ptr_->server_is_shutting_down (
-    server
+  this->ptr_->server_is_shutting_down_in_location (
+    server,
+    location
     ACE_ENV_ARG_PARAMETER
   );
 }
@@ -409,19 +416,19 @@ void POA_ImplementationRepository::Locator_tie<T>::server_is_shutting_down  (
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
-void POA_ImplementationRepository::Locator_tie<T>::find  (
-    const char * server,
-    ImplementationRepository::ServerInformation_out info
+CORBA::ULong POA_ImplementationRepository::Locator_tie<T>::register_activator  (
+    const char * location,
+    CORBA::Object_ptr object_ref
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
-    , ImplementationRepository::NotFound
+    , ImplementationRepository::AlreadyRegistered
   ))
 {
-  this->ptr_->find (
-    server,
-    info
+  return this->ptr_->register_activator (
+    location,
+    object_ref
     ACE_ENV_ARG_PARAMETER
   );
 }
@@ -430,20 +437,19 @@ void POA_ImplementationRepository::Locator_tie<T>::find  (
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/tie_si.cpp:68
 
 template <class T> ACE_INLINE
-void POA_ImplementationRepository::Locator_tie<T>::list  (
-    CORBA::ULong how_many,
-    ImplementationRepository::ServerInformationList_out server_list,
-    ImplementationRepository::ServerInformationIterator_out server_iterator
+CORBA::ULong POA_ImplementationRepository::Locator_tie<T>::unregister_activator  (
+    const char * location,
+    CORBA::Object_ptr object_ref
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
+    , ImplementationRepository::NotFound
   ))
 {
-  this->ptr_->list (
-    how_many,
-    server_list,
-    server_iterator
+  return this->ptr_->unregister_activator (
+    location,
+    object_ref
     ACE_ENV_ARG_PARAMETER
   );
 }
diff --git a/TAO/tao/PortableServer/ImplRepo.pidl b/TAO/tao/PortableServer/ImplRepo.pidl
index 1f0ff25b9e8..4ab5392258a 100644
--- a/TAO/tao/PortableServer/ImplRepo.pidl
+++ b/TAO/tao/PortableServer/ImplRepo.pidl
@@ -11,7 +11,7 @@
  * The command used to generate code from this file is:
  *
  *   tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1
+ *        -o orig -Gp -Gd -Ge 1 -GT
  *        -Wb,export_macro=TAO_PortableServer_Export
  *        -Wb,export_include=portableserver_export.h
  *        -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/PortableServer/ImplRepoC.cpp b/TAO/tao/PortableServer/ImplRepoC.cpp
index 02810eb64f2..6da41e03f65 100644
--- a/TAO/tao/PortableServer/ImplRepoC.cpp
+++ b/TAO/tao/PortableServer/ImplRepoC.cpp
@@ -26,20 +26,21 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:314
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:301
 
 
 #include "ImplRepoC.h"
 #include "tao/Stub.h"
-#include "tao/Invocation.h"
-#include "tao/PortableInterceptor.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
-#include "tao/ClientRequestInfo_i.h"
-#include "tao/ClientInterceptorAdapter.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
+#include "tao/Invocation_Adapter.h"
+#include "tao/Object_T.h"
+#include "tao/Any_Impl_T.h"
+#include "tao/Any_Dual_Impl_T.h"
+#include "tao/Any_Basic_Impl_T.h"
+#include "tao/Basic_Arguments.h"
+#include "tao/Object_Argument_T.h"
+#include "tao/Special_Basic_Arguments.h"
+#include "tao/UB_String_Arguments.h"
+#include "tao/Var_Size_Argument_T.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -50,628 +51,268 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:57
-
-int ImplementationRepository::ServerObject::_tao_class_id = 0;
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        ImplementationRepository::ServerObject,
-        ImplementationRepository::tao_ServerObject_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        ImplementationRepository::ServerObject,
-        ImplementationRepository::tao_ServerObject_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        ImplementationRepository::ServerObject, \
-        ImplementationRepository::tao_ServerObject_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        ImplementationRepository::ServerObject, \
-        ImplementationRepository::tao_ServerObject_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59
 
-class TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping : public TAO_ClientRequestInfo_i
+// Arg traits specializations.
+namespace TAO
 {
-public:
-  TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
 
-  private:
-    TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping &);
-    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping &);
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_CS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerObject>
+    : public
+        Object_Arg_Traits_T<
+            ImplementationRepository::ServerObject_ptr,
+            ImplementationRepository::ServerObject_var,
+            ImplementationRepository::ServerObject_out,
+            TAO::Objref_Traits<ImplementationRepository::ServerObject>
+          >
+  {
   };
+
+#endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:376
-  
-  TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
-{}
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:428
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_)
+#define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::StartupOptions>
+    : public
+        Var_Size_Arg_Traits_T<
+            ImplementationRepository::StartupOptions,
+            ImplementationRepository::StartupOptions_var,
+            ImplementationRepository::StartupOptions_out
+          >
+  {
+  };
 
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+#endif /* end #if !defined */
   
-  return parameter_list;
-}
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:428
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_CS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformation>
+    : public
+        Var_Size_Arg_Traits_T<
+            ImplementationRepository::ServerInformation,
+            ImplementationRepository::ServerInformation_var,
+            ImplementationRepository::ServerInformation_out
+          >
+  {
+  };
 
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+#endif /* end #if !defined */
   
-  return exception_list;
-}
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:428
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_)
+#define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::StartupOptions>
+    : public
+        Var_Size_Arg_Traits_T<
+            ImplementationRepository::StartupOptions,
+            ImplementationRepository::StartupOptions_var,
+            ImplementationRepository::StartupOptions_out
+          >
+  {
+  };
 
-CORBA::Any * 
-TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
+#endif /* end #if !defined */
   
-  return result_any;
-}
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:262
+
+#if !defined (__TAO_SEQ_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION___ARG_TRAITS_CS_)
+#define __TAO_SEQ_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION___ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationList>
+    : public
+        Var_Size_Arg_Traits_T<
+            ImplementationRepository::ServerInformationList,
+            ImplementationRepository::ServerInformationList_var,
+            ImplementationRepository::ServerInformationList_out
+          >
+  {
+  };
 
+#endif /* end #if !defined */
 
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_CS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationIterator>
+    : public
+        Object_Arg_Traits_T<
+            ImplementationRepository::ServerInformationIterator_ptr,
+            ImplementationRepository::ServerInformationIterator_var,
+            ImplementationRepository::ServerInformationIterator_out,
+            TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>
+          >
+  {
+  };
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+#endif /* end #if !defined */
 
-class TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown : public TAO_ClientRequestInfo_i
-{
-public:
-  TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_CS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationIterator>
+    : public
+        Object_Arg_Traits_T<
+            ImplementationRepository::ServerInformationIterator_ptr,
+            ImplementationRepository::ServerInformationIterator_var,
+            ImplementationRepository::ServerInformationIterator_out,
+            TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>
+          >
+  {
+  };
 
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+#endif /* end #if !defined */
+};
 
-  private:
-    TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown &);
-    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown &);
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:376
-  
-  TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
-{}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
+
+// Traits specializations for ImplementationRepository::ServerObject.
 
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+ImplementationRepository::ServerObject_ptr
+TAO::Objref_Traits<ImplementationRepository::ServerObject>::tao_duplicate (
+    ImplementationRepository::ServerObject_ptr p
+  )
 {
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
+  return ImplementationRepository::ServerObject::_duplicate (p);
 }
 
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+void
+TAO::Objref_Traits<ImplementationRepository::ServerObject>::tao_release (
+    ImplementationRepository::ServerObject_ptr p
+  )
 {
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
+  CORBA::release (p);
 }
 
-CORBA::Any * 
-TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+ImplementationRepository::ServerObject_ptr
+TAO::Objref_Traits<ImplementationRepository::ServerObject>::tao_nil (void)
 {
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
+  return ImplementationRepository::ServerObject::_nil ();
 }
 
+CORBA::Boolean
+TAO::Objref_Traits<ImplementationRepository::ServerObject>::tao_marshal (
+    ImplementationRepository::ServerObject_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return p->marshal (cdr);
+}
 
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
-
-///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
-//
-
-ImplementationRepository::_TAO_ServerObject_Proxy_Impl::_TAO_ServerObject_Proxy_Impl (void)
-{}
-
-ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::_TAO_ServerObject_Remote_Proxy_Impl (void)
-{}
-
-// Remote Implementation of the IDL interface methods
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker * 
+(*ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:78
 
-void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::ping (
-    CORBA::Object *_collocated_tao_target_
-    ACE_ENV_ARG_DECL
+void ImplementationRepository::ServerObject::ping (
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  if (!this->is_evaluated ())
+    {
+      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+    }
   
-  if (istub == 0)
+  if (this->the_TAO_ServerObject_Proxy_Broker_ == 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      ImplementationRepository_ServerObject_setup_collocation (
+          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
+        );
     }
-    
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "ping",
-      4,
-      0,
-      istub->orb_core ()
-    );
   
-  int _invoke_status;
+  TAO::Arg_Traits<void>::ret_val _tao_retval;
   
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors (),
-      &_tao_call,
-      _invoke_status
-    );
+  TAO::Argument *_tao_signature [] =
+    {
+      &_tao_retval
+    };
   
-#endif  /* TAO_HAS_INTERCEPTORS */
+  TAO::Invocation_Adapter _tao_call (
+      this,
+      _tao_signature,
+      1,
+      "ping",
+      4,
+      this->the_TAO_ServerObject_Proxy_Broker_
+    );
   
-  for (;;)
-    {
-      _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_ImplementationRepository_ServerObject_ping _tao_ri (
-          &_tao_call,
-          _collocated_tao_target_
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      
-      ACE_TRY
-        {
-          _tao_vfr.send_request (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              _tao_call.restart_flag (1);
-            }
-          else
-            {
-              
-#endif /* TAO_HAS_INTERCEPTORS */
-              
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK;
-
-              
-              _invoke_status =
-                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        )
-                    );
-                }
-              else if (_invoke_status == TAO_INVOKE_RESTART)
-                {
-                  _tao_call.restart_flag (1);
-                  TAO_INTERCEPTOR (
-                      _tao_ri.reply_status (_invoke_status);
-                      _tao_vfr.receive_other (
-                          &_tao_ri
-                          ACE_ENV_ARG_PARAMETER
-                        );
-                      ACE_TRY_CHECK;
-                    )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
-                  _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
-                      &_tao_ri
-                      ACE_ENV_ARG_PARAMETER
-                    );
-                  ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
-            }
-        }
-      ACE_CATCHANY
-        {
-          _tao_ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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;
-      
-      const PortableInterceptor::ReplyStatus _tao_status =
-        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
-#endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
-    }
+  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:78
 
-void ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Impl::shutdown (
-    CORBA::Object *_collocated_tao_target_
-    ACE_ENV_ARG_DECL
+void ImplementationRepository::ServerObject::shutdown (
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  if (!this->is_evaluated ())
+    {
+      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+    }
   
-  if (istub == 0)
+  if (this->the_TAO_ServerObject_Proxy_Broker_ == 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      ImplementationRepository_ServerObject_setup_collocation (
+          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
+        );
     }
-    
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "shutdown",
-      8,
-      0,
-      istub->orb_core ()
-    );
   
-  int _invoke_status;
+  TAO::Arg_Traits<void>::ret_val _tao_retval;
   
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors (),
-      &_tao_call,
-      _invoke_status
-    );
+  TAO::Argument *_tao_signature [] =
+    {
+      &_tao_retval
+    };
   
-#endif  /* TAO_HAS_INTERCEPTORS */
+  TAO::Invocation_Adapter _tao_call (
+      this,
+      _tao_signature,
+      1,
+      "shutdown",
+      8,
+      this->the_TAO_ServerObject_Proxy_Broker_
+    );
   
-  for (;;)
-    {
-      _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_ImplementationRepository_ServerObject_shutdown _tao_ri (
-          &_tao_call,
-          _collocated_tao_target_
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      
-      ACE_TRY
-        {
-          _tao_vfr.send_request (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              _tao_call.restart_flag (1);
-            }
-          else
-            {
-              
-#endif /* TAO_HAS_INTERCEPTORS */
-              
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK;
-
-              
-              _invoke_status =
-                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        )
-                    );
-                }
-              else if (_invoke_status == TAO_INVOKE_RESTART)
-                {
-                  _tao_call.restart_flag (1);
-                  TAO_INTERCEPTOR (
-                      _tao_ri.reply_status (_invoke_status);
-                      _tao_vfr.receive_other (
-                          &_tao_ri
-                          ACE_ENV_ARG_PARAMETER
-                        );
-                      ACE_TRY_CHECK;
-                    )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
-                  _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
-                      &_tao_ri
-                      ACE_ENV_ARG_PARAMETER
-                    );
-                  ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
-            }
-        }
-      ACE_CATCHANY
-        {
-          _tao_ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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;
-      
-      const PortableInterceptor::ReplyStatus _tao_status =
-        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
-#endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
-    }
-}
-
-//
-//            End  Base & Remote  Proxy Implemeentation. 
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
-
-///////////////////////////////////////////////////////////////////////
-//           Remote & Base  Proxy Broker Implementation
-//
-
-ImplementationRepository::_TAO_ServerObject_Proxy_Broker::_TAO_ServerObject_Proxy_Broker (void)
-{
-}
-
-ImplementationRepository::_TAO_ServerObject_Proxy_Broker::~_TAO_ServerObject_Proxy_Broker (void)
-{
-}
-
-ImplementationRepository::_TAO_ServerObject_Proxy_Broker * (*ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker *
-ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker::the_TAO_ServerObject_Remote_Proxy_Broker (void)
-{
-  static ::ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker remote_proxy_broker;
-  return &remote_proxy_broker;
-}
-
-ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker::_TAO_ServerObject_Remote_Proxy_Broker (void)
-{
-}
-
-ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker::~_TAO_ServerObject_Remote_Proxy_Broker (void)
-{
-}
-
-ImplementationRepository::_TAO_ServerObject_Proxy_Impl&
-ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker::select_proxy (
-    ::ImplementationRepository::ServerObject *
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return this->remote_proxy_impl_;
+  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 }
 
-//
-//           End Remote & Base Proxy Broker Implementation
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:239
-
 ImplementationRepository::ServerObject::ServerObject (int collocated)
+ : the_TAO_ServerObject_Proxy_Broker_ (0)
 {
   this->ImplementationRepository_ServerObject_setup_collocation (collocated);
 }
@@ -680,11 +321,10 @@ void
 ImplementationRepository::ServerObject::ImplementationRepository_ServerObject_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_ServerObject_Proxy_Broker_ =
-      ::ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer (this);
-  else
-    this->the_TAO_ServerObject_Proxy_Broker_ =
-      ::ImplementationRepository::_TAO_ServerObject_Remote_Proxy_Broker::the_TAO_ServerObject_Remote_Proxy_Broker ();
+    {
+      this->the_TAO_ServerObject_Proxy_Broker_ =
+        ::ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer (this);
+    }
 }
 
 ImplementationRepository::ServerObject::~ServerObject (void)
@@ -693,120 +333,24 @@ ImplementationRepository::ServerObject::~ServerObject (void)
 void 
 ImplementationRepository::ServerObject::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ServerObject *tmp = ACE_static_cast (ServerObject *, _tao_void_pointer);
-  CORBA::release (tmp);
+  ServerObject *_tao_tmp_pointer =
+    ACE_static_cast (ServerObject *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 ImplementationRepository::ServerObject_ptr
 ImplementationRepository::ServerObject::_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL
   )
 {
-  if (CORBA::is_nil (obj))
-    {
-      return ServerObject::_nil ();
-    }
-  
-  if (! obj->_is_local ())
-    {
-      CORBA::Boolean is_a =
-        obj->_is_a (
-            "IDL:ImplementationRepository/ServerObject:1.0"
-            ACE_ENV_ARG_PARAMETER
-          );
-      ACE_CHECK_RETURN (ServerObject::_nil ());
-      
-      if (is_a == 0)
-        {
-          return ServerObject::_nil ();
-        }
-    }
-  
-  return ServerObject::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-ImplementationRepository::ServerObject_ptr 
-ImplementationRepository::ServerObject::_unchecked_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (obj))
-    {
-      return ServerObject::_nil ();
-    }
-  
-  ServerObject_ptr default_proxy = ServerObject::_nil ();
-  
-  // Code for lazily evaluated IOR's
-  if (!obj->is_evaluated ())
-    {
-      ACE_NEW_RETURN (
-          default_proxy,
-          ::ImplementationRepository::ServerObject (
-              obj->steal_ior (),
-              obj->orb_core ()
-            ),
-          ServerObject::_nil ()
-        );
-      
-      return default_proxy;
-    }
-  
-  if (! obj->_is_local ())
-    {
-      TAO_Stub* stub = obj->_stubobj ();
-      
-      if (stub != 0)
-        {
-          stub->_incr_refcnt ();
-        }
-      
-      if (
-          !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-          stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&
-          ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer != 0
-        )
-        {
-          ACE_NEW_RETURN (
-              default_proxy,
-              ::ImplementationRepository::ServerObject (
-                  stub,
-                  1,
-                  obj->_servant ()
-                ),
-              ServerObject::_nil ()
-            );
-        }
-      
-      if (CORBA::is_nil (default_proxy))
-        {
-          ACE_NEW_RETURN (
-              default_proxy,
-              ::ImplementationRepository::ServerObject (
-                  stub,
-                  0,
-                  obj->_servant ()
-                ),
-              ServerObject::_nil ()
-            );
-        }
-      
-      return default_proxy;
-    }
-  else 
-    return
-      ACE_reinterpret_cast (
-          ServerObject_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &ServerObject::_tao_class_id
-                )
-            )
-        );
+  return
+    TAO::Narrow_Utils<ServerObject>::narrow (
+        _tao_objref,
+        "IDL:ImplementationRepository/ServerObject:1.0",
+        ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer
+        ACE_ENV_ARG_PARAMETER
+      );
 }
 
 ImplementationRepository::ServerObject_ptr
@@ -848,37 +392,6 @@ ImplementationRepository::ServerObject::_is_a (
     }
 }
 
-void *ImplementationRepository::ServerObject::_tao_QueryInterface (ptrdiff_t type)
-{
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::ImplementationRepository, ServerObject)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-  
-  if (retv != 0)
-    {
-      this->_add_ref ();
-    }
-  
-  return retv;
-}
-
 const char* ImplementationRepository::ServerObject::_interface_repository_id (void) const
 {
   return "IDL:ImplementationRepository/ServerObject:1.0";
@@ -891,63 +404,7 @@ ImplementationRepository::ServerObject::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
-
-void ImplementationRepository::ServerObject::ping (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  if (!this->is_evaluated ())
-    {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
-      this->ImplementationRepository_ServerObject_setup_collocation (
-          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
-        );
-    }
-  
-  _TAO_ServerObject_Proxy_Impl &proxy = 
-    this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-  proxy.ping (
-      this
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
-
-void ImplementationRepository::ServerObject::shutdown (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  if (!this->is_evaluated ())
-    {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
-      this->ImplementationRepository_ServerObject_setup_collocation (
-          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
-        );
-    }
-  
-  _TAO_ServerObject_Proxy_Impl &proxy = 
-    this->the_TAO_ServerObject_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-  proxy.shutdown (
-      this
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_ServerObject[] =
 {
@@ -980,17 +437,14 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ServerObject (
     sizeof (ImplementationRepository::ServerObject)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (ImplementationRepository)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ServerObject,
-    &_tc_TAO_tc_ImplementationRepository_ServerObject
-  )
-TAO_NAMESPACE_END
+namespace ImplementationRepository
+{
+  ::CORBA::TypeCode_ptr _tc_ServerObject =
+    &_tc_TAO_tc_ImplementationRepository_ServerObject;
+}
 
 // TAO_IDL - Generated from 
-// be/be_visitor_exception/exception_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 ImplementationRepository::AlreadyRegistered::AlreadyRegistered (void)
   : CORBA::UserException (
@@ -1021,8 +475,9 @@ ImplementationRepository::AlreadyRegistered::operator= (const ::ImplementationRe
 
 void ImplementationRepository::AlreadyRegistered::_tao_any_destructor (void *_tao_void_pointer)
 {
-  AlreadyRegistered *tmp = ACE_static_cast (AlreadyRegistered*, _tao_void_pointer);
-  delete tmp;
+  AlreadyRegistered *_tao_tmp_pointer =
+    ACE_static_cast (AlreadyRegistered*, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
 ImplementationRepository::AlreadyRegistered *
@@ -1095,7 +550,7 @@ CORBA::TypeCode_ptr ImplementationRepository::AlreadyRegistered::_type (void) co
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_AlreadyRegistered[] =
 {
@@ -1131,17 +586,14 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_AlreadyRegistered (
     sizeof (ImplementationRepository::AlreadyRegistered)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (ImplementationRepository)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_AlreadyRegistered,
-    &_tc_TAO_tc_ImplementationRepository_AlreadyRegistered
-  )
-TAO_NAMESPACE_END
+namespace ImplementationRepository
+{
+  ::CORBA::TypeCode_ptr _tc_AlreadyRegistered =
+    &_tc_TAO_tc_ImplementationRepository_AlreadyRegistered;
+}
 
 // TAO_IDL - Generated from 
-// be/be_visitor_exception/exception_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 ImplementationRepository::CannotActivate::CannotActivate (void)
   : CORBA::UserException (
@@ -1174,8 +626,9 @@ ImplementationRepository::CannotActivate::operator= (const ::ImplementationRepos
 
 void ImplementationRepository::CannotActivate::_tao_any_destructor (void *_tao_void_pointer)
 {
-  CannotActivate *tmp = ACE_static_cast (CannotActivate*, _tao_void_pointer);
-  delete tmp;
+  CannotActivate *_tao_tmp_pointer =
+    ACE_static_cast (CannotActivate*, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
 ImplementationRepository::CannotActivate *
@@ -1244,11 +697,12 @@ void ImplementationRepository::CannotActivate::_tao_decode (
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/exception_ctor.cpp:66
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
 
 ImplementationRepository::CannotActivate::CannotActivate (
     const char * _tao_reason
-  )  : CORBA::UserException (
+  )
+  : CORBA::UserException (
         "IDL:ImplementationRepository/CannotActivate:1.0",
         "CannotActivate"
       )
@@ -1263,7 +717,7 @@ CORBA::TypeCode_ptr ImplementationRepository::CannotActivate::_type (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_CannotActivate[] =
 {
@@ -1302,17 +756,14 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_CannotActivate (
     sizeof (ImplementationRepository::CannotActivate)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (ImplementationRepository)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_CannotActivate,
-    &_tc_TAO_tc_ImplementationRepository_CannotActivate
-  )
-TAO_NAMESPACE_END
+namespace ImplementationRepository
+{
+  ::CORBA::TypeCode_ptr _tc_CannotActivate =
+    &_tc_TAO_tc_ImplementationRepository_CannotActivate;
+}
 
 // TAO_IDL - Generated from 
-// be/be_visitor_exception/exception_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 ImplementationRepository::NotFound::NotFound (void)
   : CORBA::UserException (
@@ -1343,8 +794,9 @@ ImplementationRepository::NotFound::operator= (const ::ImplementationRepository:
 
 void ImplementationRepository::NotFound::_tao_any_destructor (void *_tao_void_pointer)
 {
-  NotFound *tmp = ACE_static_cast (NotFound*, _tao_void_pointer);
-  delete tmp;
+  NotFound *_tao_tmp_pointer =
+    ACE_static_cast (NotFound*, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
 ImplementationRepository::NotFound *
@@ -1417,7 +869,7 @@ CORBA::TypeCode_ptr ImplementationRepository::NotFound::_type (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_NotFound[] =
 {
@@ -1449,17 +901,14 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_NotFound (
     sizeof (ImplementationRepository::NotFound)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (ImplementationRepository)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_NotFound,
-    &_tc_TAO_tc_ImplementationRepository_NotFound
-  )
-TAO_NAMESPACE_END
+namespace ImplementationRepository
+{
+  ::CORBA::TypeCode_ptr _tc_NotFound =
+    &_tc_TAO_tc_ImplementationRepository_NotFound;
+}
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_EnvironmentVariable[] =
 {
@@ -1506,65 +955,27 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_EnvironmentVariable (
     sizeof (ImplementationRepository::EnvironmentVariable)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (ImplementationRepository)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_EnvironmentVariable,
-    &_tc_TAO_tc_ImplementationRepository_EnvironmentVariable
-  )
-TAO_NAMESPACE_END
+namespace ImplementationRepository
+{
+  ::CORBA::TypeCode_ptr _tc_EnvironmentVariable =
+    &_tc_TAO_tc_ImplementationRepository_EnvironmentVariable;
+}
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:66
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
-void ImplementationRepository::EnvironmentVariable::_tao_any_destructor (void *_tao_void_pointer)
+void 
+ImplementationRepository::EnvironmentVariable::_tao_any_destructor (
+    void *_tao_void_pointer
+  )
 {
-  EnvironmentVariable *tmp = ACE_static_cast (EnvironmentVariable*, _tao_void_pointer);
-  delete tmp;
+  EnvironmentVariable *_tao_tmp_pointer =
+    ACE_static_cast (EnvironmentVariable *, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
 // TAO_IDL - Generated from
-// be/be_type.cpp:292
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class
-  TAO_Var_Var_T<
-      ImplementationRepository::EnvironmentVariable
-    >;
-
-template class TAO_Var_Base_T<
-    ImplementationRepository::EnvironmentVariable
-  >;
-
-template class
-  TAO_Out_T<
-      ImplementationRepository::EnvironmentVariable,
-      ImplementationRepository::EnvironmentVariable_var
-    >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate \
-  TAO_Var_Var_T< \
-      ImplementationRepository::EnvironmentVariable \
-    >
-
-#pragma instantiate TAO_Var_Base_T<
-    ImplementationRepository::EnvironmentVariable
-  >
-
-# pragma instantiate \
-  TAO_Out_T< \
-      ImplementationRepository::EnvironmentVariable, \
-      ImplementationRepository::EnvironmentVariable_var \
-    >
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_Address[] =
 {
@@ -1596,17 +1007,14 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Address (
     sizeof (ImplementationRepository::Address)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (ImplementationRepository)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_Address,
-    &_tc_TAO_tc_ImplementationRepository_Address
-  )
-TAO_NAMESPACE_END
+namespace ImplementationRepository
+{
+  ::CORBA::TypeCode_ptr _tc_Address =
+    &_tc_TAO_tc_ImplementationRepository_Address;
+}
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_cs.cpp:70
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_
@@ -1651,77 +1059,15 @@ void ImplementationRepository::EnvironmentList::_tao_any_destructor (
     void * _tao_void_pointer
   )
 {
-  EnvironmentList * tmp =
-    ACE_static_cast (
-        EnvironmentList *,
-        _tao_void_pointer
-      );
-  delete tmp;
+  EnvironmentList * _tao_tmp_pointer =
+    ACE_static_cast (EnvironmentList *, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class
-  TAO_VarSeq_Var_T<
-      ImplementationRepository::EnvironmentList,
-      ImplementationRepository::EnvironmentVariable
-    >;
-
-template class
-  TAO_Seq_Var_Base_T<
-      ImplementationRepository::EnvironmentList,
-      ImplementationRepository::EnvironmentVariable
-    >;
-
-template class
-  TAO_Seq_Out_T<
-      ImplementationRepository::EnvironmentList,
-      ImplementationRepository::EnvironmentList_var,
-      ImplementationRepository::EnvironmentVariable
-    >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate \
-  TAO_VarSeq_Var_T< \
-      EnvironmentList, \
-      ImplementationRepository::EnvironmentVariable \
-    >
-
-# pragma instantiate \
-  TAO_Seq_Var_Base_T< \
-      EnvironmentList, \
-      ImplementationRepository::EnvironmentVariable \
-    >
-
-# pragma instantiate \
-  TAO_Seq_Out_T< \
-      EnvironmentList, \
-      EnvironmentList_var, \
-      ImplementationRepository::EnvironmentVariable \
-    >
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class TAO_Unbounded_Sequence<
-    ImplementationRepository::EnvironmentVariable
-  >;
-
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Unbounded_Sequence<
-    ImplementationRepository::EnvironmentVariable
-  >
-
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_EnvironmentList[] =
 {
@@ -1796,17 +1142,14 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_EnvironmentList (
     sizeof (ImplementationRepository::EnvironmentList)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (ImplementationRepository)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_EnvironmentList,
-    &_tc_TAO_tc_ImplementationRepository_EnvironmentList
-  )
-TAO_NAMESPACE_END
+namespace ImplementationRepository
+{
+  ::CORBA::TypeCode_ptr _tc_EnvironmentList =
+    &_tc_TAO_tc_ImplementationRepository_EnvironmentList;
+}
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_ActivationMode[] =
 {
@@ -1854,17 +1197,14 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ActivationMode (
     sizeof (ImplementationRepository::ActivationMode)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (ImplementationRepository)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ActivationMode,
-    &_tc_TAO_tc_ImplementationRepository_ActivationMode
-  )
-TAO_NAMESPACE_END
+namespace ImplementationRepository
+{
+  ::CORBA::TypeCode_ptr _tc_ActivationMode =
+    &_tc_TAO_tc_ImplementationRepository_ActivationMode;
+}
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_StartupOptions[] =
 {
@@ -2028,65 +1368,27 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_StartupOptions (
     sizeof (ImplementationRepository::StartupOptions)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (ImplementationRepository)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_StartupOptions,
-    &_tc_TAO_tc_ImplementationRepository_StartupOptions
-  )
-TAO_NAMESPACE_END
+namespace ImplementationRepository
+{
+  ::CORBA::TypeCode_ptr _tc_StartupOptions =
+    &_tc_TAO_tc_ImplementationRepository_StartupOptions;
+}
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:66
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
-void ImplementationRepository::StartupOptions::_tao_any_destructor (void *_tao_void_pointer)
+void 
+ImplementationRepository::StartupOptions::_tao_any_destructor (
+    void *_tao_void_pointer
+  )
 {
-  StartupOptions *tmp = ACE_static_cast (StartupOptions*, _tao_void_pointer);
-  delete tmp;
+  StartupOptions *_tao_tmp_pointer =
+    ACE_static_cast (StartupOptions *, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
 // TAO_IDL - Generated from
-// be/be_type.cpp:292
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class
-  TAO_Var_Var_T<
-      ImplementationRepository::StartupOptions
-    >;
-
-template class TAO_Var_Base_T<
-    ImplementationRepository::StartupOptions
-  >;
-
-template class
-  TAO_Out_T<
-      ImplementationRepository::StartupOptions,
-      ImplementationRepository::StartupOptions_var
-    >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate \
-  TAO_Var_Var_T< \
-      ImplementationRepository::StartupOptions \
-    >
-
-#pragma instantiate TAO_Var_Base_T<
-    ImplementationRepository::StartupOptions
-  >
-
-# pragma instantiate \
-  TAO_Out_T< \
-      ImplementationRepository::StartupOptions, \
-      ImplementationRepository::StartupOptions_var \
-    >
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_ServerInformation[] =
 {
@@ -2315,65 +1617,27 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ServerInformation (
     sizeof (ImplementationRepository::ServerInformation)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (ImplementationRepository)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ServerInformation,
-    &_tc_TAO_tc_ImplementationRepository_ServerInformation
-  )
-TAO_NAMESPACE_END
+namespace ImplementationRepository
+{
+  ::CORBA::TypeCode_ptr _tc_ServerInformation =
+    &_tc_TAO_tc_ImplementationRepository_ServerInformation;
+}
 
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:66
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_cs.cpp:66
 
-void ImplementationRepository::ServerInformation::_tao_any_destructor (void *_tao_void_pointer)
+void 
+ImplementationRepository::ServerInformation::_tao_any_destructor (
+    void *_tao_void_pointer
+  )
 {
-  ServerInformation *tmp = ACE_static_cast (ServerInformation*, _tao_void_pointer);
-  delete tmp;
+  ServerInformation *_tao_tmp_pointer =
+    ACE_static_cast (ServerInformation *, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from
-// be/be_type.cpp:292
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class
-  TAO_Var_Var_T<
-      ImplementationRepository::ServerInformation
-    >;
-
-template class TAO_Var_Base_T<
-    ImplementationRepository::ServerInformation
-  >;
-
-template class
-  TAO_Out_T<
-      ImplementationRepository::ServerInformation,
-      ImplementationRepository::ServerInformation_var
-    >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate \
-  TAO_Var_Var_T< \
-      ImplementationRepository::ServerInformation \
-    >
-
-#pragma instantiate TAO_Var_Base_T<
-    ImplementationRepository::ServerInformation
-  >
-
-# pragma instantiate \
-  TAO_Out_T< \
-      ImplementationRepository::ServerInformation, \
-      ImplementationRepository::ServerInformation_var \
-    >
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_cs.cpp:70
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_
@@ -2418,77 +1682,15 @@ void ImplementationRepository::ServerInformationList::_tao_any_destructor (
     void * _tao_void_pointer
   )
 {
-  ServerInformationList * tmp =
-    ACE_static_cast (
-        ServerInformationList *,
-        _tao_void_pointer
-      );
-  delete tmp;
+  ServerInformationList * _tao_tmp_pointer =
+    ACE_static_cast (ServerInformationList *, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class
-  TAO_VarSeq_Var_T<
-      ImplementationRepository::ServerInformationList,
-      ImplementationRepository::ServerInformation
-    >;
-
-template class
-  TAO_Seq_Var_Base_T<
-      ImplementationRepository::ServerInformationList,
-      ImplementationRepository::ServerInformation
-    >;
-
-template class
-  TAO_Seq_Out_T<
-      ImplementationRepository::ServerInformationList,
-      ImplementationRepository::ServerInformationList_var,
-      ImplementationRepository::ServerInformation
-    >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate \
-  TAO_VarSeq_Var_T< \
-      ServerInformationList, \
-      ImplementationRepository::ServerInformation \
-    >
-
-# pragma instantiate \
-  TAO_Seq_Var_Base_T< \
-      ServerInformationList, \
-      ImplementationRepository::ServerInformation \
-    >
-
-# pragma instantiate \
-  TAO_Seq_Out_T< \
-      ServerInformationList, \
-      ServerInformationList_var, \
-      ImplementationRepository::ServerInformation \
-    >
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class TAO_Unbounded_Sequence<
-    ImplementationRepository::ServerInformation
-  >;
-
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Unbounded_Sequence<
-    ImplementationRepository::ServerInformation
-  >
-
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_ServerInformationList[] =
 {
@@ -2748,1132 +1950,58 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ServerInformationList
     sizeof (ImplementationRepository::ServerInformationList)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (ImplementationRepository)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ServerInformationList,
-    &_tc_TAO_tc_ImplementationRepository_ServerInformationList
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:57
-
-int ImplementationRepository::Administration::_tao_class_id = 0;
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        ImplementationRepository::Administration,
-        ImplementationRepository::tao_Administration_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        ImplementationRepository::Administration,
-        ImplementationRepository::tao_Administration_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        ImplementationRepository::Administration, \
-        ImplementationRepository::tao_Administration_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        ImplementationRepository::Administration, \
-        ImplementationRepository::tao_Administration_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
-
-class TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server : public TAO_ClientRequestInfo_i
-{
-public:
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * server
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server &);
-    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server &);
-    const char * server_;
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:376
-  
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * server
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-      server_ (server)
-{}
-
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  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 (1);
-  CORBA::ULong len = 0;
-  (*parameter_list)[len].argument <<= server_;
-  (*parameter_list)[len].mode = CORBA::PARAM_IN;
-  len++;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  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_Administration_activate_server_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_Administration_activate_server_exceptiondata[i];
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
-      (*exception_list)[i] = tcp_object;
-    }
-
-  return safe_exception_list._retn ();
-}
-
-CORBA::Any * 
-TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+namespace ImplementationRepository
 {
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
+  ::CORBA::TypeCode_ptr _tc_ServerInformationList =
+    &_tc_TAO_tc_ImplementationRepository_ServerInformationList;
 }
 
-
-
 // TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-class TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup : public TAO_ClientRequestInfo_i
-{
-public:
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * server,
-      const CORBA::Long & check_startup
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    void result (char * result);
-    
-  private:
-    TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup (const TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup &);
-    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup &);
-    const char * server_;
-    const CORBA::Long & check_startup_;
-    
-    char * _result;
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:376
-  
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup::TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * server,
-      const CORBA::Long & check_startup
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-      server_ (server),
-      check_startup_ (check_startup)
-{}
-
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  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 <<= check_startup_;
-  (*parameter_list)[len].mode = CORBA::PARAM_IN;
-  len++;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  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_Administration_activate_server_with_startup_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_Administration_activate_server_with_startup_exceptiondata[i];
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
-      (*exception_list)[i] = tcp_object;
-    }
-
-  return safe_exception_list._retn ();
-}
-
-CORBA::Any * 
-TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  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 ();
-}
-
-void 
-TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup::result (char * result)
-{
-  // Update the result. 
-  this->_result = result;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
-
-class TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server : public TAO_ClientRequestInfo_i
-{
-public:
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * server,
-      const ImplementationRepository::StartupOptions & options
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+// Traits specializations for ImplementationRepository::Administration.
 
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server &);
-    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server &);
-    const char * server_;
-    const ImplementationRepository::StartupOptions & options_;
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:376
-  
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * server,
-      const ImplementationRepository::StartupOptions & options
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-      server_ (server),
-      options_ (options)
-{}
-
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  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 <<=  this->options_;
-  (*parameter_list)[len].mode = CORBA::PARAM_IN;
-  len++;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  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_Administration_register_server_exceptiondata[] = 
-  {
-    ImplementationRepository::_tc_AlreadyRegistered
-  };
-  
-  exception_list->length (1);
-  for (CORBA::ULong i = 0; i < 1; ++i)
-    {
-      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_register_server_exceptiondata[i];
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
-      (*exception_list)[i] = tcp_object;
-    }
-
-  return safe_exception_list._retn ();
-}
-
-CORBA::Any * 
-TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
-
-class TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server : public TAO_ClientRequestInfo_i
-{
-public:
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * server,
-      const ImplementationRepository::StartupOptions & options
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server &);
-    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server &);
-    const char * server_;
-    const ImplementationRepository::StartupOptions & options_;
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:376
-  
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * server,
-      const ImplementationRepository::StartupOptions & options
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-      server_ (server),
-      options_ (options)
-{}
-
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  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 <<=  this->options_;
-  (*parameter_list)[len].mode = CORBA::PARAM_IN;
-  len++;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
-
-CORBA::Any * 
-TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
-
-class TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server : public TAO_ClientRequestInfo_i
-{
-public:
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * server
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server &);
-    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server &);
-    const char * server_;
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:376
-  
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * server
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-      server_ (server)
-{}
-
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  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 (1);
-  CORBA::ULong len = 0;
-  (*parameter_list)[len].argument <<= server_;
-  (*parameter_list)[len].mode = CORBA::PARAM_IN;
-  len++;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  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_Administration_remove_server_exceptiondata[] = 
-  {
-    ImplementationRepository::_tc_NotFound
-  };
-  
-  exception_list->length (1);
-  for (CORBA::ULong i = 0; i < 1; ++i)
-    {
-      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_remove_server_exceptiondata[i];
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
-      (*exception_list)[i] = tcp_object;
-    }
-
-  return safe_exception_list._retn ();
-}
-
-CORBA::Any * 
-TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
-
-class TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server : public TAO_ClientRequestInfo_i
-{
-public:
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * server
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server (const TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server &);
-    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server &);
-    const char * server_;
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:376
-  
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * server
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-      server_ (server)
-{}
-
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  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 (1);
-  CORBA::ULong len = 0;
-  (*parameter_list)[len].argument <<= server_;
-  (*parameter_list)[len].mode = CORBA::PARAM_IN;
-  len++;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  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_Administration_shutdown_server_exceptiondata[] = 
-  {
-    ImplementationRepository::_tc_NotFound
-  };
-  
-  exception_list->length (1);
-  for (CORBA::ULong i = 0; i < 1; ++i)
-    {
-      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[i];
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
-      (*exception_list)[i] = tcp_object;
-    }
-
-  return safe_exception_list._retn ();
-}
-
-CORBA::Any * 
-TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
-
-class TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running : public TAO_ClientRequestInfo_i
-{
-public:
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * server,
-      const char * addr,
-      ImplementationRepository::ServerObject_ptr server_object
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    void result (char * result);
-    
-  private:
-    TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running &);
-    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running &);
-    const char * server_;
-    const char * addr_;
-    ImplementationRepository::ServerObject_ptr server_object_;
-    
-    char * _result;
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:376
-  
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * server,
-      const char * addr,
-      ImplementationRepository::ServerObject_ptr server_object
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-      server_ (server),
-      addr_ (addr),
-      server_object_ (server_object)
-{}
-
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  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 (3);
-  CORBA::ULong len = 0;
-  (*parameter_list)[len].argument <<= server_;
-  (*parameter_list)[len].mode = CORBA::PARAM_IN;
-  len++;
-  
-  (*parameter_list)[len].argument <<= addr_;
-  (*parameter_list)[len].mode = CORBA::PARAM_IN;
-  len++;
-  
-  (*parameter_list)[len].argument <<=  this->server_object_;
-  (*parameter_list)[len].mode = CORBA::PARAM_IN;
-  len++;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  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_Administration_server_is_running_exceptiondata[] = 
-  {
-    ImplementationRepository::_tc_NotFound
-  };
-  
-  exception_list->length (1);
-  for (CORBA::ULong i = 0; i < 1; ++i)
-    {
-      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[i];
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
-      (*exception_list)[i] = tcp_object;
-    }
-
-  return safe_exception_list._retn ();
-}
-
-CORBA::Any * 
-TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  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 ();
-}
-
-void 
-TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running::result (char * result)
-{
-  // Update the result. 
-  this->_result = result;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
-
-class TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down : public TAO_ClientRequestInfo_i
-{
-public:
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * server
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &);
-    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &);
-    const char * server_;
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:376
-  
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * server
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-      server_ (server)
-{}
-
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  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 (1);
-  CORBA::ULong len = 0;
-  (*parameter_list)[len].argument <<= server_;
-  (*parameter_list)[len].mode = CORBA::PARAM_IN;
-  len++;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  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_Administration_server_is_shutting_down_exceptiondata[] = 
-  {
-    ImplementationRepository::_tc_NotFound
-  };
-  
-  exception_list->length (1);
-  for (CORBA::ULong i = 0; i < 1; ++i)
-    {
-      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[i];
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
-      (*exception_list)[i] = tcp_object;
-    }
-
-  return safe_exception_list._retn ();
-}
-
-CORBA::Any * 
-TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
-
-class TAO_ClientRequestInfo_ImplementationRepository_Administration_find : public TAO_ClientRequestInfo_i
-{
-public:
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_find (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * server
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_ImplementationRepository_Administration_find (const TAO_ClientRequestInfo_ImplementationRepository_Administration_find &);
-    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_find &);
-    const char * server_;
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:376
-  
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_find::TAO_ClientRequestInfo_ImplementationRepository_Administration_find (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const char * server
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-      server_ (server)
-{}
-
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_find::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  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 (1);
-  CORBA::ULong len = 0;
-  (*parameter_list)[len].argument <<= server_;
-  (*parameter_list)[len].mode = CORBA::PARAM_IN;
-  len++;
-  
-  return safe_parameter_list._retn ();
-}
-
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_find::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  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_Administration_find_exceptiondata[] = 
-  {
-    ImplementationRepository::_tc_NotFound
-  };
-  
-  exception_list->length (1);
-  for (CORBA::ULong i = 0; i < 1; ++i)
-    {
-      CORBA::TypeCode_ptr tcp = _tao_ImplementationRepository_Administration_find_exceptiondata[i];
-      TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
-      (*exception_list)[i] = tcp_object;
-    }
-
-  return safe_exception_list._retn ();
-}
-
-CORBA::Any * 
-TAO_ClientRequestInfo_ImplementationRepository_Administration_find::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+ImplementationRepository::Administration_ptr
+TAO::Objref_Traits<ImplementationRepository::Administration>::tao_duplicate (
+    ImplementationRepository::Administration_ptr p
+  )
 {
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
+  return ImplementationRepository::Administration::_duplicate (p);
 }
 
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
-
-class TAO_ClientRequestInfo_ImplementationRepository_Administration_list : public TAO_ClientRequestInfo_i
-{
-public:
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_list (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const CORBA::ULong & how_many      
-
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_ImplementationRepository_Administration_list (const TAO_ClientRequestInfo_ImplementationRepository_Administration_list &);
-    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_Administration_list &);
-    const CORBA::ULong & how_many_;    
-
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:376
-  
-  TAO_ClientRequestInfo_ImplementationRepository_Administration_list::TAO_ClientRequestInfo_ImplementationRepository_Administration_list (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const CORBA::ULong & how_many      
-
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-      how_many_ (how_many)  
-
-{}
-
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_list::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+void
+TAO::Objref_Traits<ImplementationRepository::Administration>::tao_release (
+    ImplementationRepository::Administration_ptr p
+  )
 {
-  // Generate the argument list on demand.
-  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 (1);
-  CORBA::ULong len = 0;
-  (*parameter_list)[len].argument <<= how_many_;
-  (*parameter_list)[len].mode = CORBA::PARAM_IN;
-  len++;
-    
-
-  return safe_parameter_list._retn ();
+  CORBA::release (p);
 }
 
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_Administration_list::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+ImplementationRepository::Administration_ptr
+TAO::Objref_Traits<ImplementationRepository::Administration>::tao_nil (void)
 {
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
+  return ImplementationRepository::Administration::_nil ();
 }
 
-CORBA::Any * 
-TAO_ClientRequestInfo_ImplementationRepository_Administration_list::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+CORBA::Boolean
+TAO::Objref_Traits<ImplementationRepository::Administration>::tao_marshal (
+    ImplementationRepository::Administration_ptr p,
+    TAO_OutputCDR & cdr
+  )
 {
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
+  return p->marshal (cdr);
 }
 
-
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
-
-///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
-//
-
-ImplementationRepository::_TAO_Administration_Proxy_Impl::_TAO_Administration_Proxy_Impl (void)
-{}
-
-ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::_TAO_Administration_Remote_Proxy_Impl (void)
-{}
-
-// Remote Implementation of the IDL interface methods
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker * 
+(*ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:78
 
-void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_server (
-    CORBA::Object *_collocated_tao_target_,
+void ImplementationRepository::Administration::activate_server (
     const char * server
     ACE_ENV_ARG_DECL
   )
@@ -3883,206 +2011,64 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_s
     , ImplementationRepository::CannotActivate
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] = 
-  {
-    {
-      "IDL:ImplementationRepository/NotFound:1.0",
-      ImplementationRepository::NotFound::_alloc
-    },
+  if (!this->is_evaluated ())
     {
-      "IDL:ImplementationRepository/CannotActivate:1.0",
-      ImplementationRepository::CannotActivate::_alloc
+      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  };
-
-TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
-  if (istub == 0)
+  if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      ImplementationRepository_Administration_setup_collocation (
+          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
+        );
     }
-    
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "activate_server",
-      15,
-      1,
-      istub->orb_core ()
-    );
   
-  int _invoke_status;
+  TAO::Arg_Traits<void>::ret_val _tao_retval;
+  TAO::Arg_Traits<CORBA::Char *>::in_arg_val _tao_server (server);
   
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors (),
-      &_tao_call,
-      _invoke_status
-    );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
+  TAO::Argument *_tao_signature [] =
+    {
+      &_tao_retval,
+      &_tao_server
+    };
   
-  for (;;)
+  static TAO_Exception_Data
+  _tao_ImplementationRepository_Administration_activate_server_exceptiondata [] = 
     {
-      _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server _tao_ri (
-          &_tao_call,
-          _collocated_tao_target_,
-          server
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      
-      ACE_TRY
-        {
-          _tao_vfr.send_request (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              _tao_call.restart_flag (1);
-            }
-          else
-            {
-              
-#endif /* TAO_HAS_INTERCEPTORS */
-              
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK;
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << server)
-                  ))
-                {
-                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); 
-                  TAO_INTERCEPTOR_CHECK;
-
-                }
-              
-              _invoke_status =
-                _tao_call.invoke (_tao_ImplementationRepository_Administration_activate_server_exceptiondata, 2 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        )
-                    );
-                }
-              else if (_invoke_status == TAO_INVOKE_RESTART)
-                {
-                  _tao_call.restart_flag (1);
-                  TAO_INTERCEPTOR (
-                      _tao_ri.reply_status (_invoke_status);
-                      _tao_vfr.receive_other (
-                          &_tao_ri
-                          ACE_ENV_ARG_PARAMETER
-                        );
-                      ACE_TRY_CHECK;
-                    )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
-                  _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
-                      &_tao_ri
-                      ACE_ENV_ARG_PARAMETER
-                    );
-                  ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
-            }
-        }
-      ACE_CATCHANY
-        {
-          _tao_ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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;
-      
-      const PortableInterceptor::ReplyStatus _tao_status =
-        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
+      {
+        "IDL:ImplementationRepository/NotFound:1.0",
+        ImplementationRepository::NotFound::_alloc,
+        ImplementationRepository::_tc_NotFound
+      },
       
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
-#endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
-    }
+      {
+        "IDL:ImplementationRepository/CannotActivate:1.0",
+        ImplementationRepository::CannotActivate::_alloc,
+        ImplementationRepository::_tc_CannotActivate
+      }
+    };
+  
+  TAO::Invocation_Adapter _tao_call (
+      this,
+      _tao_signature,
+      2,
+      "activate_server",
+      15,
+      this->the_TAO_Administration_Proxy_Broker_
+    );
+  
+  _tao_call.invoke (
+      _tao_ImplementationRepository_Administration_activate_server_exceptiondata,
+      2
+      ACE_ENV_ARG_PARAMETER
+    );
+  ACE_CHECK;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:78
 
-char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate_server_with_startup (
-    CORBA::Object *_collocated_tao_target_,
+char * ImplementationRepository::Administration::activate_server_with_startup (
     const char * server,
     CORBA::Long check_startup
     ACE_ENV_ARG_DECL
@@ -4093,230 +2079,68 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::activate
     , ImplementationRepository::CannotActivate
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata [] = 
-  {
-    {
-      "IDL:ImplementationRepository/NotFound:1.0",
-      ImplementationRepository::NotFound::_alloc
-    },
+  if (!this->is_evaluated ())
     {
-      "IDL:ImplementationRepository/CannotActivate:1.0",
-      ImplementationRepository::CannotActivate::_alloc
+      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  };
-
-CORBA::String_var _tao_retval;
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
-  if (istub == 0)
+  if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
+      ImplementationRepository_Administration_setup_collocation (
+          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
+        );
     }
-    
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
+  
+  TAO::Arg_Traits<CORBA::Char *>::ret_val _tao_retval;
+  TAO::Arg_Traits<CORBA::Char *>::in_arg_val _tao_server (server);
+  TAO::Arg_Traits<CORBA::Long>::in_arg_val _tao_check_startup (check_startup);
+  
+  TAO::Argument *_tao_signature [] =
+    {
+      &_tao_retval,
+      &_tao_server,
+      &_tao_check_startup
+    };
+  
+  static TAO_Exception_Data
+  _tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata [] = 
+    {
+      {
+        "IDL:ImplementationRepository/NotFound:1.0",
+        ImplementationRepository::NotFound::_alloc,
+        ImplementationRepository::_tc_NotFound
+      },
+      
+      {
+        "IDL:ImplementationRepository/CannotActivate:1.0",
+        ImplementationRepository::CannotActivate::_alloc,
+        ImplementationRepository::_tc_CannotActivate
+      }
+    };
+  
+  TAO::Invocation_Adapter _tao_call (
+      this,
+      _tao_signature,
+      3,
       "activate_server_with_startup",
       28,
-      2,
-      istub->orb_core ()
+      this->the_TAO_Administration_Proxy_Broker_
     );
   
-  int _invoke_status;
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors (),
-      &_tao_call,
-      _invoke_status
+  _tao_call.invoke (
+      _tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata,
+      2
+      ACE_ENV_ARG_PARAMETER
     );
+  ACE_CHECK_RETURN (_tao_retval.excp ());
   
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_ImplementationRepository_Administration_activate_server_with_startup _tao_ri (
-          &_tao_call,
-          _collocated_tao_target_,
-          server,
-          check_startup
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      
-      ACE_TRY
-        {
-          _tao_vfr.send_request (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              _tao_call.restart_flag (1);
-            }
-          else
-            {
-              
-#endif /* TAO_HAS_INTERCEPTORS */
-              
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << server) &&
-                  (_tao_out << check_startup)
-                  ))
-                {
-                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); 
-                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-                }
-              
-              _invoke_status =
-                _tao_call.invoke (_tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata, 2 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        ),
-                      0
-                    );
-                }
-              else if (_invoke_status == TAO_INVOKE_RESTART)
-                {
-                  _tao_call.restart_flag (1);
-                  TAO_INTERCEPTOR (
-                      _tao_ri.reply_status (_invoke_status);
-                      _tao_vfr.receive_other (
-                          &_tao_ri
-                          ACE_ENV_ARG_PARAMETER
-                        );
-                      ACE_TRY_CHECK;
-                    )
-                }
-              else
-                {
-                  
-                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-                  _tao_call.transport()->assign_translators (&_tao_in,0);
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); 
-                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-                      
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  char * _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
-                  _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
-                      &_tao_ri
-                      ACE_ENV_ARG_PARAMETER
-                    );
-                  ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
-            }
-        }
-      ACE_CATCHANY
-        {
-          _tao_ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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_RETURN (_tao_retval._retn ());
-      
-      const PortableInterceptor::ReplyStatus _tao_status =
-        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
-#endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
-    }
-
-return _tao_retval._retn ();
+  return _tao_retval.retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:78
 
-void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_server (
-    CORBA::Object *_collocated_tao_target_,
+void ImplementationRepository::Administration::register_server (
     const char * server,
     const ImplementationRepository::StartupOptions & options
     ACE_ENV_ARG_DECL
@@ -4326,204 +2150,60 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::register_s
     , ImplementationRepository::AlreadyRegistered
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Administration_register_server_exceptiondata [] = 
-  {
+  if (!this->is_evaluated ())
     {
-      "IDL:ImplementationRepository/AlreadyRegistered:1.0",
-      ImplementationRepository::AlreadyRegistered::_alloc
+      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  };
-
-TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
-  if (istub == 0)
+  if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      ImplementationRepository_Administration_setup_collocation (
+          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
+        );
     }
-    
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
+  
+  TAO::Arg_Traits<void>::ret_val _tao_retval;
+  TAO::Arg_Traits<CORBA::Char *>::in_arg_val _tao_server (server);
+  TAO::Arg_Traits<ImplementationRepository::StartupOptions>::in_arg_val _tao_options (options);
+  
+  TAO::Argument *_tao_signature [] =
+    {
+      &_tao_retval,
+      &_tao_server,
+      &_tao_options
+    };
+  
+  static TAO_Exception_Data
+  _tao_ImplementationRepository_Administration_register_server_exceptiondata [] = 
+    {
+      {
+        "IDL:ImplementationRepository/AlreadyRegistered:1.0",
+        ImplementationRepository::AlreadyRegistered::_alloc,
+        ImplementationRepository::_tc_AlreadyRegistered
+      }
+    };
+  
+  TAO::Invocation_Adapter _tao_call (
+      this,
+      _tao_signature,
+      3,
       "register_server",
       15,
-      2,
-      istub->orb_core ()
+      this->the_TAO_Administration_Proxy_Broker_
     );
   
-  int _invoke_status;
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors (),
-      &_tao_call,
-      _invoke_status
+  _tao_call.invoke (
+      _tao_ImplementationRepository_Administration_register_server_exceptiondata,
+      1
+      ACE_ENV_ARG_PARAMETER
     );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_ImplementationRepository_Administration_register_server _tao_ri (
-          &_tao_call,
-          _collocated_tao_target_,
-          server,
-          options
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      
-      ACE_TRY
-        {
-          _tao_vfr.send_request (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              _tao_call.restart_flag (1);
-            }
-          else
-            {
-              
-#endif /* TAO_HAS_INTERCEPTORS */
-              
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK;
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << server) &&
-                  (_tao_out << options)
-                  ))
-                {
-                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); 
-                  TAO_INTERCEPTOR_CHECK;
-
-                }
-              
-              _invoke_status =
-                _tao_call.invoke (_tao_ImplementationRepository_Administration_register_server_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        )
-                    );
-                }
-              else if (_invoke_status == TAO_INVOKE_RESTART)
-                {
-                  _tao_call.restart_flag (1);
-                  TAO_INTERCEPTOR (
-                      _tao_ri.reply_status (_invoke_status);
-                      _tao_vfr.receive_other (
-                          &_tao_ri
-                          ACE_ENV_ARG_PARAMETER
-                        );
-                      ACE_TRY_CHECK;
-                    )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
-                  _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
-                      &_tao_ri
-                      ACE_ENV_ARG_PARAMETER
-                    );
-                  ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
-            }
-        }
-      ACE_CATCHANY
-        {
-          _tao_ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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;
-      
-      const PortableInterceptor::ReplyStatus _tao_status =
-        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
-#endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
-    }
+  ACE_CHECK;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:78
 
-void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister_server (
-    CORBA::Object *_collocated_tao_target_,
+void ImplementationRepository::Administration::reregister_server (
     const char * server,
     const ImplementationRepository::StartupOptions & options
     ACE_ENV_ARG_DECL
@@ -4532,196 +2212,46 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::reregister
     CORBA::SystemException
   ))
 {
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  if (!this->is_evaluated ())
+    {
+      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+    }
   
-  if (istub == 0)
+  if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      ImplementationRepository_Administration_setup_collocation (
+          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
+        );
     }
-    
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "reregister_server",
-      17,
-      2,
-      istub->orb_core ()
-    );
   
-  int _invoke_status;
+  TAO::Arg_Traits<void>::ret_val _tao_retval;
+  TAO::Arg_Traits<CORBA::Char *>::in_arg_val _tao_server (server);
+  TAO::Arg_Traits<ImplementationRepository::StartupOptions>::in_arg_val _tao_options (options);
   
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors (),
-      &_tao_call,
-      _invoke_status
-    );
+  TAO::Argument *_tao_signature [] =
+    {
+      &_tao_retval,
+      &_tao_server,
+      &_tao_options
+    };
   
-#endif  /* TAO_HAS_INTERCEPTORS */
+  TAO::Invocation_Adapter _tao_call (
+      this,
+      _tao_signature,
+      3,
+      "reregister_server",
+      17,
+      this->the_TAO_Administration_Proxy_Broker_
+    );
   
-  for (;;)
-    {
-      _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_ImplementationRepository_Administration_reregister_server _tao_ri (
-          &_tao_call,
-          _collocated_tao_target_,
-          server,
-          options
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      
-      ACE_TRY
-        {
-          _tao_vfr.send_request (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              _tao_call.restart_flag (1);
-            }
-          else
-            {
-              
-#endif /* TAO_HAS_INTERCEPTORS */
-              
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK;
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << server) &&
-                  (_tao_out << options)
-                  ))
-                {
-                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); 
-                  TAO_INTERCEPTOR_CHECK;
-
-                }
-              
-              _invoke_status =
-                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        )
-                    );
-                }
-              else if (_invoke_status == TAO_INVOKE_RESTART)
-                {
-                  _tao_call.restart_flag (1);
-                  TAO_INTERCEPTOR (
-                      _tao_ri.reply_status (_invoke_status);
-                      _tao_vfr.receive_other (
-                          &_tao_ri
-                          ACE_ENV_ARG_PARAMETER
-                        );
-                      ACE_TRY_CHECK;
-                    )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
-                  _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
-                      &_tao_ri
-                      ACE_ENV_ARG_PARAMETER
-                    );
-                  ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
-            }
-        }
-      ACE_CATCHANY
-        {
-          _tao_ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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;
-      
-      const PortableInterceptor::ReplyStatus _tao_status =
-        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
-#endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
-    }
+  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:78
 
-void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_server (
-    CORBA::Object *_collocated_tao_target_,
+void ImplementationRepository::Administration::remove_server (
     const char * server
     ACE_ENV_ARG_DECL
   )
@@ -4730,202 +2260,58 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::remove_ser
     , ImplementationRepository::NotFound
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] = 
-  {
+  if (!this->is_evaluated ())
     {
-      "IDL:ImplementationRepository/NotFound:1.0",
-      ImplementationRepository::NotFound::_alloc
+      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  };
-
-TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
-  if (istub == 0)
+  if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      ImplementationRepository_Administration_setup_collocation (
+          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
+        );
     }
-    
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
+  
+  TAO::Arg_Traits<void>::ret_val _tao_retval;
+  TAO::Arg_Traits<CORBA::Char *>::in_arg_val _tao_server (server);
+  
+  TAO::Argument *_tao_signature [] =
+    {
+      &_tao_retval,
+      &_tao_server
+    };
+  
+  static TAO_Exception_Data
+  _tao_ImplementationRepository_Administration_remove_server_exceptiondata [] = 
+    {
+      {
+        "IDL:ImplementationRepository/NotFound:1.0",
+        ImplementationRepository::NotFound::_alloc,
+        ImplementationRepository::_tc_NotFound
+      }
+    };
+  
+  TAO::Invocation_Adapter _tao_call (
+      this,
+      _tao_signature,
+      2,
       "remove_server",
       13,
-      1,
-      istub->orb_core ()
+      this->the_TAO_Administration_Proxy_Broker_
     );
   
-  int _invoke_status;
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors (),
-      &_tao_call,
-      _invoke_status
+  _tao_call.invoke (
+      _tao_ImplementationRepository_Administration_remove_server_exceptiondata,
+      1
+      ACE_ENV_ARG_PARAMETER
     );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_ImplementationRepository_Administration_remove_server _tao_ri (
-          &_tao_call,
-          _collocated_tao_target_,
-          server
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      
-      ACE_TRY
-        {
-          _tao_vfr.send_request (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              _tao_call.restart_flag (1);
-            }
-          else
-            {
-              
-#endif /* TAO_HAS_INTERCEPTORS */
-              
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK;
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << server)
-                  ))
-                {
-                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); 
-                  TAO_INTERCEPTOR_CHECK;
-
-                }
-              
-              _invoke_status =
-                _tao_call.invoke (_tao_ImplementationRepository_Administration_remove_server_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        )
-                    );
-                }
-              else if (_invoke_status == TAO_INVOKE_RESTART)
-                {
-                  _tao_call.restart_flag (1);
-                  TAO_INTERCEPTOR (
-                      _tao_ri.reply_status (_invoke_status);
-                      _tao_vfr.receive_other (
-                          &_tao_ri
-                          ACE_ENV_ARG_PARAMETER
-                        );
-                      ACE_TRY_CHECK;
-                    )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
-                  _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
-                      &_tao_ri
-                      ACE_ENV_ARG_PARAMETER
-                    );
-                  ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
-            }
-        }
-      ACE_CATCHANY
-        {
-          _tao_ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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;
-      
-      const PortableInterceptor::ReplyStatus _tao_status =
-        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
-#endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
-    }
+  ACE_CHECK;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:78
 
-void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_server (
-    CORBA::Object *_collocated_tao_target_,
+void ImplementationRepository::Administration::shutdown_server (
     const char * server
     ACE_ENV_ARG_DECL
   )
@@ -4934,202 +2320,58 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::shutdown_s
     , ImplementationRepository::NotFound
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] = 
-  {
+  if (!this->is_evaluated ())
     {
-      "IDL:ImplementationRepository/NotFound:1.0",
-      ImplementationRepository::NotFound::_alloc
+      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  };
-
-TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
-  if (istub == 0)
+  if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      ImplementationRepository_Administration_setup_collocation (
+          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
+        );
     }
-    
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
+  
+  TAO::Arg_Traits<void>::ret_val _tao_retval;
+  TAO::Arg_Traits<CORBA::Char *>::in_arg_val _tao_server (server);
+  
+  TAO::Argument *_tao_signature [] =
+    {
+      &_tao_retval,
+      &_tao_server
+    };
+  
+  static TAO_Exception_Data
+  _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata [] = 
+    {
+      {
+        "IDL:ImplementationRepository/NotFound:1.0",
+        ImplementationRepository::NotFound::_alloc,
+        ImplementationRepository::_tc_NotFound
+      }
+    };
+  
+  TAO::Invocation_Adapter _tao_call (
+      this,
+      _tao_signature,
+      2,
       "shutdown_server",
       15,
-      1,
-      istub->orb_core ()
+      this->the_TAO_Administration_Proxy_Broker_
     );
   
-  int _invoke_status;
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors (),
-      &_tao_call,
-      _invoke_status
+  _tao_call.invoke (
+      _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata,
+      1
+      ACE_ENV_ARG_PARAMETER
     );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_ImplementationRepository_Administration_shutdown_server _tao_ri (
-          &_tao_call,
-          _collocated_tao_target_,
-          server
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      
-      ACE_TRY
-        {
-          _tao_vfr.send_request (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              _tao_call.restart_flag (1);
-            }
-          else
-            {
-              
-#endif /* TAO_HAS_INTERCEPTORS */
-              
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK;
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << server)
-                  ))
-                {
-                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); 
-                  TAO_INTERCEPTOR_CHECK;
-
-                }
-              
-              _invoke_status =
-                _tao_call.invoke (_tao_ImplementationRepository_Administration_shutdown_server_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        )
-                    );
-                }
-              else if (_invoke_status == TAO_INVOKE_RESTART)
-                {
-                  _tao_call.restart_flag (1);
-                  TAO_INTERCEPTOR (
-                      _tao_ri.reply_status (_invoke_status);
-                      _tao_vfr.receive_other (
-                          &_tao_ri
-                          ACE_ENV_ARG_PARAMETER
-                        );
-                      ACE_TRY_CHECK;
-                    )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
-                  _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
-                      &_tao_ri
-                      ACE_ENV_ARG_PARAMETER
-                    );
-                  ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
-            }
-        }
-      ACE_CATCHANY
-        {
-          _tao_ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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;
-      
-      const PortableInterceptor::ReplyStatus _tao_status =
-        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
-#endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
-    }
+  ACE_CHECK;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:78
 
-char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_running (
-    CORBA::Object *_collocated_tao_target_,
+char * ImplementationRepository::Administration::server_is_running (
     const char * server,
     const char * addr,
     ImplementationRepository::ServerObject_ptr server_object
@@ -5140,228 +2382,64 @@ char * ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_i
     , ImplementationRepository::NotFound
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] = 
-  {
+  if (!this->is_evaluated ())
     {
-      "IDL:ImplementationRepository/NotFound:1.0",
-      ImplementationRepository::NotFound::_alloc
+      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  };
-
-CORBA::String_var _tao_retval;
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
-  if (istub == 0)
+  if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval._retn ());
+      ImplementationRepository_Administration_setup_collocation (
+          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
+        );
     }
-    
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
+  
+  TAO::Arg_Traits<ImplementationRepository::Address>::ret_val _tao_retval;
+  TAO::Arg_Traits<CORBA::Char *>::in_arg_val _tao_server (server);
+  TAO::Arg_Traits<ImplementationRepository::Address>::in_arg_val _tao_addr (addr);
+  TAO::Arg_Traits<ImplementationRepository::ServerObject>::in_arg_val _tao_server_object (server_object);
+  
+  TAO::Argument *_tao_signature [] =
+    {
+      &_tao_retval,
+      &_tao_server,
+      &_tao_addr,
+      &_tao_server_object
+    };
+  
+  static TAO_Exception_Data
+  _tao_ImplementationRepository_Administration_server_is_running_exceptiondata [] = 
+    {
+      {
+        "IDL:ImplementationRepository/NotFound:1.0",
+        ImplementationRepository::NotFound::_alloc,
+        ImplementationRepository::_tc_NotFound
+      }
+    };
+  
+  TAO::Invocation_Adapter _tao_call (
+      this,
+      _tao_signature,
+      4,
       "server_is_running",
       17,
-      3,
-      istub->orb_core ()
+      this->the_TAO_Administration_Proxy_Broker_
     );
   
-  int _invoke_status;
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors (),
-      &_tao_call,
-      _invoke_status
+  _tao_call.invoke (
+      _tao_ImplementationRepository_Administration_server_is_running_exceptiondata,
+      1
+      ACE_ENV_ARG_PARAMETER
     );
+  ACE_CHECK_RETURN (_tao_retval.excp ());
   
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_running _tao_ri (
-          &_tao_call,
-          _collocated_tao_target_,
-          server,
-          addr,
-          server_object
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      
-      ACE_TRY
-        {
-          _tao_vfr.send_request (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              _tao_call.restart_flag (1);
-            }
-          else
-            {
-              
-#endif /* TAO_HAS_INTERCEPTORS */
-              
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << server) &&
-                  (_tao_out << addr) &&
-                  (_tao_out << server_object)
-                  ))
-                {
-                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); 
-                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-                }
-              
-              _invoke_status =
-                _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_running_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        ),
-                      0
-                    );
-                }
-              else if (_invoke_status == TAO_INVOKE_RESTART)
-                {
-                  _tao_call.restart_flag (1);
-                  TAO_INTERCEPTOR (
-                      _tao_ri.reply_status (_invoke_status);
-                      _tao_vfr.receive_other (
-                          &_tao_ri
-                          ACE_ENV_ARG_PARAMETER
-                        );
-                      ACE_TRY_CHECK;
-                    )
-                }
-              else
-                {
-                  
-                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-                  _tao_call.transport()->assign_translators (&_tao_in,0);
-                  
-                  if (!(
-                      (_tao_in >> _tao_retval.inout ())
-                      ))
-                    {
-                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); 
-                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval._retn ());
-
-                      
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  char * _tao_retval_info =
-                    _tao_retval._retn ();
-                  _tao_ri.result (_tao_retval_info);
-                  _tao_retval = _tao_retval_info;
-                  
-                  _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
-                      &_tao_ri
-                      ACE_ENV_ARG_PARAMETER
-                    );
-                  ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
-            }
-        }
-      ACE_CATCHANY
-        {
-          _tao_ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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_RETURN (_tao_retval._retn ());
-      
-      const PortableInterceptor::ReplyStatus _tao_status =
-        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (_tao_retval._retn ());
-      
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
-#endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
-    }
-
-return _tao_retval._retn ();
+  return _tao_retval.retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:78
 
-void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_shutting_down (
-    CORBA::Object *_collocated_tao_target_,
+void ImplementationRepository::Administration::server_is_shutting_down (
     const char * server
     ACE_ENV_ARG_DECL
   )
@@ -5370,202 +2448,58 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::server_is_
     , ImplementationRepository::NotFound
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] = 
-  {
+  if (!this->is_evaluated ())
     {
-      "IDL:ImplementationRepository/NotFound:1.0",
-      ImplementationRepository::NotFound::_alloc
+      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  };
-
-TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
-  if (istub == 0)
+  if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      ImplementationRepository_Administration_setup_collocation (
+          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
+        );
     }
-    
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
+  
+  TAO::Arg_Traits<void>::ret_val _tao_retval;
+  TAO::Arg_Traits<CORBA::Char *>::in_arg_val _tao_server (server);
+  
+  TAO::Argument *_tao_signature [] =
+    {
+      &_tao_retval,
+      &_tao_server
+    };
+  
+  static TAO_Exception_Data
+  _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata [] = 
+    {
+      {
+        "IDL:ImplementationRepository/NotFound:1.0",
+        ImplementationRepository::NotFound::_alloc,
+        ImplementationRepository::_tc_NotFound
+      }
+    };
+  
+  TAO::Invocation_Adapter _tao_call (
+      this,
+      _tao_signature,
+      2,
       "server_is_shutting_down",
       23,
-      1,
-      istub->orb_core ()
+      this->the_TAO_Administration_Proxy_Broker_
     );
   
-  int _invoke_status;
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors (),
-      &_tao_call,
-      _invoke_status
+  _tao_call.invoke (
+      _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata,
+      1
+      ACE_ENV_ARG_PARAMETER
     );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_ImplementationRepository_Administration_server_is_shutting_down _tao_ri (
-          &_tao_call,
-          _collocated_tao_target_,
-          server
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      
-      ACE_TRY
-        {
-          _tao_vfr.send_request (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              _tao_call.restart_flag (1);
-            }
-          else
-            {
-              
-#endif /* TAO_HAS_INTERCEPTORS */
-              
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK;
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << server)
-                  ))
-                {
-                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); 
-                  TAO_INTERCEPTOR_CHECK;
-
-                }
-              
-              _invoke_status =
-                _tao_call.invoke (_tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        )
-                    );
-                }
-              else if (_invoke_status == TAO_INVOKE_RESTART)
-                {
-                  _tao_call.restart_flag (1);
-                  TAO_INTERCEPTOR (
-                      _tao_ri.reply_status (_invoke_status);
-                      _tao_vfr.receive_other (
-                          &_tao_ri
-                          ACE_ENV_ARG_PARAMETER
-                        );
-                      ACE_TRY_CHECK;
-                    )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
-                  _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
-                      &_tao_ri
-                      ACE_ENV_ARG_PARAMETER
-                    );
-                  ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
-            }
-        }
-      ACE_CATCHANY
-        {
-          _tao_ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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;
-      
-      const PortableInterceptor::ReplyStatus _tao_status =
-        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
-#endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
-    }
+  ACE_CHECK;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:78
 
-void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
-    CORBA::Object *_collocated_tao_target_,
+void ImplementationRepository::Administration::find (
     const char * server,
     ImplementationRepository::ServerInformation_out info
     ACE_ENV_ARG_DECL
@@ -5575,219 +2509,60 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::find (
     , ImplementationRepository::NotFound
   ))
 {
-    static TAO_Exception_Data _tao_ImplementationRepository_Administration_find_exceptiondata [] = 
-  {
+  if (!this->is_evaluated ())
     {
-      "IDL:ImplementationRepository/NotFound:1.0",
-      ImplementationRepository::NotFound::_alloc
+      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  };
-
-TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
   
-  if (istub == 0)
+  if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      ImplementationRepository_Administration_setup_collocation (
+          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
+        );
     }
-    ACE_NEW (
-      info.ptr (),
-      ImplementationRepository::ServerInformation
-    );
-    
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
+  
+  TAO::Arg_Traits<void>::ret_val _tao_retval;
+  TAO::Arg_Traits<CORBA::Char *>::in_arg_val _tao_server (server);
+  TAO::Arg_Traits<ImplementationRepository::ServerInformation>::out_arg_val _tao_info (info);
+  
+  TAO::Argument *_tao_signature [] =
+    {
+      &_tao_retval,
+      &_tao_server,
+      &_tao_info
+    };
+  
+  static TAO_Exception_Data
+  _tao_ImplementationRepository_Administration_find_exceptiondata [] = 
+    {
+      {
+        "IDL:ImplementationRepository/NotFound:1.0",
+        ImplementationRepository::NotFound::_alloc,
+        ImplementationRepository::_tc_NotFound
+      }
+    };
+  
+  TAO::Invocation_Adapter _tao_call (
+      this,
+      _tao_signature,
+      3,
       "find",
       4,
-      1,
-      istub->orb_core ()
+      this->the_TAO_Administration_Proxy_Broker_
     );
   
-  int _invoke_status;
-  
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors (),
-      &_tao_call,
-      _invoke_status
+  _tao_call.invoke (
+      _tao_ImplementationRepository_Administration_find_exceptiondata,
+      1
+      ACE_ENV_ARG_PARAMETER
     );
-  
-#endif  /* TAO_HAS_INTERCEPTORS */
-  
-  for (;;)
-    {
-      _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_ImplementationRepository_Administration_find _tao_ri (
-          &_tao_call,
-          _collocated_tao_target_,
-          server
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      
-      ACE_TRY
-        {
-          _tao_vfr.send_request (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              _tao_call.restart_flag (1);
-            }
-          else
-            {
-              
-#endif /* TAO_HAS_INTERCEPTORS */
-              
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK;
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << server)
-                  ))
-                {
-                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); 
-                  TAO_INTERCEPTOR_CHECK;
-
-                }
-              
-              _invoke_status =
-                _tao_call.invoke (_tao_ImplementationRepository_Administration_find_exceptiondata, 1 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        )
-                    );
-                }
-              else if (_invoke_status == TAO_INVOKE_RESTART)
-                {
-                  _tao_call.restart_flag (1);
-                  TAO_INTERCEPTOR (
-                      _tao_ri.reply_status (_invoke_status);
-                      _tao_vfr.receive_other (
-                          &_tao_ri
-                          ACE_ENV_ARG_PARAMETER
-                        );
-                      ACE_TRY_CHECK;
-                    )
-                }
-              else
-                {
-                  
-                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-                  _tao_call.transport()->assign_translators (&_tao_in,0);
-                  
-                  if (!((_tao_in >> *info.ptr ())
-                      ))
-                    {
-                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); 
-                      TAO_INTERCEPTOR_CHECK;
-
-                      
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  
-                  _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
-                      &_tao_ri
-                      ACE_ENV_ARG_PARAMETER
-                    );
-                  ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
-            }
-        }
-      ACE_CATCHANY
-        {
-          _tao_ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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;
-      
-      const PortableInterceptor::ReplyStatus _tao_status =
-        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
-#endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
-    }
+  ACE_CHECK;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:78
 
-void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
-    CORBA::Object *_collocated_tao_target_,
+void ImplementationRepository::Administration::list (
     CORBA::ULong how_many,
     ImplementationRepository::ServerInformationList_out server_list,
     ImplementationRepository::ServerInformationIterator_out server_iterator
@@ -5797,264 +2572,46 @@ void ImplementationRepository::_TAO_Administration_Remote_Proxy_Impl::list (
     CORBA::SystemException
   ))
 {
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  if (!this->is_evaluated ())
+    {
+      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+    }
   
-  if (istub == 0)
+  if (this->the_TAO_Administration_Proxy_Broker_ == 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      ImplementationRepository_Administration_setup_collocation (
+          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
+        );
     }
-    ACE_NEW (
-      server_list.ptr (),
-      ImplementationRepository::ServerInformationList
-    );
-    
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "list",
-      4,
-      1,
-      istub->orb_core ()
-    );
   
-  int _invoke_status;
+  TAO::Arg_Traits<void>::ret_val _tao_retval;
+  TAO::Arg_Traits<CORBA::ULong>::in_arg_val _tao_how_many (how_many);
+  TAO::Arg_Traits<ImplementationRepository::ServerInformationList>::out_arg_val _tao_server_list (server_list);
+  TAO::Arg_Traits<ImplementationRepository::ServerInformationIterator>::out_arg_val _tao_server_iterator (server_iterator);
   
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors (),
-      &_tao_call,
-      _invoke_status
-    );
+  TAO::Argument *_tao_signature [] =
+    {
+      &_tao_retval,
+      &_tao_how_many,
+      &_tao_server_list,
+      &_tao_server_iterator
+    };
   
-#endif  /* TAO_HAS_INTERCEPTORS */
+  TAO::Invocation_Adapter _tao_call (
+      this,
+      _tao_signature,
+      4,
+      "list",
+      4,
+      this->the_TAO_Administration_Proxy_Broker_
+    );
   
-  for (;;)
-    {
-      _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_ImplementationRepository_Administration_list _tao_ri (
-          &_tao_call,
-          _collocated_tao_target_,
-          how_many          
-
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      
-      ACE_TRY
-        {
-          _tao_vfr.send_request (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              _tao_call.restart_flag (1);
-            }
-          else
-            {
-              
-#endif /* TAO_HAS_INTERCEPTORS */
-              
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK;
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << how_many)
-                  ))
-                {
-                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); 
-                  TAO_INTERCEPTOR_CHECK;
-
-                }
-              
-              _invoke_status =
-                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        )
-                    );
-                }
-              else if (_invoke_status == TAO_INVOKE_RESTART)
-                {
-                  _tao_call.restart_flag (1);
-                  TAO_INTERCEPTOR (
-                      _tao_ri.reply_status (_invoke_status);
-                      _tao_vfr.receive_other (
-                          &_tao_ri
-                          ACE_ENV_ARG_PARAMETER
-                        );
-                      ACE_TRY_CHECK;
-                    )
-                }
-              else
-                {
-                  
-                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-                  _tao_call.transport()->assign_translators (&_tao_in,0);
-                  
-                  if (!((_tao_in >> *server_list.ptr ()) &&
-                      (_tao_in >> server_iterator.ptr ())
-                      ))
-                    {
-                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); 
-                      TAO_INTERCEPTOR_CHECK;
-
-                      
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  
-                  _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
-                      &_tao_ri
-                      ACE_ENV_ARG_PARAMETER
-                    );
-                  ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
-            }
-        }
-      ACE_CATCHANY
-        {
-          _tao_ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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;
-      
-      const PortableInterceptor::ReplyStatus _tao_status =
-        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
-#endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
-    }
-}
-
-//
-//            End  Base & Remote  Proxy Implemeentation. 
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
-
-///////////////////////////////////////////////////////////////////////
-//           Remote & Base  Proxy Broker Implementation
-//
-
-ImplementationRepository::_TAO_Administration_Proxy_Broker::_TAO_Administration_Proxy_Broker (void)
-{
-}
-
-ImplementationRepository::_TAO_Administration_Proxy_Broker::~_TAO_Administration_Proxy_Broker (void)
-{
-}
-
-ImplementationRepository::_TAO_Administration_Proxy_Broker * (*ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker *
-ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker::the_TAO_Administration_Remote_Proxy_Broker (void)
-{
-  static ::ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker remote_proxy_broker;
-  return &remote_proxy_broker;
-}
-
-ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker::_TAO_Administration_Remote_Proxy_Broker (void)
-{
-}
-
-ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker::~_TAO_Administration_Remote_Proxy_Broker (void)
-{
-}
-
-ImplementationRepository::_TAO_Administration_Proxy_Impl&
-ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker::select_proxy (
-    ::ImplementationRepository::Administration *
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return this->remote_proxy_impl_;
+  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 }
 
-//
-//           End Remote & Base Proxy Broker Implementation
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:239
-
 ImplementationRepository::Administration::Administration (int collocated)
+ : the_TAO_Administration_Proxy_Broker_ (0)
 {
   this->ImplementationRepository_Administration_setup_collocation (collocated);
 }
@@ -6063,11 +2620,10 @@ void
 ImplementationRepository::Administration::ImplementationRepository_Administration_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_Administration_Proxy_Broker_ =
-      ::ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer (this);
-  else
-    this->the_TAO_Administration_Proxy_Broker_ =
-      ::ImplementationRepository::_TAO_Administration_Remote_Proxy_Broker::the_TAO_Administration_Remote_Proxy_Broker ();
+    {
+      this->the_TAO_Administration_Proxy_Broker_ =
+        ::ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer (this);
+    }
 }
 
 ImplementationRepository::Administration::~Administration (void)
@@ -6076,120 +2632,24 @@ ImplementationRepository::Administration::~Administration (void)
 void 
 ImplementationRepository::Administration::_tao_any_destructor (void *_tao_void_pointer)
 {
-  Administration *tmp = ACE_static_cast (Administration *, _tao_void_pointer);
-  CORBA::release (tmp);
+  Administration *_tao_tmp_pointer =
+    ACE_static_cast (Administration *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 ImplementationRepository::Administration_ptr
 ImplementationRepository::Administration::_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL
   )
 {
-  if (CORBA::is_nil (obj))
-    {
-      return Administration::_nil ();
-    }
-  
-  if (! obj->_is_local ())
-    {
-      CORBA::Boolean is_a =
-        obj->_is_a (
-            "IDL:ImplementationRepository/Administration:1.0"
-            ACE_ENV_ARG_PARAMETER
-          );
-      ACE_CHECK_RETURN (Administration::_nil ());
-      
-      if (is_a == 0)
-        {
-          return Administration::_nil ();
-        }
-    }
-  
-  return Administration::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-ImplementationRepository::Administration_ptr 
-ImplementationRepository::Administration::_unchecked_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (obj))
-    {
-      return Administration::_nil ();
-    }
-  
-  Administration_ptr default_proxy = Administration::_nil ();
-  
-  // Code for lazily evaluated IOR's
-  if (!obj->is_evaluated ())
-    {
-      ACE_NEW_RETURN (
-          default_proxy,
-          ::ImplementationRepository::Administration (
-              obj->steal_ior (),
-              obj->orb_core ()
-            ),
-          Administration::_nil ()
-        );
-      
-      return default_proxy;
-    }
-  
-  if (! obj->_is_local ())
-    {
-      TAO_Stub* stub = obj->_stubobj ();
-      
-      if (stub != 0)
-        {
-          stub->_incr_refcnt ();
-        }
-      
-      if (
-          !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-          stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&
-          ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer != 0
-        )
-        {
-          ACE_NEW_RETURN (
-              default_proxy,
-              ::ImplementationRepository::Administration (
-                  stub,
-                  1,
-                  obj->_servant ()
-                ),
-              Administration::_nil ()
-            );
-        }
-      
-      if (CORBA::is_nil (default_proxy))
-        {
-          ACE_NEW_RETURN (
-              default_proxy,
-              ::ImplementationRepository::Administration (
-                  stub,
-                  0,
-                  obj->_servant ()
-                ),
-              Administration::_nil ()
-            );
-        }
-      
-      return default_proxy;
-    }
-  else 
-    return
-      ACE_reinterpret_cast (
-          Administration_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &Administration::_tao_class_id
-                )
-            )
-        );
+  return
+    TAO::Narrow_Utils<Administration>::narrow (
+        _tao_objref,
+        "IDL:ImplementationRepository/Administration:1.0",
+        ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer
+        ACE_ENV_ARG_PARAMETER
+      );
 }
 
 ImplementationRepository::Administration_ptr
@@ -6231,37 +2691,6 @@ ImplementationRepository::Administration::_is_a (
     }
 }
 
-void *ImplementationRepository::Administration::_tao_QueryInterface (ptrdiff_t type)
-{
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::ImplementationRepository, Administration)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-  
-  if (retv != 0)
-    {
-      this->_add_ref ();
-    }
-  
-  return retv;
-}
-
 const char* ImplementationRepository::Administration::_interface_repository_id (void) const
 {
   return "IDL:ImplementationRepository/Administration:1.0";
@@ -6274,333 +2703,7 @@ ImplementationRepository::Administration::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
-
-void ImplementationRepository::Administration::activate_server (
-    const char * server
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , ImplementationRepository::NotFound
-    , ImplementationRepository::CannotActivate
-  ))
-{
-  if (!this->is_evaluated ())
-    {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
-      this->ImplementationRepository_Administration_setup_collocation (
-          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
-        );
-    }
-  
-  _TAO_Administration_Proxy_Impl &proxy = 
-    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-  proxy.activate_server (
-      this,
-      server
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
-
-char * ImplementationRepository::Administration::activate_server_with_startup (
-    const char * server,
-    CORBA::Long check_startup
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , ImplementationRepository::NotFound
-    , ImplementationRepository::CannotActivate
-  ))
-{
-  if (!this->is_evaluated ())
-    {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
-      this->ImplementationRepository_Administration_setup_collocation (
-          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
-        );
-    }
-  
-  _TAO_Administration_Proxy_Impl &proxy = 
-    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return proxy.activate_server_with_startup (
-      this,
-      server,
-      check_startup
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
-
-void ImplementationRepository::Administration::register_server (
-    const char * server,
-    const ImplementationRepository::StartupOptions & options
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , ImplementationRepository::AlreadyRegistered
-  ))
-{
-  if (!this->is_evaluated ())
-    {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
-      this->ImplementationRepository_Administration_setup_collocation (
-          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
-        );
-    }
-  
-  _TAO_Administration_Proxy_Impl &proxy = 
-    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-  proxy.register_server (
-      this,
-      server,
-      options
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
-
-void ImplementationRepository::Administration::reregister_server (
-    const char * server,
-    const ImplementationRepository::StartupOptions & options
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  if (!this->is_evaluated ())
-    {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
-      this->ImplementationRepository_Administration_setup_collocation (
-          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
-        );
-    }
-  
-  _TAO_Administration_Proxy_Impl &proxy = 
-    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-  proxy.reregister_server (
-      this,
-      server,
-      options
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
-
-void ImplementationRepository::Administration::remove_server (
-    const char * server
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , ImplementationRepository::NotFound
-  ))
-{
-  if (!this->is_evaluated ())
-    {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
-      this->ImplementationRepository_Administration_setup_collocation (
-          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
-        );
-    }
-  
-  _TAO_Administration_Proxy_Impl &proxy = 
-    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-  proxy.remove_server (
-      this,
-      server
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
-
-void ImplementationRepository::Administration::shutdown_server (
-    const char * server
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , ImplementationRepository::NotFound
-  ))
-{
-  if (!this->is_evaluated ())
-    {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
-      this->ImplementationRepository_Administration_setup_collocation (
-          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
-        );
-    }
-  
-  _TAO_Administration_Proxy_Impl &proxy = 
-    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-  proxy.shutdown_server (
-      this,
-      server
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
-
-char * ImplementationRepository::Administration::server_is_running (
-    const char * server,
-    const char * addr,
-    ImplementationRepository::ServerObject_ptr server_object
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , ImplementationRepository::NotFound
-  ))
-{
-  if (!this->is_evaluated ())
-    {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
-      this->ImplementationRepository_Administration_setup_collocation (
-          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
-        );
-    }
-  
-  _TAO_Administration_Proxy_Impl &proxy = 
-    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return proxy.server_is_running (
-      this,
-      server,
-      addr,
-      server_object
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
-
-void ImplementationRepository::Administration::server_is_shutting_down (
-    const char * server
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , ImplementationRepository::NotFound
-  ))
-{
-  if (!this->is_evaluated ())
-    {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
-      this->ImplementationRepository_Administration_setup_collocation (
-          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
-        );
-    }
-  
-  _TAO_Administration_Proxy_Impl &proxy = 
-    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-  proxy.server_is_shutting_down (
-      this,
-      server
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
-
-void ImplementationRepository::Administration::find (
-    const char * server,
-    ImplementationRepository::ServerInformation_out info
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-    , ImplementationRepository::NotFound
-  ))
-{
-  if (!this->is_evaluated ())
-    {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
-      this->ImplementationRepository_Administration_setup_collocation (
-          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
-        );
-    }
-  
-  _TAO_Administration_Proxy_Impl &proxy = 
-    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-  proxy.find (
-      this,
-      server,
-      info
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
-
-void ImplementationRepository::Administration::list (
-    CORBA::ULong how_many,
-    ImplementationRepository::ServerInformationList_out server_list,
-    ImplementationRepository::ServerInformationIterator_out server_iterator
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  if (!this->is_evaluated ())
-    {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
-      this->ImplementationRepository_Administration_setup_collocation (
-          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
-        );
-    }
-  
-  _TAO_Administration_Proxy_Impl &proxy = 
-    this->the_TAO_Administration_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-  proxy.list (
-      this,
-      how_many,
-      server_list,
-      server_iterator
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_Administration[] =
 {
@@ -6633,245 +2736,58 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_Administration (
     sizeof (ImplementationRepository::Administration)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (ImplementationRepository)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_Administration,
-    &_tc_TAO_tc_ImplementationRepository_Administration
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:57
-
-int ImplementationRepository::ServerInformationIterator::_tao_class_id = 0;
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        ImplementationRepository::ServerInformationIterator,
-        ImplementationRepository::tao_ServerInformationIterator_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        ImplementationRepository::ServerInformationIterator,
-        ImplementationRepository::tao_ServerInformationIterator_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        ImplementationRepository::ServerInformationIterator, \
-        ImplementationRepository::tao_ServerInformationIterator_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        ImplementationRepository::ServerInformationIterator, \
-        ImplementationRepository::tao_ServerInformationIterator_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interceptors_cs.cpp:56
-
-#if (TAO_HAS_INTERCEPTORS == 1)
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
-
-class TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n : public TAO_ClientRequestInfo_i
+namespace ImplementationRepository
 {
-public:
-  TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const CORBA::ULong & how_many
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    void result (::CORBA::Boolean result);
-    
-  private:
-    TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &);
-    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &);
-    const CORBA::ULong & how_many_;
-    
-    ::CORBA::Boolean _result;
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:376
-  
-  TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target,
-      const CORBA::ULong & how_many
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target),
-      how_many_ (how_many)
-{}
-
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the argument list on demand.
-  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 (1);
-  CORBA::ULong len = 0;
-  (*parameter_list)[len].argument <<= how_many_;
-  (*parameter_list)[len].mode = CORBA::PARAM_IN;
-  len++;
-  
-  return safe_parameter_list._retn ();
+  ::CORBA::TypeCode_ptr _tc_Administration =
+    &_tc_TAO_tc_ImplementationRepository_Administration;
 }
 
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
-}
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-CORBA::Any * 
-TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 0;
-  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) <<= CORBA::Any::from_boolean (this->_result);
-  return safe_result_any._retn ();
-}
+// Traits specializations for ImplementationRepository::ServerInformationIterator.
 
-void 
-TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Boolean result)
+ImplementationRepository::ServerInformationIterator_ptr
+TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::tao_duplicate (
+    ImplementationRepository::ServerInformationIterator_ptr p
+  )
 {
-  // Update the result. 
-  this->_result = result;
+  return ImplementationRepository::ServerInformationIterator::_duplicate (p);
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_operation/interceptors_cs.cpp:76
-
-class TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy : public TAO_ClientRequestInfo_i
-{
-public:
-  TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual Dynamic::ParameterList * arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual Dynamic::ExceptionList * exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-    
-    virtual CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &);
-    void operator= (const TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &);
-  };
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_operation/interceptors_cs.cpp:376
-  
-  TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
-      TAO_GIOP_Invocation *_tao_invocation,
-      CORBA::Object_ptr _tao_target
-      ACE_ENV_ARG_DECL_NOT_USED      
-    )
-      : TAO_ClientRequestInfo_i (_tao_invocation, _tao_target)
-{}
-
-Dynamic::ParameterList *
-TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::arguments (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+void
+TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::tao_release (
+    ImplementationRepository::ServerInformationIterator_ptr p
+  )
 {
-  // Generate the argument list on demand.
-  Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return parameter_list;
+  CORBA::release (p);
 }
 
-Dynamic::ExceptionList *
-TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+ImplementationRepository::ServerInformationIterator_ptr
+TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::tao_nil (void)
 {
-  // Generate the exception list on demand.
-  Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return exception_list;
+  return ImplementationRepository::ServerInformationIterator::_nil ();
 }
 
-CORBA::Any * 
-TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+CORBA::Boolean
+TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>::tao_marshal (
+    ImplementationRepository::ServerInformationIterator_ptr p,
+    TAO_OutputCDR & cdr
+  )
 {
-  // Generate the result on demand.
-  CORBA::Boolean tk_void_any = 1;
-  CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return result_any;
+  return p->marshal (cdr);
 }
 
-
-
-#endif /* TAO_HAS_INTERCEPTORS */
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_impl_cs.cpp:31
-
-///////////////////////////////////////////////////////////////////////
-//                Base & Remote Proxy  Implementation. 
-//
-
-ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl::_TAO_ServerInformationIterator_Proxy_Impl (void)
-{}
-
-ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl::_TAO_ServerInformationIterator_Remote_Proxy_Impl (void)
-{}
-
-// Remote Implementation of the IDL interface methods
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker * 
+(*ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:78
 
-CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl::next_n (
-    CORBA::Object *_collocated_tao_target_,
+CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n (
     CORBA::ULong how_many,
     ImplementationRepository::ServerInformationList_out server_list
     ACE_ENV_ARG_DECL
@@ -6880,456 +2796,88 @@ CORBA::Boolean ImplementationRepository::_TAO_ServerInformationIterator_Remote_P
     CORBA::SystemException
   ))
 {
-  CORBA::Boolean _tao_retval = 0;
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  if (!this->is_evaluated ())
+    {
+      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+    }
   
-  if (istub == 0)
+  if (this->the_TAO_ServerInformationIterator_Proxy_Broker_ == 0)
     {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),_tao_retval);
+      ImplementationRepository_ServerInformationIterator_setup_collocation (
+          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
+        );
     }
-    
-  ACE_NEW_RETURN (
-      server_list.ptr (),
-      ImplementationRepository::ServerInformationList,
-      0
-    );
-    
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "next_n",
-      6,
-      1,
-      istub->orb_core ()
-    );
   
-  int _invoke_status;
+  TAO::Arg_Traits<ACE_InputCDR::to_boolean>::ret_val _tao_retval;
+  TAO::Arg_Traits<CORBA::ULong>::in_arg_val _tao_how_many (how_many);
+  TAO::Arg_Traits<ImplementationRepository::ServerInformationList>::out_arg_val _tao_server_list (server_list);
+  
+  TAO::Argument *_tao_signature [] =
+    {
+      &_tao_retval,
+      &_tao_how_many,
+      &_tao_server_list
+    };
   
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors (),
-      &_tao_call,
-      _invoke_status
+  TAO::Invocation_Adapter _tao_call (
+      this,
+      _tao_signature,
+      3,
+      "next_n",
+      6,
+      this->the_TAO_ServerInformationIterator_Proxy_Broker_
     );
   
-#endif  /* TAO_HAS_INTERCEPTORS */
+  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (_tao_retval.excp ());
   
-  for (;;)
-    {
-      _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_next_n _tao_ri (
-          &_tao_call,
-          _collocated_tao_target_,
-          how_many
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK_RETURN (_tao_retval);
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      
-      ACE_TRY
-        {
-          _tao_vfr.send_request (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              _tao_call.restart_flag (1);
-            }
-          else
-            {
-              
-#endif /* TAO_HAS_INTERCEPTORS */
-              
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              TAO_OutputCDR &_tao_out = _tao_call.out_stream ();
-              
-              if (!(
-                  (_tao_out << how_many)
-                  ))
-                {
-                  TAO_OutputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); 
-                  TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-                }
-              
-              _invoke_status =
-                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW_RETURN (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        ),
-                      _tao_retval
-                    );
-                }
-              else if (_invoke_status == TAO_INVOKE_RESTART)
-                {
-                  _tao_call.restart_flag (1);
-                  TAO_INTERCEPTOR (
-                      _tao_ri.reply_status (_invoke_status);
-                      _tao_vfr.receive_other (
-                          &_tao_ri
-                          ACE_ENV_ARG_PARAMETER
-                        );
-                      ACE_TRY_CHECK;
-                    )
-                }
-              else
-                {
-                  
-                  TAO_InputCDR &_tao_in = _tao_call.inp_stream ();
-                  _tao_call.transport()->assign_translators (&_tao_in,0);
-                  
-                  if (!(
-                      (_tao_in >> CORBA::Any::to_boolean (_tao_retval)) &&
-                      (_tao_in >> *server_list.ptr ())
-                      ))
-                    {
-                      TAO_InputCDR::throw_stub_exception (errno ACE_ENV_ARG_PARAMETER); 
-                      TAO_INTERCEPTOR_CHECK_RETURN (_tao_retval);
-
-                      
-                    }
-                  
-#if TAO_HAS_INTERCEPTORS == 1
-                  CORBA::Boolean _tao_retval_info =
-                    _tao_retval;
-                  _tao_ri.result (_tao_retval_info);
-                  
-                  _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
-                      &_tao_ri
-                      ACE_ENV_ARG_PARAMETER
-                    );
-                  ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
-            }
-        }
-      ACE_CATCHANY
-        {
-          _tao_ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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_RETURN (_tao_retval);
-      
-      const PortableInterceptor::ReplyStatus _tao_status =
-        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (_tao_retval);
-      
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
-#endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
-    }
-
-return _tao_retval;
+  return _tao_retval.retn ();
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/remote_proxy_impl_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_cs.cpp:78
 
-void ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Impl::destroy (
-    CORBA::Object *_collocated_tao_target_
-    ACE_ENV_ARG_DECL
+void ImplementationRepository::ServerInformationIterator::destroy (
+    ACE_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  TAO_Stub *istub = _collocated_tao_target_->_stubobj ();
+  if (!this->is_evaluated ())
+    {
+      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
+    }
   
-  if (istub == 0)
+  if (this->the_TAO_ServerInformationIterator_Proxy_Broker_ == 0)
     {
-      ACE_THROW (CORBA::INTERNAL ());
+      ImplementationRepository_ServerInformationIterator_setup_collocation (
+          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
+        );
     }
-    
-  TAO_GIOP_Twoway_Invocation _tao_call (
-      istub,
-      "destroy",
-      7,
-      0,
-      istub->orb_core ()
-    );
   
-  int _invoke_status;
+  TAO::Arg_Traits<void>::ret_val _tao_retval;
   
-#if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_ClientRequestInterceptor_Adapter _tao_vfr (
-      istub->orb_core ()->client_request_interceptors (),
-      &_tao_call,
-      _invoke_status
-    );
+  TAO::Argument *_tao_signature [] =
+    {
+      &_tao_retval
+    };
   
-#endif  /* TAO_HAS_INTERCEPTORS */
+  TAO::Invocation_Adapter _tao_call (
+      this,
+      _tao_signature,
+      1,
+      "destroy",
+      7,
+      this->the_TAO_ServerInformationIterator_Proxy_Broker_
+    );
   
-  for (;;)
-    {
-      _invoke_status = TAO_INVOKE_EXCEPTION;
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO_ClientRequestInfo_ImplementationRepository_ServerInformationIterator_destroy _tao_ri (
-          &_tao_call,
-          _collocated_tao_target_
-          ACE_ENV_ARG_PARAMETER
-        );
-      ACE_CHECK;
-      
-#endif /* TAO_HAS_INTERCEPTORS */
-      
-      CORBA::Short _tao_response_flag = TAO_TWOWAY_RESPONSE_FLAG;
-      TAO_INTERCEPTOR (_tao_ri.response_expected (1));
-      
-#if TAO_HAS_INTERCEPTORS == 1
-      
-      ACE_TRY
-        {
-          _tao_vfr.send_request (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          if (_invoke_status == TAO_INVOKE_RESTART)
-            {
-              _tao_call.restart_flag (1);
-            }
-          else
-            {
-              
-#endif /* TAO_HAS_INTERCEPTORS */
-              
-              _tao_call.start (ACE_ENV_SINGLE_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              _tao_call.prepare_header (
-                  ACE_static_cast (CORBA::Octet, _tao_response_flag)
-                  ACE_ENV_ARG_PARAMETER
-                );
-              TAO_INTERCEPTOR_CHECK;
-
-              
-              _invoke_status =
-                _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
-              TAO_INTERCEPTOR_CHECK;
-
-              if (_invoke_status == TAO_INVOKE_EXCEPTION)
-                {
-                  TAO_INTERCEPTOR_THROW (
-                      CORBA::UNKNOWN (
-                          CORBA::OMGVMCID | 1, CORBA::COMPLETED_YES
-                        )
-                    );
-                }
-              else if (_invoke_status == TAO_INVOKE_RESTART)
-                {
-                  _tao_call.restart_flag (1);
-                  TAO_INTERCEPTOR (
-                      _tao_ri.reply_status (_invoke_status);
-                      _tao_vfr.receive_other (
-                          &_tao_ri
-                          ACE_ENV_ARG_PARAMETER
-                        );
-                      ACE_TRY_CHECK;
-                    )
-                }
-              else
-                {
-#if TAO_HAS_INTERCEPTORS == 1
-                  
-                  _tao_ri.reply_status (_invoke_status);
-                  _tao_vfr.receive_reply (
-                      &_tao_ri
-                      ACE_ENV_ARG_PARAMETER
-                    );
-                  ACE_TRY_CHECK;
-                
-#endif  /* TAO_HAS_INTERCEPTORS */
-                }
-            
-#if TAO_HAS_INTERCEPTORS == 1
-            }
-        }
-      ACE_CATCHANY
-        {
-          _tao_ri.exception (&ACE_ANY_EXCEPTION);
-          _tao_vfr.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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.receive_exception (
-              &_tao_ri
-              ACE_ENV_ARG_PARAMETER
-            );
-          ACE_TRY_CHECK;
-          
-          const 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;
-      
-      const PortableInterceptor::ReplyStatus _tao_status =
-        _tao_ri.reply_status (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      
-      if (_tao_status != PortableInterceptor::LOCATION_FORWARD
-          && _tao_status != PortableInterceptor::TRANSPORT_RETRY)
-        
-#endif  /* TAO_HAS_INTERCEPTORS */
-        
-        if (_invoke_status != TAO_INVOKE_RESTART)
-          break;
-    }
-}
-
-//
-//            End  Base & Remote  Proxy Implemeentation. 
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/remote_proxy_broker_cs.cpp:31
-
-///////////////////////////////////////////////////////////////////////
-//           Remote & Base  Proxy Broker Implementation
-//
-
-ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker::_TAO_ServerInformationIterator_Proxy_Broker (void)
-{
-}
-
-ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker::~_TAO_ServerInformationIterator_Proxy_Broker (void)
-{
-}
-
-ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker * (*ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// Factory Member function Implementation.
-ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker *
-ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker::the_TAO_ServerInformationIterator_Remote_Proxy_Broker (void)
-{
-  static ::ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker remote_proxy_broker;
-  return &remote_proxy_broker;
-}
-
-ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker::_TAO_ServerInformationIterator_Remote_Proxy_Broker (void)
-{
-}
-
-ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker::~_TAO_ServerInformationIterator_Remote_Proxy_Broker (void)
-{
-}
-
-ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl&
-ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker::select_proxy (
-    ::ImplementationRepository::ServerInformationIterator *
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return this->remote_proxy_impl_;
+  _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 }
 
-//
-//           End Remote & Base Proxy Broker Implementation
-///////////////////////////////////////////////////////////////////////
-
-// TAO_IDL - Generated from 
-// be/be_visitor_interface/interface_cs.cpp:239
-
 ImplementationRepository::ServerInformationIterator::ServerInformationIterator (int collocated)
+ : the_TAO_ServerInformationIterator_Proxy_Broker_ (0)
 {
   this->ImplementationRepository_ServerInformationIterator_setup_collocation (collocated);
 }
@@ -7338,11 +2886,10 @@ void
 ImplementationRepository::ServerInformationIterator::ImplementationRepository_ServerInformationIterator_setup_collocation (int collocated)
 {
   if (collocated)
-    this->the_TAO_ServerInformationIterator_Proxy_Broker_ =
-      ::ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer (this);
-  else
-    this->the_TAO_ServerInformationIterator_Proxy_Broker_ =
-      ::ImplementationRepository::_TAO_ServerInformationIterator_Remote_Proxy_Broker::the_TAO_ServerInformationIterator_Remote_Proxy_Broker ();
+    {
+      this->the_TAO_ServerInformationIterator_Proxy_Broker_ =
+        ::ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer (this);
+    }
 }
 
 ImplementationRepository::ServerInformationIterator::~ServerInformationIterator (void)
@@ -7351,120 +2898,24 @@ ImplementationRepository::ServerInformationIterator::~ServerInformationIterator
 void 
 ImplementationRepository::ServerInformationIterator::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ServerInformationIterator *tmp = ACE_static_cast (ServerInformationIterator *, _tao_void_pointer);
-  CORBA::release (tmp);
+  ServerInformationIterator *_tao_tmp_pointer =
+    ACE_static_cast (ServerInformationIterator *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 ImplementationRepository::ServerInformationIterator_ptr
 ImplementationRepository::ServerInformationIterator::_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL
   )
 {
-  if (CORBA::is_nil (obj))
-    {
-      return ServerInformationIterator::_nil ();
-    }
-  
-  if (! obj->_is_local ())
-    {
-      CORBA::Boolean is_a =
-        obj->_is_a (
-            "IDL:ImplementationRepository/ServerInformationIterator:1.0"
-            ACE_ENV_ARG_PARAMETER
-          );
-      ACE_CHECK_RETURN (ServerInformationIterator::_nil ());
-      
-      if (is_a == 0)
-        {
-          return ServerInformationIterator::_nil ();
-        }
-    }
-  
-  return ServerInformationIterator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-ImplementationRepository::ServerInformationIterator_ptr 
-ImplementationRepository::ServerInformationIterator::_unchecked_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (obj))
-    {
-      return ServerInformationIterator::_nil ();
-    }
-  
-  ServerInformationIterator_ptr default_proxy = ServerInformationIterator::_nil ();
-  
-  // Code for lazily evaluated IOR's
-  if (!obj->is_evaluated ())
-    {
-      ACE_NEW_RETURN (
-          default_proxy,
-          ::ImplementationRepository::ServerInformationIterator (
-              obj->steal_ior (),
-              obj->orb_core ()
-            ),
-          ServerInformationIterator::_nil ()
-        );
-      
-      return default_proxy;
-    }
-  
-  if (! obj->_is_local ())
-    {
-      TAO_Stub* stub = obj->_stubobj ();
-      
-      if (stub != 0)
-        {
-          stub->_incr_refcnt ();
-        }
-      
-      if (
-          !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
-          stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects () &&
-          obj->_is_collocated () &&
-          ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer != 0
-        )
-        {
-          ACE_NEW_RETURN (
-              default_proxy,
-              ::ImplementationRepository::ServerInformationIterator (
-                  stub,
-                  1,
-                  obj->_servant ()
-                ),
-              ServerInformationIterator::_nil ()
-            );
-        }
-      
-      if (CORBA::is_nil (default_proxy))
-        {
-          ACE_NEW_RETURN (
-              default_proxy,
-              ::ImplementationRepository::ServerInformationIterator (
-                  stub,
-                  0,
-                  obj->_servant ()
-                ),
-              ServerInformationIterator::_nil ()
-            );
-        }
-      
-      return default_proxy;
-    }
-  else 
-    return
-      ACE_reinterpret_cast (
-          ServerInformationIterator_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &ServerInformationIterator::_tao_class_id
-                )
-            )
-        );
+  return
+    TAO::Narrow_Utils<ServerInformationIterator>::narrow (
+        _tao_objref,
+        "IDL:ImplementationRepository/ServerInformationIterator:1.0",
+        ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer
+        ACE_ENV_ARG_PARAMETER
+      );
 }
 
 ImplementationRepository::ServerInformationIterator_ptr
@@ -7506,37 +2957,6 @@ ImplementationRepository::ServerInformationIterator::_is_a (
     }
 }
 
-void *ImplementationRepository::ServerInformationIterator::_tao_QueryInterface (ptrdiff_t type)
-{
-  void *retv = 0;
-  
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::ImplementationRepository, ServerInformationIterator)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-  
-  if (retv != 0)
-    {
-      this->_add_ref ();
-    }
-  
-  return retv;
-}
-
 const char* ImplementationRepository::ServerInformationIterator::_interface_repository_id (void) const
 {
   return "IDL:ImplementationRepository/ServerInformationIterator:1.0";
@@ -7549,67 +2969,7 @@ ImplementationRepository::ServerInformationIterator::marshal (TAO_OutputCDR &cdr
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
-
-CORBA::Boolean ImplementationRepository::ServerInformationIterator::next_n (
-    CORBA::ULong how_many,
-    ImplementationRepository::ServerInformationList_out server_list
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  if (!this->is_evaluated ())
-    {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
-      this->ImplementationRepository_ServerInformationIterator_setup_collocation (
-          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
-        );
-    }
-  
-  _TAO_ServerInformationIterator_Proxy_Impl &proxy = 
-    this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  
-  return proxy.next_n (
-      this,
-      how_many,
-      server_list
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_operation/operation_cs.cpp:80
-
-void ImplementationRepository::ServerInformationIterator::destroy (
-    ACE_ENV_SINGLE_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  if (!this->is_evaluated ())
-    {
-      ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
-      this->ImplementationRepository_ServerInformationIterator_setup_collocation (
-          this->ACE_NESTED_CLASS (CORBA, Object)::_is_collocated ()
-        );
-    }
-  
-  _TAO_ServerInformationIterator_Proxy_Impl &proxy = 
-    this->the_TAO_ServerInformationIterator_Proxy_Broker_->select_proxy (this ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-  proxy.destroy (
-      this
-      ACE_ENV_ARG_PARAMETER
-    );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
 static const CORBA::Long _oc_ImplementationRepository_ServerInformationIterator[] =
 {
@@ -7648,17 +3008,14 @@ static CORBA::TypeCode _tc_TAO_tc_ImplementationRepository_ServerInformationIter
     sizeof (ImplementationRepository::ServerInformationIterator)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (ImplementationRepository)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ServerInformationIterator,
-    &_tc_TAO_tc_ImplementationRepository_ServerInformationIterator
-  )
-TAO_NAMESPACE_END
+namespace ImplementationRepository
+{
+  ::CORBA::TypeCode_ptr _tc_ServerInformationIterator =
+    &_tc_TAO_tc_ImplementationRepository_ServerInformationIterator;
+}
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -7702,15 +3059,45 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Impl_T<ImplementationRepository::ServerObject>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Impl_T<ImplementationRepository::ServerObject>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<ImplementationRepository::ServerObject>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
 
 // TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>::demarshal_value (
+    TAO_InputCDR & cdr
+  )
+{
+  CORBA::String_var id;
+  
+  if ((cdr >> id.out ()) == 0)
+    {
+      return 0;
+    }
+  
+  ACE_TRY_NEW_ENV
+    {
+      this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      return 0;
+    }
+  ACE_ENDTRY;
+  
+  return 1;
+}
 
 // Copying insertion.
 void operator<<= (
@@ -7767,15 +3154,35 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<ImplementationRepository::AlreadyRegistered \>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 // TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>::demarshal_value (
+    TAO_InputCDR & cdr
+  )
+{
+  CORBA::String_var id;
+  
+  if ((cdr >> id.out ()) == 0)
+    {
+      return 0;
+    }
+  
+  ACE_TRY_NEW_ENV
+    {
+      this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      return 0;
+    }
+  ACE_ENDTRY;
+  
+  return 1;
+}
 
 // Copying insertion.
 void operator<<= (
@@ -7832,15 +3239,35 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<ImplementationRepository::CannotActivate \>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 // TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>::demarshal_value (
+    TAO_InputCDR & cdr
+  )
+{
+  CORBA::String_var id;
+  
+  if ((cdr >> id.out ()) == 0)
+    {
+      return 0;
+    }
+  
+  ACE_TRY_NEW_ENV
+    {
+      this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      return 0;
+    }
+  ACE_ENDTRY;
+  
+  return 1;
+}
 
 // Copying insertion.
 void operator<<= (
@@ -7897,15 +3324,8 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<ImplementationRepository::NotFound \>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -7962,15 +3382,8 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentVariable>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentVariable>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -8027,15 +3440,8 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentList>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<ImplementationRepository::EnvironmentList>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 // TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52
 
 void operator<<= (
     CORBA::Any &_tao_any,
@@ -8062,15 +3468,8 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Basic_Impl_T<ImplementationRepository::ActivationMode>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Basic_Impl_T<ImplementationRepository::ActivationMode \>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -8127,15 +3526,8 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Dual_Impl_T<ImplementationRepository::StartupOptions>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<ImplementationRepository::StartupOptions>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -8192,15 +3584,8 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformation>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformation>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
 void operator<<= (
@@ -8257,15 +3642,8 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformationList>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<ImplementationRepository::ServerInformationList>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -8309,15 +3687,18 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Impl_T<ImplementationRepository::Administration>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Impl_T<ImplementationRepository::Administration>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<ImplementationRepository::Administration>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -8361,15 +3742,18 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Impl_T<ImplementationRepository::ServerInformationIterator>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Impl_T<ImplementationRepository::ServerInformationIterator>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<ImplementationRepository::ServerInformationIterator>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -8385,34 +3769,27 @@ CORBA::Boolean operator>> (
     ImplementationRepository::ServerObject_ptr &_tao_objref
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    
-    if ((strm >> obj.inout ()) == 0)
-      {
-        return 0;
-      }
+  CORBA::Object_var obj;
+  
+  if ((strm >> obj.inout ()) == 0)
+    {
+      return 0;
+    }
+  
+  typedef ::ImplementationRepository::ServerObject RHS_SCOPED_NAME;
+  
+  // Narrow to the right type.
+  _tao_objref =
+    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
+        obj.in (),
+        ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer
+      );
     
-    // Narrow to the right type.
-    _tao_objref =
-      ImplementationRepository::ServerObject::_unchecked_narrow (
-          obj.in ()
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
+  return 1;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:95
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_EnvironmentList_CPP_
 #define _TAO_CDR_OP_ImplementationRepository_EnvironmentList_CPP_
@@ -8484,7 +3861,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_ImplementationRepository_EnvironmentList_CPP_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:80
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:95
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_ServerInformationList_CPP_
 #define _TAO_CDR_OP_ImplementationRepository_ServerInformationList_CPP_
@@ -8556,7 +3933,7 @@ CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_CPP_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -8572,34 +3949,27 @@ CORBA::Boolean operator>> (
     ImplementationRepository::Administration_ptr &_tao_objref
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    
-    if ((strm >> obj.inout ()) == 0)
-      {
-        return 0;
-      }
+  CORBA::Object_var obj;
+  
+  if ((strm >> obj.inout ()) == 0)
+    {
+      return 0;
+    }
+  
+  typedef ::ImplementationRepository::Administration RHS_SCOPED_NAME;
+  
+  // Narrow to the right type.
+  _tao_objref =
+    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
+        obj.in (),
+        ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer
+      );
     
-    // Narrow to the right type.
-    _tao_objref =
-      ImplementationRepository::Administration::_unchecked_narrow (
-          obj.in ()
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
+  return 1;
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -8615,29 +3985,631 @@ CORBA::Boolean operator>> (
     ImplementationRepository::ServerInformationIterator_ptr &_tao_objref
   )
 {
-  ACE_TRY_NEW_ENV
-  {
-    CORBA::Object_var obj;
-    
-    if ((strm >> obj.inout ()) == 0)
-      {
-        return 0;
-      }
+  CORBA::Object_var obj;
+  
+  if ((strm >> obj.inout ()) == 0)
+    {
+      return 0;
+    }
+  
+  typedef ::ImplementationRepository::ServerInformationIterator RHS_SCOPED_NAME;
+  
+  // Narrow to the right type.
+  _tao_objref =
+    TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
+        obj.in (),
+        ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer
+      );
     
-    // Narrow to the right type.
-    _tao_objref =
-      ImplementationRepository::ServerInformationIterator::_unchecked_narrow (
-          obj.in ()
-          ACE_ENV_ARG_PARAMETER
-        );
-    ACE_TRY_CHECK;
-    return 1;
-  }
-  ACE_CATCHANY
-  {
-    // do nothing
-  }
-  ACE_ENDTRY;
-  return 0;
+  return 1;
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1703
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_TMPLINST_CS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<ImplementationRepository::ServerObject>;
+
+  template class
+    TAO::Object_Arg_Traits_T<
+        ImplementationRepository::ServerObject_ptr,
+        ImplementationRepository::ServerObject_var,
+        ImplementationRepository::ServerObject_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_Objref_Var_T<
+        ImplementationRepository::ServerObject,
+        TAO::Objref_Traits<ImplementationRepository::ServerObject>
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        ImplementationRepository::ServerObject,
+        TAO::Objref_Traits<ImplementationRepository::ServerObject>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        ImplementationRepository::ServerObject
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        ImplementationRepository::AlreadyRegistered
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        ImplementationRepository::CannotActivate
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        ImplementationRepository::NotFound
+      >;
+
+  template class
+    TAO_Var_Var_T<
+        ImplementationRepository::EnvironmentVariable
+      >;
+
+  template class
+    TAO_Var_Base_T<
+        ImplementationRepository::EnvironmentVariable
+      >;
+
+  template class
+    TAO_Out_T<
+        ImplementationRepository::EnvironmentVariable,
+        ImplementationRepository::EnvironmentVariable_var
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        ImplementationRepository::EnvironmentVariable
+      >;
+
+  template class
+    TAO_VarSeq_Var_T<
+        ImplementationRepository::EnvironmentList,
+        ImplementationRepository::EnvironmentVariable
+      >;
+
+  template class
+    TAO_Seq_Var_Base_T<
+        ImplementationRepository::EnvironmentList,
+        ImplementationRepository::EnvironmentVariable
+      >;
+
+  template class
+    TAO_Seq_Out_T<
+        ImplementationRepository::EnvironmentList,
+        ImplementationRepository::EnvironmentList_var,
+        ImplementationRepository::EnvironmentVariable
+      >;
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_)
+#define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_
+
+  template class
+    TAO_Unbounded_Sequence<
+        ImplementationRepository::EnvironmentVariable
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        ImplementationRepository::EnvironmentList
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        ImplementationRepository::ActivationMode
+      >;
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_TMPLINST_CS_)
+#define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<ImplementationRepository::StartupOptions>;
+
+  template class
+    TAO::Var_Size_Arg_Traits<
+        ImplementationRepository::StartupOptions,
+        ImplementationRepository::StartupOptions_var,
+        ImplementationRepository::StartupOptions_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_Var_Var_T<
+        ImplementationRepository::StartupOptions
+      >;
+
+  template class
+    TAO_Var_Base_T<
+        ImplementationRepository::StartupOptions
+      >;
+
+  template class
+    TAO_Out_T<
+        ImplementationRepository::StartupOptions,
+        ImplementationRepository::StartupOptions_var
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        ImplementationRepository::StartupOptions
+      >;
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_TMPLINST_CS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<ImplementationRepository::ServerInformation>;
+
+  template class
+    TAO::Var_Size_Arg_Traits<
+        ImplementationRepository::ServerInformation,
+        ImplementationRepository::ServerInformation_var,
+        ImplementationRepository::ServerInformation_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_Var_Var_T<
+        ImplementationRepository::ServerInformation
+      >;
+
+  template class
+    TAO_Var_Base_T<
+        ImplementationRepository::ServerInformation
+      >;
+
+  template class
+    TAO_Out_T<
+        ImplementationRepository::ServerInformation,
+        ImplementationRepository::ServerInformation_var
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        ImplementationRepository::ServerInformation
+      >;
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_TMPLINST_CS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<ImplementationRepository::ServerInformationList>;
+
+  template class
+    TAO::Var_Size_Arg_Traits<
+        ImplementationRepository::ServerInformationList,
+        ImplementationRepository::ServerInformationList_var,
+        ImplementationRepository::ServerInformationList_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_VarSeq_Var_T<
+        ImplementationRepository::ServerInformationList,
+        ImplementationRepository::ServerInformation
+      >;
+
+  template class
+    TAO_Seq_Var_Base_T<
+        ImplementationRepository::ServerInformationList,
+        ImplementationRepository::ServerInformation
+      >;
+
+  template class
+    TAO_Seq_Out_T<
+        ImplementationRepository::ServerInformationList,
+        ImplementationRepository::ServerInformationList_var,
+        ImplementationRepository::ServerInformation
+      >;
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_
+
+  template class
+    TAO_Unbounded_Sequence<
+        ImplementationRepository::ServerInformation
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        ImplementationRepository::ServerInformationList
+      >;
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_TMPLINST_CS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<ImplementationRepository::ServerInformationIterator>;
+
+  template class
+    TAO::Object_Arg_Traits_T<
+        ImplementationRepository::ServerInformationIterator_ptr,
+        ImplementationRepository::ServerInformationIterator_var,
+        ImplementationRepository::ServerInformationIterator_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO::Out_Var_Size_Argument_T<
+        ImplementationRepository::ServerInformationList,
+        ImplementationRepository::ServerInformationList_out
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        ImplementationRepository::ServerInformationIterator,
+        TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        ImplementationRepository::ServerInformationIterator,
+        TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        ImplementationRepository::ServerInformationIterator
+      >;
+
+  template class
+    TAO::In_Var_Size_Argument_T<
+        ImplementationRepository::StartupOptions
+      >;
+
+  template class
+    TAO::In_Object_Argument_T<
+        ImplementationRepository::ServerObject_ptr
+      >;
+
+  template class
+    TAO::Out_Var_Size_Argument_T<
+        ImplementationRepository::ServerInformation,
+        ImplementationRepository::ServerInformation_out
+      >;
+
+  template class
+    TAO::Out_Object_Argument_T<
+        ImplementationRepository::ServerInformationIterator_ptr,
+        ImplementationRepository::ServerInformationIterator_out
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        ImplementationRepository::Administration,
+        TAO::Objref_Traits<ImplementationRepository::Administration>
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        ImplementationRepository::Administration,
+        TAO::Objref_Traits<ImplementationRepository::Administration>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        ImplementationRepository::Administration
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_TMPLINST_CS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<ImplementationRepository::ServerObject>
+
+# pragma instantiate \
+    TAO::Object_Arg_Traits_T< \
+        ImplementationRepository::ServerObject_ptr, \
+        ImplementationRepository::ServerObject_var, \
+        ImplementationRepository::ServerObject_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        ImplementationRepository::ServerObject, \
+        TAO::Objref_Traits<ImplementationRepository::ServerObject> \
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        ImplementationRepository::ServerObject, \
+        TAO::Objref_Traits<ImplementationRepository::ServerObject> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        ImplementationRepository::ServerObject \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        ImplementationRepository::AlreadyRegistered \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        ImplementationRepository::CannotActivate \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        ImplementationRepository::NotFound \
+      >
+
+# pragma instantiate \
+    TAO_Var_Var_T< \
+        ImplementationRepository::EnvironmentVariable \
+      >
+
+# pragma instantiate \
+    TAO_Var_Base_T< \
+        ImplementationRepository::EnvironmentVariable \
+      >
+
+# pragma instantiate \
+    TAO_Out_T< \
+        ImplementationRepository::EnvironmentVariable, \
+        ImplementationRepository::EnvironmentVariable_var \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        ImplementationRepository::EnvironmentVariable \
+      >
+
+# pragma instantiate \
+    TAO_VarSeq_Var_T< \
+        ImplementationRepository::EnvironmentList, \
+        ImplementationRepository::EnvironmentVariable \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Var_Base_T< \
+        ImplementationRepository::EnvironmentList, \
+        ImplementationRepository::EnvironmentVariable \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Out_T< \
+        ImplementationRepository::EnvironmentList, \
+        ImplementationRepository::EnvironmentList_var, \
+        ImplementationRepository::EnvironmentVariable \
+      >
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_)
+#define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CS_
+
+# pragma instantiate \
+    TAO_Unbounded_Sequence< \
+        ImplementationRepository::EnvironmentVariable \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        ImplementationRepository::EnvironmentList \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        ImplementationRepository::ActivationMode \
+      >
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_TMPLINST_CS_)
+#define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<ImplementationRepository::StartupOptions>
+
+# pragma instantiate \
+    TAO::Var_Size_Arg_Traits< \
+        ImplementationRepository::StartupOptions, \
+        ImplementationRepository::StartupOptions_var, \
+        ImplementationRepository::StartupOptions_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_Var_Var_T< \
+        ImplementationRepository::StartupOptions \
+      >
+
+# pragma instantiate \
+    TAO_Var_Base_T< \
+        ImplementationRepository::StartupOptions \
+      >
+
+# pragma instantiate \
+    TAO_Out_T< \
+        ImplementationRepository::StartupOptions, \
+        ImplementationRepository::StartupOptions_var \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        ImplementationRepository::StartupOptions \
+      >
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_TMPLINST_CS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<ImplementationRepository::ServerInformation>
+
+# pragma instantiate \
+    TAO::Var_Size_Arg_Traits< \
+        ImplementationRepository::ServerInformation, \
+        ImplementationRepository::ServerInformation_var, \
+        ImplementationRepository::ServerInformation_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_Var_Var_T< \
+        ImplementationRepository::ServerInformation \
+      >
+
+# pragma instantiate \
+    TAO_Var_Base_T< \
+        ImplementationRepository::ServerInformation \
+      >
+
+# pragma instantiate \
+    TAO_Out_T< \
+        ImplementationRepository::ServerInformation, \
+        ImplementationRepository::ServerInformation_var \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        ImplementationRepository::ServerInformation \
+      >
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_TMPLINST_CS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<ImplementationRepository::ServerInformationList>
+
+# pragma instantiate \
+    TAO::Var_Size_Arg_Traits< \
+        ImplementationRepository::ServerInformationList, \
+        ImplementationRepository::ServerInformationList_var, \
+        ImplementationRepository::ServerInformationList_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_VarSeq_Var_T< \
+        ImplementationRepository::ServerInformationList, \
+        ImplementationRepository::ServerInformation \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Var_Base_T< \
+        ImplementationRepository::ServerInformationList, \
+        ImplementationRepository::ServerInformation \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Out_T< \
+        ImplementationRepository::ServerInformationList, \
+        ImplementationRepository::ServerInformationList_var, \
+        ImplementationRepository::ServerInformation \
+      >
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CS_
+
+# pragma instantiate \
+    TAO_Unbounded_Sequence< \
+        ImplementationRepository::ServerInformation \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        ImplementationRepository::ServerInformationList \
+      >
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_TMPLINST_CS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<ImplementationRepository::ServerInformationIterator>
+
+# pragma instantiate \
+    TAO::Object_Arg_Traits_T< \
+        ImplementationRepository::ServerInformationIterator_ptr, \
+        ImplementationRepository::ServerInformationIterator_var, \
+        ImplementationRepository::ServerInformationIterator_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO::Out_Var_Size_Argument_T< \
+        ImplementationRepository::ServerInformationList, \
+        ImplementationRepository::ServerInformationList_out \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        ImplementationRepository::ServerInformationIterator, \
+        TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator> \
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        ImplementationRepository::ServerInformationIterator, \
+        TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        ImplementationRepository::ServerInformationIterator \
+      >
+
+# pragma instantiate \
+    TAO::In_Var_Size_Argument_T< \
+        ImplementationRepository::StartupOptions \
+      >
+
+# pragma instantiate \
+    TAO::In_Object_Argument_T< \
+        ImplementationRepository::ServerObject_ptr \
+      >
+
+# pragma instantiate \
+    TAO::Out_Var_Size_Argument_T< \
+        ImplementationRepository::ServerInformation, \
+        ImplementationRepository::ServerInformation_out \
+      >
+
+# pragma instantiate \
+    TAO::Out_Object_Argument_T< \
+        ImplementationRepository::ServerInformationIterator_ptr, \
+        ImplementationRepository::ServerInformationIterator_out \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        ImplementationRepository::Administration, \
+        TAO::Objref_Traits<ImplementationRepository::Administration> \
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        ImplementationRepository::Administration, \
+        TAO::Objref_Traits<ImplementationRepository::Administration> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        ImplementationRepository::Administration \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/PortableServer/ImplRepoC.h b/TAO/tao/PortableServer/ImplRepoC.h
index 2c2b89783bc..53af478d2d5 100644
--- a/TAO/tao/PortableServer/ImplRepoC.h
+++ b/TAO/tao/PortableServer/ImplRepoC.h
@@ -26,11 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:151
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:151
 
 #ifndef _TAO_IDL_ORIG_IMPLREPOC_H_
 #define _TAO_IDL_ORIG_IMPLREPOC_H_
+
 #include /**/ "ace/pre.h"
+
 #include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -40,11 +42,7 @@
 #include "tao/Exception.h"
 #include "tao/Object.h"
 #include "tao/Sequence.h"
-#include "tao/Remote_Object_Proxy_Impl.h"
 #include "tao/VarOut_T.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -69,27 +67,37 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:48
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_ch.cpp:63
 
-TAO_NAMESPACE  ImplementationRepository
+namespace TAO
 {
+  class Collocation_Proxy_Broker;
+  
+  template<typename T> class Narrow_Utils;
+}
 
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:570
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
 
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ODDS_N_ENDS_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ODDS_N_ENDS_CH_
+namespace ImplementationRepository
+{
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601
 
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__VAR_OUT_CH_)
+#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__VAR_OUT_CH_
+  
   class ServerObject;
   typedef ServerObject *ServerObject_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ServerObject
       >
     ServerObject_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ServerObject
@@ -97,290 +105,117 @@ TAO_NAMESPACE  ImplementationRepository
     ServerObject_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:50
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_
-
-  class _TAO_ServerObject_Proxy_Impl;
-  class _TAO_ServerObject_Remote_Proxy_Impl;
-  class _TAO_ServerObject_Proxy_Broker;
-  class _TAO_ServerObject_Remote_Proxy_Broker;
-
+  
   class TAO_PortableServer_Export ServerObject
     : public virtual CORBA::Object
   {
   public:
+    friend class TAO::Narrow_Utils<ServerObject>;
     typedef ServerObject_ptr _ptr_type;
     typedef ServerObject_var _var_type;
-    static int _tao_class_id;
-
+    
     // The static operations.
     static ServerObject_ptr _duplicate (ServerObject_ptr obj);
-
+    
     static ServerObject_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
-    static ServerObject_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
+    
     static ServerObject_ptr _nil (void)
       {
         return (ServerObject_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void ping (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void shutdown (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:207
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
-    _TAO_ServerObject_Proxy_Broker *the_TAO_ServerObject_Proxy_Broker_;
-
+    TAO::Collocation_Proxy_Broker *the_TAO_ServerObject_Proxy_Broker_;
+  
   protected:
     ServerObject (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_ServerObject_setup_collocation (int collocated);
-
+    
     ServerObject (IOP::IOR *ior,
       TAO_ORB_Core *orb_core = 0);
-
+      
     ServerObject (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
     virtual ~ServerObject (void);
-
-    friend class _TAO_ServerObject_Remote_Proxy_Impl;
-    friend class _TAO_ServerObject_ThruPOA_Proxy_Impl;
-    friend class _TAO_ServerObject_Direct_Proxy_Impl;
-
+  
   private:
     ServerObject (const ServerObject &);
     void operator= (const ServerObject &);
   };
 
-  // The Proxy Implementations are used by each interface to
-  // perform a call. Each different implementation encapsulates
-  // an invocation logic.
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                    Base Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
-  class TAO_PortableServer_Export _TAO_ServerObject_Proxy_Impl
-    : public virtual TAO_Object_Proxy_Impl
-  {
-  public:
-    virtual ~_TAO_ServerObject_Proxy_Impl (void) {}
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual void ping (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual void shutdown (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-  protected:
-    _TAO_ServerObject_Proxy_Impl (void);
-  };
-
-  //
-  //               End Base Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                Remote Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
-  class TAO_PortableServer_Export _TAO_ServerObject_Remote_Proxy_Impl
-    : public virtual _TAO_ServerObject_Proxy_Impl,
-      public virtual TAO_Remote_Object_Proxy_Impl
-  {
-  public:
-    _TAO_ServerObject_Remote_Proxy_Impl (void);
-
-    virtual ~_TAO_ServerObject_Remote_Proxy_Impl (void) {}
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual void ping (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual void shutdown (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-
-  //
-  //             End Remote Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-  // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
-  // collocation scheme, the proxy to be used can vary on
-  // a call by call basis.
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
-  class TAO_PortableServer_Export _TAO_ServerObject_Proxy_Broker
-  {
-  public:
-    virtual ~_TAO_ServerObject_Proxy_Broker (void);
-    virtual _TAO_ServerObject_Proxy_Impl &select_proxy (
-        ServerObject *object
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      ) = 0;
-
-  protected:
-    _TAO_ServerObject_Proxy_Broker (void);
-
-  };
-
-  //
-  //              End Base Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
-  class TAO_PortableServer_Export _TAO_ServerObject_Remote_Proxy_Broker
-    : public virtual _TAO_ServerObject_Proxy_Broker
-  {
-  public:
-    _TAO_ServerObject_Remote_Proxy_Broker (void);
-
-    virtual ~_TAO_ServerObject_Remote_Proxy_Broker (void);
-
-    virtual _TAO_ServerObject_Proxy_Impl &select_proxy (
-        ServerObject *object
-        ACE_ENV_ARG_DECL
-      );
-
-  private:
-    _TAO_ServerObject_Remote_Proxy_Impl remote_proxy_impl_;
-
-  public:
-    // This member function is used to get an handle to the unique instance
-    // of the Remote Proxy Broker that is available for a given
-    // interface.
-    static _TAO_ServerObject_Remote_Proxy_Broker *the_TAO_ServerObject_Remote_Proxy_Broker (void);
-  };
-
-  //
-  //              End Remote Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerObject;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_exception/exception_ch.cpp:51
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ALREADYREGISTERED_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ALREADYREGISTERED_CH_
-
+  
   class TAO_PortableServer_Export AlreadyRegistered : public CORBA::UserException
   {
   public:
-
+    
     AlreadyRegistered (void);
     AlreadyRegistered (const AlreadyRegistered &);
     ~AlreadyRegistered (void);
 
     AlreadyRegistered &operator= (const AlreadyRegistered &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static AlreadyRegistered *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -390,46 +225,46 @@ TAO_NAMESPACE  ImplementationRepository
 
     virtual void _tao_encode (
         TAO_OutputCDR &
-        ACE_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
-        ACE_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_exception/exception_ch.cpp:125
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AlreadyRegistered;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_exception/exception_ch.cpp:51
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_CANNOTACTIVATE_CH_)
 #define _IMPLEMENTATIONREPOSITORY_CANNOTACTIVATE_CH_
-
+  
   class TAO_PortableServer_Export CannotActivate : public CORBA::UserException
   {
   public:
-
+    
     TAO_String_Manager reason;
     CannotActivate (void);
     CannotActivate (const CannotActivate &);
     ~CannotActivate (void);
 
     CannotActivate &operator= (const CannotActivate &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static CannotActivate *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -439,52 +274,52 @@ TAO_NAMESPACE  ImplementationRepository
 
     virtual void _tao_encode (
         TAO_OutputCDR &
-        ACE_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
-        ACE_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_exception/exception_ctor.cpp:66
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
+    
     CannotActivate (
         const char * _tao_reason
       );
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_exception/exception_ch.cpp:125
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CannotActivate;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_exception/exception_ch.cpp:51
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_NOTFOUND_CH_)
 #define _IMPLEMENTATIONREPOSITORY_NOTFOUND_CH_
-
+  
   class TAO_PortableServer_Export NotFound : public CORBA::UserException
   {
   public:
-
+    
     NotFound (void);
     NotFound (const NotFound &);
     ~NotFound (void);
 
     NotFound &operator= (const NotFound &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static NotFound *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -494,89 +329,89 @@ TAO_NAMESPACE  ImplementationRepository
 
     virtual void _tao_encode (
         TAO_OutputCDR &
-        ACE_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
-        ACE_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_exception/exception_ch.cpp:125
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotFound;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_type.cpp:249
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258
+  
   struct EnvironmentVariable;
-
+  
   typedef
     TAO_Var_Var_T<
         EnvironmentVariable
       >
     EnvironmentVariable_var;
-
+  
   typedef
     TAO_Out_T<
         EnvironmentVariable,
         EnvironmentVariable_var
       >
     EnvironmentVariable_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:52
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+  
   struct TAO_PortableServer_Export EnvironmentVariable
   {
     typedef EnvironmentVariable_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     TAO_String_Manager value;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EnvironmentVariable;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:367
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:367
+  
   typedef char * Address;
   typedef CORBA::String_var Address_var;
   typedef CORBA::String_out Address_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Address;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:89
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ENVIRONMENTLIST_CH_
-
+  
   class EnvironmentList;
-
+  
   typedef
     TAO_VarSeq_Var_T<
         EnvironmentList,
         EnvironmentVariable
       >
     EnvironmentList_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         EnvironmentList,
@@ -584,7 +419,7 @@ TAO_NAMESPACE  ImplementationRepository
         EnvironmentVariable
       >
     EnvironmentList_out;
-
+  
   class TAO_PortableServer_Export EnvironmentList
     : public
         TAO_Unbounded_Sequence<
@@ -597,27 +432,27 @@ TAO_NAMESPACE  ImplementationRepository
     EnvironmentList (
         CORBA::ULong max,
         CORBA::ULong length,
-        EnvironmentVariable* buffer,
+        EnvironmentVariable* buffer, 
         CORBA::Boolean release = 0
       );
     EnvironmentList (const EnvironmentList &);
     ~EnvironmentList (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef EnvironmentList_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EnvironmentList;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_enum/enum_ch.cpp:57
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
+  
   enum ActivationMode
   {
     NORMAL,
@@ -625,39 +460,39 @@ TAO_NAMESPACE  ImplementationRepository
     PER_CLIENT,
     AUTO_START
   };
-
+  
   typedef ActivationMode &ActivationMode_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ActivationMode;
-
+  
   // TAO_IDL - Generated from
-  // be/be_type.cpp:249
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258
+  
   struct StartupOptions;
-
+  
   typedef
     TAO_Var_Var_T<
         StartupOptions
       >
     StartupOptions_var;
-
+  
   typedef
     TAO_Out_T<
         StartupOptions,
         StartupOptions_var
       >
     StartupOptions_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:52
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+  
   struct TAO_PortableServer_Export StartupOptions
   {
     typedef StartupOptions_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager command_line;
     ImplementationRepository::EnvironmentList environment;
@@ -665,64 +500,64 @@ TAO_NAMESPACE  ImplementationRepository
     ImplementationRepository::ActivationMode activation;
     TAO_String_Manager location;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StartupOptions;
-
+  
   // TAO_IDL - Generated from
-  // be/be_type.cpp:249
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_type.cpp:258
+  
   struct ServerInformation;
-
+  
   typedef
     TAO_Var_Var_T<
         ServerInformation
       >
     ServerInformation_var;
-
+  
   typedef
     TAO_Out_T<
         ServerInformation,
         ServerInformation_var
       >
     ServerInformation_out;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:52
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/structure_ch.cpp:52
+  
   struct TAO_PortableServer_Export ServerInformation
   {
     typedef ServerInformation_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     TAO_String_Manager logical_server;
     TAO_String_Manager server;
     ImplementationRepository::StartupOptions startup;
     TAO_String_Manager location;
   };
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformation;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:89
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST_CH_
-
+  
   class ServerInformationList;
-
+  
   typedef
     TAO_VarSeq_Var_T<
         ServerInformationList,
         ServerInformation
       >
     ServerInformationList_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         ServerInformationList,
@@ -730,7 +565,7 @@ TAO_NAMESPACE  ImplementationRepository
         ServerInformation
       >
     ServerInformationList_out;
-
+  
   class TAO_PortableServer_Export ServerInformationList
     : public
         TAO_Unbounded_Sequence<
@@ -743,39 +578,39 @@ TAO_NAMESPACE  ImplementationRepository
     ServerInformationList (
         CORBA::ULong max,
         CORBA::ULong length,
-        ServerInformation* buffer,
+        ServerInformation* buffer, 
         CORBA::Boolean release = 0
       );
     ServerInformationList (const ServerInformationList &);
     ~ServerInformationList (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef ServerInformationList_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformationList;
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:570
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ODDS_N_ENDS_CH_)
-#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ODDS_N_ENDS_CH_
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601
 
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__VAR_OUT_CH_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__VAR_OUT_CH_
+  
   class ServerInformationIterator;
   typedef ServerInformationIterator *ServerInformationIterator_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ServerInformationIterator
       >
     ServerInformationIterator_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ServerInformationIterator
@@ -783,22 +618,22 @@ TAO_NAMESPACE  ImplementationRepository
     ServerInformationIterator_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:570
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION__ODDS_N_ENDS_CH_)
-#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__ODDS_N_ENDS_CH_
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601
 
+#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION__VAR_OUT_CH_)
+#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__VAR_OUT_CH_
+  
   class Administration;
   typedef Administration *Administration_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Administration
       >
     Administration_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Administration
@@ -806,49 +641,39 @@ TAO_NAMESPACE  ImplementationRepository
     Administration_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:50
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_
-
-  class _TAO_Administration_Proxy_Impl;
-  class _TAO_Administration_Remote_Proxy_Impl;
-  class _TAO_Administration_Proxy_Broker;
-  class _TAO_Administration_Remote_Proxy_Broker;
-
+  
   class TAO_PortableServer_Export Administration
     : public virtual CORBA::Object
   {
   public:
+    friend class TAO::Narrow_Utils<Administration>;
     typedef Administration_ptr _ptr_type;
     typedef Administration_var _var_type;
-    static int _tao_class_id;
-
+    
     // The static operations.
     static Administration_ptr _duplicate (Administration_ptr obj);
-
+    
     static Administration_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
-    static Administration_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
+    
     static Administration_ptr _nil (void)
       {
         return (Administration_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void activate_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -858,10 +683,10 @@ TAO_NAMESPACE  ImplementationRepository
         , ImplementationRepository::NotFound
         , ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * activate_server_with_startup (
         const char * server,
         CORBA::Long check_startup
@@ -872,10 +697,10 @@ TAO_NAMESPACE  ImplementationRepository
         , ImplementationRepository::NotFound
         , ImplementationRepository::CannotActivate
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void register_server (
         const char * server,
         const ImplementationRepository::StartupOptions & options
@@ -885,10 +710,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::AlreadyRegistered
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void reregister_server (
         const char * server,
         const ImplementationRepository::StartupOptions & options
@@ -897,10 +722,10 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void remove_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -909,10 +734,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void shutdown_server (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -921,10 +746,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual char * server_is_running (
         const char * server,
         const char * addr,
@@ -935,10 +760,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void server_is_shutting_down (
         const char * server
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -947,10 +772,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void find (
         const char * server,
         ImplementationRepository::ServerInformation_out info
@@ -960,10 +785,10 @@ TAO_NAMESPACE  ImplementationRepository
         CORBA::SystemException
         , ImplementationRepository::NotFound
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void list (
         CORBA::ULong how_many,
         ImplementationRepository::ServerInformationList_out server_list,
@@ -973,487 +798,82 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:207
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
-    _TAO_Administration_Proxy_Broker *the_TAO_Administration_Proxy_Broker_;
-
+    TAO::Collocation_Proxy_Broker *the_TAO_Administration_Proxy_Broker_;
+  
   protected:
     Administration (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_Administration_setup_collocation (int collocated);
-
+    
     Administration (IOP::IOR *ior,
       TAO_ORB_Core *orb_core = 0);
-
+      
     Administration (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
     virtual ~Administration (void);
-
-    friend class _TAO_Administration_Remote_Proxy_Impl;
-    friend class _TAO_Administration_ThruPOA_Proxy_Impl;
-    friend class _TAO_Administration_Direct_Proxy_Impl;
-
+  
   private:
     Administration (const Administration &);
     void operator= (const Administration &);
   };
 
-  // The Proxy Implementations are used by each interface to
-  // perform a call. Each different implementation encapsulates
-  // an invocation logic.
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                    Base Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
-  class TAO_PortableServer_Export _TAO_Administration_Proxy_Impl
-    : public virtual TAO_Object_Proxy_Impl
-  {
-  public:
-    virtual ~_TAO_Administration_Proxy_Impl (void) {}
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual void activate_server (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-        , ImplementationRepository::CannotActivate
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual char * activate_server_with_startup (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server,
-        CORBA::Long check_startup
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-        , ImplementationRepository::CannotActivate
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual void register_server (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server,
-        const ImplementationRepository::StartupOptions & options
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::AlreadyRegistered
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual void reregister_server (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server,
-        const ImplementationRepository::StartupOptions & options
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual void remove_server (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual void shutdown_server (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual char * server_is_running (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server,
-        const char * addr,
-        ImplementationRepository::ServerObject_ptr server_object
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual void server_is_shutting_down (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual void find (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server,
-        ImplementationRepository::ServerInformation_out info
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual void list (
-        CORBA::Object *_collocated_tao_target_,
-        CORBA::ULong how_many,
-        ImplementationRepository::ServerInformationList_out server_list,
-        ImplementationRepository::ServerInformationIterator_out server_iterator
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-  protected:
-    _TAO_Administration_Proxy_Impl (void);
-  };
-
-  //
-  //               End Base Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                Remote Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
-  class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Impl
-    : public virtual _TAO_Administration_Proxy_Impl,
-      public virtual TAO_Remote_Object_Proxy_Impl
-  {
-  public:
-    _TAO_Administration_Remote_Proxy_Impl (void);
-
-    virtual ~_TAO_Administration_Remote_Proxy_Impl (void) {}
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual void activate_server (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-        , ImplementationRepository::CannotActivate
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual char * activate_server_with_startup (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server,
-        CORBA::Long check_startup
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-        , ImplementationRepository::CannotActivate
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual void register_server (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server,
-        const ImplementationRepository::StartupOptions & options
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::AlreadyRegistered
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual void reregister_server (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server,
-        const ImplementationRepository::StartupOptions & options
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual void remove_server (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual void shutdown_server (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual char * server_is_running (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server,
-        const char * addr,
-        ImplementationRepository::ServerObject_ptr server_object
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual void server_is_shutting_down (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual void find (
-        CORBA::Object *_collocated_tao_target_,
-        const char * server,
-        ImplementationRepository::ServerInformation_out info
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , ImplementationRepository::NotFound
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual void list (
-        CORBA::Object *_collocated_tao_target_,
-        CORBA::ULong how_many,
-        ImplementationRepository::ServerInformationList_out server_list,
-        ImplementationRepository::ServerInformationIterator_out server_iterator
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-
-  //
-  //             End Remote Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-  // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
-  // collocation scheme, the proxy to be used can vary on
-  // a call by call basis.
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
-  class TAO_PortableServer_Export _TAO_Administration_Proxy_Broker
-  {
-  public:
-    virtual ~_TAO_Administration_Proxy_Broker (void);
-    virtual _TAO_Administration_Proxy_Impl &select_proxy (
-        Administration *object
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      ) = 0;
-
-  protected:
-    _TAO_Administration_Proxy_Broker (void);
-
-  };
-
-  //
-  //              End Base Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
-  class TAO_PortableServer_Export _TAO_Administration_Remote_Proxy_Broker
-    : public virtual _TAO_Administration_Proxy_Broker
-  {
-  public:
-    _TAO_Administration_Remote_Proxy_Broker (void);
-
-    virtual ~_TAO_Administration_Remote_Proxy_Broker (void);
-
-    virtual _TAO_Administration_Proxy_Impl &select_proxy (
-        Administration *object
-        ACE_ENV_ARG_DECL
-      );
-
-  private:
-    _TAO_Administration_Remote_Proxy_Impl remote_proxy_impl_;
-
-  public:
-    // This member function is used to get an handle to the unique instance
-    // of the Remote Proxy Broker that is available for a given
-    // interface.
-    static _TAO_Administration_Remote_Proxy_Broker *the_TAO_Administration_Remote_Proxy_Broker (void);
-  };
-
-  //
-  //              End Remote Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Administration;
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:50
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_
-
-  class _TAO_ServerInformationIterator_Proxy_Impl;
-  class _TAO_ServerInformationIterator_Remote_Proxy_Impl;
-  class _TAO_ServerInformationIterator_Proxy_Broker;
-  class _TAO_ServerInformationIterator_Remote_Proxy_Broker;
-
+  
   class TAO_PortableServer_Export ServerInformationIterator
     : public virtual CORBA::Object
   {
   public:
+    friend class TAO::Narrow_Utils<ServerInformationIterator>;
     typedef ServerInformationIterator_ptr _ptr_type;
     typedef ServerInformationIterator_var _var_type;
-    static int _tao_class_id;
-
+    
     // The static operations.
     static ServerInformationIterator_ptr _duplicate (ServerInformationIterator_ptr obj);
-
+    
     static ServerInformationIterator_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
-    static ServerInformationIterator_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
+    
     static ServerInformationIterator_ptr _nil (void)
       {
         return (ServerInformationIterator_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual CORBA::Boolean next_n (
         CORBA::ULong how_many,
         ImplementationRepository::ServerInformationList_out server_list
@@ -1462,265 +882,105 @@ TAO_NAMESPACE  ImplementationRepository
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
+    
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:207
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185
+    
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
-    _TAO_ServerInformationIterator_Proxy_Broker *the_TAO_ServerInformationIterator_Proxy_Broker_;
-
+    TAO::Collocation_Proxy_Broker *the_TAO_ServerInformationIterator_Proxy_Broker_;
+  
   protected:
     ServerInformationIterator (int collocated = 0);
-
+    
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void ImplementationRepository_ServerInformationIterator_setup_collocation (int collocated);
-
+    
     ServerInformationIterator (IOP::IOR *ior,
       TAO_ORB_Core *orb_core = 0);
-
+      
     ServerInformationIterator (
-        TAO_Stub *objref,
+        TAO_Stub *objref, 
         CORBA::Boolean _tao_collocated = 0,
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
     virtual ~ServerInformationIterator (void);
-
-    friend class _TAO_ServerInformationIterator_Remote_Proxy_Impl;
-    friend class _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl;
-    friend class _TAO_ServerInformationIterator_Direct_Proxy_Impl;
-
+  
   private:
     ServerInformationIterator (const ServerInformationIterator &);
     void operator= (const ServerInformationIterator &);
   };
 
-  // The Proxy Implementations are used by each interface to
-  // perform a call. Each different implementation encapsulates
-  // an invocation logic.
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                    Base Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_impl_ch.cpp:35
-
-  class TAO_PortableServer_Export _TAO_ServerInformationIterator_Proxy_Impl
-    : public virtual TAO_Object_Proxy_Impl
-  {
-  public:
-    virtual ~_TAO_ServerInformationIterator_Proxy_Impl (void) {}
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual CORBA::Boolean next_n (
-        CORBA::Object *_collocated_tao_target_,
-        CORBA::ULong how_many,
-        ImplementationRepository::ServerInformationList_out server_list
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/base_proxy_impl_ch.cpp:24
-
-    virtual void destroy (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-  protected:
-    _TAO_ServerInformationIterator_Proxy_Impl (void);
-  };
-
-  //
-  //               End Base Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                Remote Proxy Impl. Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_impl_ch.cpp:37
-
-  class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Impl
-    : public virtual _TAO_ServerInformationIterator_Proxy_Impl,
-      public virtual TAO_Remote_Object_Proxy_Impl
-  {
-  public:
-    _TAO_ServerInformationIterator_Remote_Proxy_Impl (void);
-
-    virtual ~_TAO_ServerInformationIterator_Remote_Proxy_Impl (void) {}
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual CORBA::Boolean next_n (
-        CORBA::Object *_collocated_tao_target_,
-        CORBA::ULong how_many,
-        ImplementationRepository::ServerInformationList_out server_list
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/proxy_impl_xh.cpp:24
-
-    virtual void destroy (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-
-  //
-  //             End Remote Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-  // The Proxy Brokers are used by each interface to get
-  // the right proxy for performing a call. In the new
-  // collocation scheme, the proxy to be used can vary on
-  // a call by call basis.
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Base Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/base_proxy_broker_ch.cpp:35
-
-  class TAO_PortableServer_Export _TAO_ServerInformationIterator_Proxy_Broker
-  {
-  public:
-    virtual ~_TAO_ServerInformationIterator_Proxy_Broker (void);
-    virtual _TAO_ServerInformationIterator_Proxy_Impl &select_proxy (
-        ServerInformationIterator *object
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      ) = 0;
-
-  protected:
-    _TAO_ServerInformationIterator_Proxy_Broker (void);
-
-  };
-
-  //
-  //              End Base Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
-
-  ///////////////////////////////////////////////////////////////////////
-  //                 Remote Proxy Broker Declaration
-  //
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/remote_proxy_broker_ch.cpp:40
-
-  class TAO_PortableServer_Export _TAO_ServerInformationIterator_Remote_Proxy_Broker
-    : public virtual _TAO_ServerInformationIterator_Proxy_Broker
-  {
-  public:
-    _TAO_ServerInformationIterator_Remote_Proxy_Broker (void);
-
-    virtual ~_TAO_ServerInformationIterator_Remote_Proxy_Broker (void);
-
-    virtual _TAO_ServerInformationIterator_Proxy_Impl &select_proxy (
-        ServerInformationIterator *object
-        ACE_ENV_ARG_DECL
-      );
-
-  private:
-    _TAO_ServerInformationIterator_Remote_Proxy_Impl remote_proxy_impl_;
-
-  public:
-    // This member function is used to get an handle to the unique instance
-    // of the Remote Proxy Broker that is available for a given
-    // interface.
-    static _TAO_ServerInformationIterator_Remote_Proxy_Broker *the_TAO_ServerInformationIterator_Remote_Proxy_Broker (void);
-  };
-
-  //
-  //              End Remote Proxy Broker Declaration
-  ///////////////////////////////////////////////////////////////////////
-
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerInformationIterator;
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66
 
-}
-TAO_NAMESPACE_CLOSE // module ImplementationRepository
+} // module ImplementationRepository
 
 // Proxy Broker Factory function pointer declarations.
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:76
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:121
 
 extern TAO_PortableServer_Export
-ImplementationRepository::_TAO_ServerObject_Proxy_Broker *
+TAO::Collocation_Proxy_Broker *
 (*ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
 extern TAO_PortableServer_Export
-ImplementationRepository::_TAO_Administration_Proxy_Broker *
+TAO::Collocation_Proxy_Broker *
 (*ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
 extern TAO_PortableServer_Export
-ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker *
+TAO::Collocation_Proxy_Broker *
 (*ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48
+
+// Traits specializations.
+namespace TAO
+{
+};
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr); // copying
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr *); // non-copying
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerObject_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::AlreadyRegistered &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::AlreadyRegistered*); // noncopying version
@@ -1728,7 +988,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implem
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::AlreadyRegistered *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::CannotActivate &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::CannotActivate*); // noncopying version
@@ -1736,7 +996,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implem
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::CannotActivate *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::NotFound &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::NotFound*); // noncopying version
@@ -1744,7 +1004,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implem
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::NotFound *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentVariable &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentVariable*); // noncopying version
@@ -1752,7 +1012,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implem
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentVariable *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentList &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentList*); // noncopying version
@@ -1760,13 +1020,13 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implem
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentList *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_ch.cpp:51
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_ch.cpp:51
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ActivationMode);
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ActivationMode &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::StartupOptions &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::StartupOptions*); // noncopying version
@@ -1774,7 +1034,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implem
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::StartupOptions *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformation &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformation*); // noncopying version
@@ -1782,7 +1042,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implem
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformation *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformationList &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationList*); // noncopying version
@@ -1790,56 +1050,56 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, Implem
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformationList *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr); // copying
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr *); // non-copying
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr); // copying
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr *); // non-copying
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:48
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
 
 #ifndef __ACE_INLINE__
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerObject_ptr );
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerObject_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/cdr_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::AlreadyRegistered &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::AlreadyRegistered &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/cdr_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::CannotActivate &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::CannotActivate &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/cdr_op_ch.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ch.cpp:52
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::NotFound &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::NotFound &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:53
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:53
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::EnvironmentVariable &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::EnvironmentVariable &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:70
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:70
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_
 #define _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_
@@ -1856,25 +1116,25 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/cdr_op_ch.cpp:50
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ch.cpp:50
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ActivationMode &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ActivationMode &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:53
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:53
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::StartupOptions &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::StartupOptions &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:53
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ch.cpp:53
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformation &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformation &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:70
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:70
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_
 #define _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_
@@ -1891,24 +1151,24 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration_ptr );
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ch.cpp:55
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformationIterator_ptr );
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformationIterator_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:64
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
 
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:1018
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:926
 
 #if defined (__ACE_INLINE__)
 #include "ImplRepoC.i"
@@ -1924,3 +1184,4 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, Implementat
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/PortableServer/ImplRepoC.i b/TAO/tao/PortableServer/ImplRepoC.i
index e6a8f036fab..a0097ee45dd 100644
--- a/TAO/tao/PortableServer/ImplRepoC.i
+++ b/TAO/tao/PortableServer/ImplRepoC.i
@@ -27,7 +27,7 @@
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT___CI_
@@ -39,35 +39,28 @@ ImplementationRepository::ServerObject::ServerObject (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant, oc)
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant, oc),
+    the_TAO_ServerObject_Proxy_Broker_ (0)
+  
 {
   this->ImplementationRepository_ServerObject_setup_collocation (_tao_collocated);
 }
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<ImplementationRepository::ServerObject>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
 ACE_INLINE
 ImplementationRepository::ServerObject::ServerObject (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc)
+  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+    the_TAO_ServerObject_Proxy_Broker_ (0)
+  
 {
 }
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION___CI_
@@ -79,35 +72,28 @@ ImplementationRepository::Administration::Administration (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant, oc)
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant, oc),
+    the_TAO_Administration_Proxy_Broker_ (0)
+  
 {
   this->ImplementationRepository_Administration_setup_collocation (_tao_collocated);
 }
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<ImplementationRepository::Administration>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
 ACE_INLINE
 ImplementationRepository::Administration::Administration (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc)
+  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+    the_TAO_Administration_Proxy_Broker_ (0)
+  
 {
 }
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/interface_ci.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:63
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR___CI_
@@ -119,35 +105,28 @@ ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
     TAO_Abstract_ServantBase *servant,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant, oc)
+  : ACE_NESTED_CLASS (CORBA, Object) (objref, _tao_collocated, servant, oc),
+    the_TAO_ServerInformationIterator_Proxy_Broker_ (0)
+  
 {
   this->ImplementationRepository_ServerInformationIterator_setup_collocation (_tao_collocated);
 }
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<ImplementationRepository::ServerInformationIterator>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
 ACE_INLINE
 ImplementationRepository::ServerInformationIterator::ServerInformationIterator (
     IOP::IOR *ior,
     TAO_ORB_Core *oc
   )
-  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc)
+  : ACE_NESTED_CLASS (CORBA, Object) (ior, oc),
+    the_TAO_ServerInformationIterator_Proxy_Broker_ (0)
+  
 {
 }
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -160,7 +139,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -189,7 +168,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -238,7 +217,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/cdr_op_ci.cpp:71
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/cdr_op_ci.cpp:71
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -267,7 +246,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:70
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -292,7 +271,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:81
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_EnvironmentList_I_
 #define _TAO_CDR_OP_ImplementationRepository_EnvironmentList_I_
@@ -310,7 +289,7 @@ CORBA::Boolean TAO_PortableServer_Export operator>> (
 #endif /* _TAO_CDR_OP_ImplementationRepository_EnvironmentList_I_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/cdr_op_ci.cpp:51
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/cdr_op_ci.cpp:51
 
 ACE_INLINE
 CORBA::Boolean operator<< (TAO_OutputCDR &strm, const ImplementationRepository::ActivationMode &_tao_enumval)
@@ -334,7 +313,7 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, ImplementationRepository::Activat
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:70
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -365,7 +344,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:70
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_structure/cdr_op_ci.cpp:70
 
 ACE_INLINE
 CORBA::Boolean operator<< (
@@ -394,7 +373,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ci.cpp:81
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81
 
 #if !defined _TAO_CDR_OP_ImplementationRepository_ServerInformationList_I_
 #define _TAO_CDR_OP_ImplementationRepository_ServerInformationList_I_
@@ -412,7 +391,7 @@ CORBA::Boolean TAO_PortableServer_Export operator>> (
 #endif /* _TAO_CDR_OP_ImplementationRepository_ServerInformationList_I_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface_fwd/cdr_op_ci.cpp:59
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface_fwd/cdr_op_ci.cpp:59
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
@@ -425,7 +404,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
   );
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/cdr_op_ci.cpp:72
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_ci.cpp:72
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
diff --git a/TAO/tao/PortableServer/ImplRepoS.cpp b/TAO/tao/PortableServer/ImplRepoS.cpp
index 85ad80b9ddf..faba83f731e 100644
--- a/TAO/tao/PortableServer/ImplRepoS.cpp
+++ b/TAO/tao/PortableServer/ImplRepoS.cpp
@@ -15,26 +15,39 @@
 //       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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:619
 
 #ifndef _TAO_IDL_ORIG_IMPLREPOS_CPP_
 #define _TAO_IDL_ORIG_IMPLREPOS_CPP_
 
+
 #include "ImplRepoS.h"
 #include "tao/PortableServer/Object_Adapter.h"
 #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/Basic_Arguments.h"
+#include "tao/Object_Argument_T.h"
+#include "tao/Special_Basic_Arguments.h"
+#include "tao/UB_String_Arguments.h"
+#include "tao/Var_Size_Argument_T.h"
 #include "tao/PortableInterceptor.h"
-#include "tao/Profile.h"
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
 #include "tao/PICurrent.h"
@@ -55,7 +68,142 @@
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1731
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59
+
+// Arg traits specializations.
+namespace TAO
+{
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_SS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_SS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerObject>
+    : public
+        Object_Arg_Traits_T<
+            ImplementationRepository::ServerObject_ptr,
+            ImplementationRepository::ServerObject_var,
+            ImplementationRepository::ServerObject_out,
+            TAO::Objref_Traits<ImplementationRepository::ServerObject>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:428
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_)
+#define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::StartupOptions>
+    : public
+        Var_Size_Arg_Traits_T<
+            ImplementationRepository::StartupOptions,
+            ImplementationRepository::StartupOptions_var,
+            ImplementationRepository::StartupOptions_out
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:428
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_SS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_SS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformation>
+    : public
+        Var_Size_Arg_Traits_T<
+            ImplementationRepository::ServerInformation,
+            ImplementationRepository::ServerInformation_var,
+            ImplementationRepository::ServerInformation_out
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:428
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_)
+#define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::StartupOptions>
+    : public
+        Var_Size_Arg_Traits_T<
+            ImplementationRepository::StartupOptions,
+            ImplementationRepository::StartupOptions_var,
+            ImplementationRepository::StartupOptions_out
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:262
+
+#if !defined (__TAO_SEQ_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION___ARG_TRAITS_SS_)
+#define __TAO_SEQ_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION___ARG_TRAITS_SS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationList>
+    : public
+        Var_Size_Arg_Traits_T<
+            ImplementationRepository::ServerInformationList,
+            ImplementationRepository::ServerInformationList_var,
+            ImplementationRepository::ServerInformationList_out
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_SS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_SS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationIterator>
+    : public
+        Object_Arg_Traits_T<
+            ImplementationRepository::ServerInformationIterator_ptr,
+            ImplementationRepository::ServerInformationIterator_var,
+            ImplementationRepository::ServerInformationIterator_out,
+            TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_SS_)
+#define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_SS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationIterator>
+    : public
+        Object_Arg_Traits_T<
+            ImplementationRepository::ServerInformationIterator_ptr,
+            ImplementationRepository::ServerInformationIterator_var,
+            ImplementationRepository::ServerInformationIterator_out,
+            TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+};
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1403
 
 class TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
@@ -66,7 +214,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_ServerObject_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_ServerObject_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -135,17 +283,17 @@ TAO_ImplementationRepository_ServerObject_Perfect_Hash_OpTable::lookup (const ch
 
   static const class TAO_operation_db_entry  wordlist[] =
     {
-      {"",0},{"",0},{"",0},{"",0},
-      {"ping",  &POA_ImplementationRepository::ServerObject::ping_skel},
-      {"_is_a",  &POA_ImplementationRepository::ServerObject::_is_a_skel},
-      {"",0},{"",0},
-      {"shutdown",      &POA_ImplementationRepository::ServerObject::shutdown_skel},
-      {"",0},
-      {"_component",  &POA_ImplementationRepository::ServerObject::_component_skel},
-      {"",0},{"",0},
-      {"_non_existent",  &POA_ImplementationRepository::ServerObject::_non_existent_skel},
-      {"",0},
-      {"_interface",  &POA_ImplementationRepository::ServerObject::_interface_skel},
+      {"",0,0,0},{"",0,0,0},{"",0,0,0},{"",0,0,0},
+      {"ping", &POA_ImplementationRepository::ServerObject::ping_skel, &POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping, &POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping},
+      {"_is_a", &POA_ImplementationRepository::ServerObject::_is_a_skel, 0, 0},
+      {"",0,0,0},{"",0,0,0},
+      {"shutdown", &POA_ImplementationRepository::ServerObject::shutdown_skel, &POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdown, &POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown},
+      {"",0,0,0},
+      {"_component", &POA_ImplementationRepository::ServerObject::_component_skel, 0, 0},
+      {"",0,0,0},{"",0,0,0},
+      {"_non_existent", &POA_ImplementationRepository::ServerObject::_non_existent_skel, 0, 0},
+      {"",0,0,0},
+      {"_interface", &POA_ImplementationRepository::ServerObject::_interface_skel, 0, 0},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -181,45 +329,45 @@ public:
       POA_ImplementationRepository::ServerObject *tao_impl
       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_ServerObject_ping (
       const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping &
     );
-
+  
 private:
   POA_ImplementationRepository::ServerObject *_tao_impl;
-
+  
 };
 
 // TAO_IDL - Generated from
@@ -245,7 +393,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -259,11 +407,11 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -274,7 +422,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -310,45 +458,45 @@ public:
       POA_ImplementationRepository::ServerObject *tao_impl
       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_ServerObject_shutdown (
       const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown &
     );
-
+  
 private:
   POA_ImplementationRepository::ServerObject *_tao_impl;
-
+  
 };
 
 // TAO_IDL - Generated from
@@ -374,7 +522,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::arguments
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -388,11 +536,11 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::exceptions
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -403,7 +551,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -437,7 +585,8 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::target_is_
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
-POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker *POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::the_TAO_ServerObject_Strategized_Proxy_Broker (void)
+POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker *
+POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::the_TAO_ServerObject_Strategized_Proxy_Broker (void)
 {
   static POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
@@ -445,86 +594,73 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker *POA_Im
 
 POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::_TAO_ServerObject_Strategized_Proxy_Broker (void)
 {
-  for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
-    {
-      this->proxy_cache_[i] = 0;
-    }
 }
 
 POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::~_TAO_ServerObject_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_ServerObject_Proxy_Impl&
-POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::select_proxy (
-    ::ImplementationRepository::ServerObject *object
+TAO::Collocation_Strategy
+POA_ImplementationRepository::_TAO_ServerObject_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_new (obj ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
+  
+  return strategy;
 }
 
 void
-POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::create_proxy (
-    int strategy
+POA_ImplementationRepository::_TAO_ServerObject_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)
+  TAO_Collocated_Skeleton collocated_skel;
+  
+  if (obj->_servant ()->_find (op,
+        collocated_skel,
+        strategy,
+        op_len) == -1)
+    ACE_THROW (CORBA::BAD_OPERATION ());
+  
+  ACE_TRY
     {
-      switch (strategy)
-        {
-        case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
-          ACE_NEW_THROW_EX (
-              this->proxy_cache_[strategy],
-              POA_ImplementationRepository::_TAO_ServerObject_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_ServerObject_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_ServerObject_Remote_Proxy_Impl,
-              CORBA::NO_MEMORY ()
-          );
-          ACE_CHECK;
-          break;
-        }
+      collocated_skel (
+        obj,
+        forward_obj,
+        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;
 }
 
 //
@@ -532,26 +668,32 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::create
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:598
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:603
 
-ImplementationRepository::_TAO_ServerObject_Proxy_Broker *
-ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+TAO::Collocation_Proxy_Broker *
+ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function (CORBA::Object_ptr)
 {
-  ACE_UNUSED_ARG (obj);
-  return ::POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::the_TAO_ServerObject_Strategized_Proxy_Broker();
+  return
+    ::POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::the_TAO_ServerObject_Strategized_Proxy_Broker();
 }
 
 int
 ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (size_t)
 {
-  ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer =
+  ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer = 
     ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function;
-
+  
   return 0;
 }
 
-static int ImplementationRepository__TAO_ServerObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-  ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer));
+static int
+ImplementationRepository__TAO_ServerObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+  ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (
+      ACE_reinterpret_cast (
+          size_t,
+          ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer
+        )
+    );
 
 
 ///////////////////////////////////////////////////////////////////////
@@ -566,87 +708,96 @@ POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::_TAO_ServerO
 
 // 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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
-void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping (
-    CORBA::Object *_collocated_tao_target_
+void
+POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::ping (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out forward,
+    TAO::Argument **,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-  CORBA::Object_var forward_to;
+  
   servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
+      obj->_stubobj ()->object_key (),
       "ping",
-      forward_to.out ()
+      forward
       ACE_ENV_ARG_PARAMETER
     );
   ACE_CHECK;
-
+  
   servant_upcall.pre_invoke_collocated_request (
       ACE_ENV_SINGLE_ARG_PARAMETER
     );
   ACE_CHECK;
-
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::ServerObject_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:ImplementationRepository/ServerObject:1.0"
         )
     )->ping (
-
         ACE_ENV_SINGLE_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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
-void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdown (
-    CORBA::Object *_collocated_tao_target_
+void
+POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdown (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out forward,
+    TAO::Argument **,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-  CORBA::Object_var forward_to;
+  
   servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
+      obj->_stubobj ()->object_key (),
       "shutdown",
-      forward_to.out ()
+      forward
       ACE_ENV_ARG_PARAMETER
     );
   ACE_CHECK;
-
+  
   servant_upcall.pre_invoke_collocated_request (
       ACE_ENV_SINGLE_ARG_PARAMETER
     );
   ACE_CHECK;
-
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::ServerObject_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:ImplementationRepository/ServerObject:1.0"
         )
     )->shutdown (
-
         ACE_ENV_SINGLE_ARG_PARAMETER
       );
-}//
+  ACE_CHECK;
+}
+
+//
 //           End ThruPOA Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
+
 ///////////////////////////////////////////////////////////////////////
 //                 Direct Proxy  Implementation
 //
@@ -654,47 +805,69 @@ void POA_ImplementationRepository::_TAO_ServerObject_ThruPOA_Proxy_Impl::shutdow
 POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::_TAO_ServerObject_Direct_Proxy_Impl (void)
 {}
 
-void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping  (
-    CORBA::Object *_collocated_tao_target_
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
+
+void
+POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out,
+    TAO::Argument **,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
-  )){
+  ))
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::ServerObject_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/ServerObject:1.0")
+      servant_upcall.servant ()->_downcast (
+          "IDL:ImplementationRepository/ServerObject:1.0"
+        )
     )->ping (
+        ACE_ENV_SINGLE_ARG_PARAMETER
+      );
+  ACE_CHECK;
+}// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
-          ACE_ENV_SINGLE_ARG_PARAMETER
-        );
-
-}
-
-void POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown  (
-    CORBA::Object *_collocated_tao_target_
+void
+POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out,
+    TAO::Argument **,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
-  )){
+  ))
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::ServerObject_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/ServerObject:1.0")
+      servant_upcall.servant ()->_downcast (
+          "IDL:ImplementationRepository/ServerObject:1.0"
+        )
     )->shutdown (
-
-          ACE_ENV_SINGLE_ARG_PARAMETER
-        );
-
+        ACE_ENV_SINGLE_ARG_PARAMETER
+      );
+  ACE_CHECK;
 }
 
-
 //
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:98
 
 POA_ImplementationRepository::ServerObject::ServerObject (void)
@@ -705,14 +878,15 @@ POA_ImplementationRepository::ServerObject::ServerObject (void)
 POA_ImplementationRepository::ServerObject::ServerObject (const ServerObject& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs)
-{}
+{
+}
 
 POA_ImplementationRepository::ServerObject::~ServerObject (void)
 {
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::ServerObject::ping_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -727,49 +901,49 @@ void POA_ImplementationRepository::ServerObject::ping_skel (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-
+  
 
 #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_ServerObject_ping _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
       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->ping (
-
+                
                 ACE_ENV_SINGLE_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
-
+            
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -785,52 +959,52 @@ void POA_ImplementationRepository::ServerObject::ping_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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::ServerObject::shutdown_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -845,49 +1019,49 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-
+  
 
 #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_ServerObject_shutdown _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
       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 (
-
+                
                 ACE_ENV_SINGLE_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
-
+            
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -903,55 +1077,55 @@ void POA_ImplementationRepository::ServerObject::shutdown_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_interface/interface_ss.cpp:163
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:165
 
 void POA_ImplementationRepository::ServerObject::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -961,22 +1135,22 @@ void POA_ImplementationRepository::ServerObject::_is_a_skel (
   POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *) _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::ServerObject::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -986,16 +1160,16 @@ void POA_ImplementationRepository::ServerObject::_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::ServerObject::_interface_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -1004,27 +1178,27 @@ void POA_ImplementationRepository::ServerObject::_interface_skel (
   POA_ImplementationRepository::ServerObject *_tao_impl = (POA_ImplementationRepository::ServerObject *) _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,
@@ -1036,7 +1210,7 @@ void POA_ImplementationRepository::ServerObject::_interface_skel (
       _tao_adapter->dispose (_tao_retval);
     }
   ACE_ENDTRY;
-
+  
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -1044,7 +1218,7 @@ void POA_ImplementationRepository::ServerObject::_interface_skel (
 }
 
 void POA_ImplementationRepository::ServerObject::_component_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -1054,10 +1228,10 @@ void POA_ImplementationRepository::ServerObject::_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 ());
 }
@@ -1095,13 +1269,13 @@ void* POA_ImplementationRepository::ServerObject::_downcast (
     {
       return ACE_static_cast (POA_ImplementationRepository::ServerObject_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;
 }
 
@@ -1111,7 +1285,7 @@ const char* POA_ImplementationRepository::ServerObject::_interface_repository_id
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:532
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:539
 
 void POA_ImplementationRepository::ServerObject::_dispatch (
     TAO_ServerRequest &req,
@@ -1126,17 +1300,17 @@ void POA_ImplementationRepository::ServerObject::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:478
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:479
 
 ImplementationRepository::ServerObject *
 POA_ImplementationRepository::ServerObject::_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 (
@@ -1161,14 +1335,19 @@ POA_ImplementationRepository::ServerObject::_this (ACE_ENV_SINGLE_ARG_DECL)
           0
         );
     }
-
+  
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  return ::ImplementationRepository::ServerObject::_unchecked_narrow (obj.in ());
+  typedef ::ImplementationRepository::ServerObject STUB_SCOPED_NAME;
+  return
+    TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
+        obj.in (),
+        ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer
+      );
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1731
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1403
 
 class TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
@@ -1179,7 +1358,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_Administration_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_Administration_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -1248,30 +1427,30 @@ TAO_ImplementationRepository_Administration_Perfect_Hash_OpTable::lookup (const
 
   static const class TAO_operation_db_entry  wordlist[] =
     {
-      {"",0},{"",0},{"",0},{"",0},
-      {"find",  &POA_ImplementationRepository::Administration::find_skel},
-      {"",0},{"",0},{"",0},{"",0},
-      {"_is_a",  &POA_ImplementationRepository::Administration::_is_a_skel},
-      {"_interface",  &POA_ImplementationRepository::Administration::_interface_skel},
-      {"",0},{"",0},
-      {"remove_server",         &POA_ImplementationRepository::Administration::remove_server_skel},
-      {"",0},
-      {"register_server",       &POA_ImplementationRepository::Administration::register_server_skel},
-      {"",0},
-      {"reregister_server",     &POA_ImplementationRepository::Administration::reregister_server_skel},
-      {"",0},
-      {"activate_server",       &POA_ImplementationRepository::Administration::activate_server_skel},
-      {"shutdown_server",       &POA_ImplementationRepository::Administration::shutdown_server_skel},
-      {"",0},
-      {"server_is_running",     &POA_ImplementationRepository::Administration::server_is_running_skel},
-      {"",0},
-      {"list",  &POA_ImplementationRepository::Administration::list_skel},
-      {"_component",  &POA_ImplementationRepository::Administration::_component_skel},
-      {"",0},{"",0},
-      {"_non_existent",  &POA_ImplementationRepository::Administration::_non_existent_skel},
-      {"",0},{"",0},{"",0},
-      {"activate_server_with_startup",  &POA_ImplementationRepository::Administration::activate_server_with_startup_skel},
-      {"server_is_shutting_down",       &POA_ImplementationRepository::Administration::server_is_shutting_down_skel},
+      {"",0,0,0},{"",0,0,0},{"",0,0,0},{"",0,0,0},
+      {"find", &POA_ImplementationRepository::Administration::find_skel, &POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find},
+      {"",0,0,0},{"",0,0,0},{"",0,0,0},{"",0,0,0},
+      {"_is_a", &POA_ImplementationRepository::Administration::_is_a_skel, 0, 0},
+      {"_interface", &POA_ImplementationRepository::Administration::_interface_skel, 0, 0},
+      {"",0,0,0},{"",0,0,0},
+      {"remove_server", &POA_ImplementationRepository::Administration::remove_server_skel, &POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remove_server, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_server},
+      {"",0,0,0},
+      {"register_server", &POA_ImplementationRepository::Administration::register_server_skel, &POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::register_server, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::register_server},
+      {"",0,0,0},
+      {"reregister_server", &POA_ImplementationRepository::Administration::reregister_server_skel, &POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::reregister_server, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregister_server},
+      {"",0,0,0},
+      {"activate_server", &POA_ImplementationRepository::Administration::activate_server_skel, &POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server},
+      {"shutdown_server", &POA_ImplementationRepository::Administration::shutdown_server_skel, &POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutdown_server, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_server},
+      {"",0,0,0},
+      {"server_is_running", &POA_ImplementationRepository::Administration::server_is_running_skel, &POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_running, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_running},
+      {"",0,0,0},
+      {"list", &POA_ImplementationRepository::Administration::list_skel, &POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list},
+      {"_component", &POA_ImplementationRepository::Administration::_component_skel, 0, 0},
+      {"",0,0,0},{"",0,0,0},
+      {"_non_existent", &POA_ImplementationRepository::Administration::_non_existent_skel, 0, 0},
+      {"",0,0,0},{"",0,0,0},{"",0,0,0},
+      {"activate_server_with_startup", &POA_ImplementationRepository::Administration::activate_server_with_startup_skel, &POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server_with_startup, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server_with_startup},
+      {"server_is_shutting_down", &POA_ImplementationRepository::Administration::server_is_shutting_down_skel, &POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_shutting_down, &POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_shutting_down},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -1308,45 +1487,45 @@ public:
       const char * server
       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_Administration_activate_server (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server &
     );
-
+  
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
-
+  
   const char * server_;
 };
 
@@ -1375,15 +1554,15 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::a
   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 (1);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -1397,15 +1576,15 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::e
   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_Administration_activate_server_exceptiondata[] =
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_activate_server_exceptiondata[] = 
   {
     ImplementationRepository::_tc_NotFound,
     ImplementationRepository::_tc_CannotActivate
   };
-
+  
   exception_list->length (2);
   for (CORBA::ULong i = 0; i < 2; ++i)
     {
@@ -1417,7 +1596,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::e
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -1428,7 +1607,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::r
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -1466,49 +1645,50 @@ public:
       const CORBA::Long & check_startup
       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 (char * result);
 
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup &
     );
-
+  
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
-
+  
   const char * server_;
-  const CORBA::Long & check_startup_;char * _result;
+  const CORBA::Long & check_startup_;
+  char * _result;
 };
 
 // TAO_IDL - Generated from
@@ -1538,19 +1718,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_wi
   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 <<= check_startup_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -1564,15 +1744,15 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_wi
   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_Administration_activate_server_with_startup_exceptiondata[] =
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_activate_server_with_startup_exceptiondata[] = 
   {
     ImplementationRepository::_tc_NotFound,
     ImplementationRepository::_tc_CannotActivate
   };
-
+  
   exception_list->length (2);
   for (CORBA::ULong i = 0; i < 2; ++i)
     {
@@ -1584,7 +1764,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_wi
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -1595,11 +1775,11 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_wi
   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 ();
 }
 
@@ -1623,7 +1803,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_wi
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server_with_startup::result (char * result)
 {
   // Update the result.
@@ -1644,45 +1824,45 @@ public:
       const ImplementationRepository::StartupOptions & options
       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_Administration_register_server (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server &
     );
-
+  
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
-
+  
   const char * server_;
   const ImplementationRepository::StartupOptions & options_;
 };
@@ -1714,19 +1894,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::a
   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 <<=  this->options_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -1740,14 +1920,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::e
   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_Administration_register_server_exceptiondata[] =
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_register_server_exceptiondata[] = 
   {
     ImplementationRepository::_tc_AlreadyRegistered
   };
-
+  
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -1759,7 +1939,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::e
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -1770,7 +1950,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::r
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -1808,45 +1988,45 @@ public:
       const ImplementationRepository::StartupOptions & options
       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_Administration_reregister_server (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server &
     );
-
+  
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
-
+  
   const char * server_;
   const ImplementationRepository::StartupOptions & options_;
 };
@@ -1878,19 +2058,19 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server:
   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 <<=  this->options_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -1904,11 +2084,11 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server:
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -1919,7 +2099,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server:
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -1956,45 +2136,45 @@ public:
       const char * server
       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_Administration_remove_server (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server &
     );
-
+  
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
-
+  
   const char * server_;
 };
 
@@ -2023,15 +2203,15 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::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 (1);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -2045,14 +2225,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::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_Administration_remove_server_exceptiondata[] =
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_remove_server_exceptiondata[] = 
   {
     ImplementationRepository::_tc_NotFound
   };
-
+  
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -2064,7 +2244,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::exc
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -2075,7 +2255,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::res
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -2112,45 +2292,45 @@ public:
       const char * server
       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_Administration_shutdown_server (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server &
     );
-
+  
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
-
+  
   const char * server_;
 };
 
@@ -2179,15 +2359,15 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::a
   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 (1);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -2201,14 +2381,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::e
   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_Administration_shutdown_server_exceptiondata[] =
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_shutdown_server_exceptiondata[] = 
   {
     ImplementationRepository::_tc_NotFound
   };
-
+  
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -2220,7 +2400,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::e
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -2231,7 +2411,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::r
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -2270,50 +2450,51 @@ public:
       ImplementationRepository::ServerObject_ptr server_object
       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 (char * result);
 
 private:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running &
     );
-
+  
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
-
+  
   const char * server_;
   const char * addr_;
-  ImplementationRepository::ServerObject_ptr server_object_;char * _result;
+  ImplementationRepository::ServerObject_ptr server_object_;
+  char * _result;
 };
 
 // TAO_IDL - Generated from
@@ -2345,23 +2526,23 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
   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 (3);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<= addr_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   (*parameter_list)[len].argument <<=  this->server_object_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -2375,14 +2556,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
   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_Administration_server_is_running_exceptiondata[] =
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_running_exceptiondata[] = 
   {
     ImplementationRepository::_tc_NotFound
   };
-
+  
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -2394,7 +2575,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -2405,11 +2586,11 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
   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 ();
 }
 
@@ -2433,7 +2614,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running:
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::result (char * result)
 {
   // Update the result.
@@ -2453,45 +2634,45 @@ public:
       const char * server
       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_Administration_server_is_shutting_down (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down &
     );
-
+  
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
-
+  
   const char * server_;
 };
 
@@ -2520,15 +2701,15 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting
   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 (1);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -2542,14 +2723,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting
   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_Administration_server_is_shutting_down_exceptiondata[] =
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_server_is_shutting_down_exceptiondata[] = 
   {
     ImplementationRepository::_tc_NotFound
   };
-
+  
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -2561,7 +2742,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -2572,7 +2753,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -2609,45 +2790,45 @@ public:
       const char * server
       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_Administration_find (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_find &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_find &
     );
-
+  
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
-
+  
   const char * server_;
 };
 
@@ -2676,15 +2857,15 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::arguments (
   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 (1);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<= server_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -2698,14 +2879,14 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::exceptions (
   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_Administration_find_exceptiondata[] =
+    
+  static CORBA::TypeCode_ptr _tao_ImplementationRepository_Administration_find_exceptiondata[] = 
   {
     ImplementationRepository::_tc_NotFound
   };
-
+  
   exception_list->length (1);
   for (CORBA::ULong i = 0; i < 1; ++i)
     {
@@ -2717,7 +2898,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::exceptions (
   return safe_exception_list._retn ();
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_find::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -2728,7 +2909,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_find::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -2762,50 +2943,50 @@ public:
       TAO_ServerRequest &_tao_server_request,
       TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
       POA_ImplementationRepository::Administration *tao_impl,
-      const CORBA::ULong & how_many
+      const CORBA::ULong & how_many      
 
       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_Administration_list (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_list &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_Administration_list &
     );
-
+  
 private:
   POA_ImplementationRepository::Administration *_tao_impl;
-
-  const CORBA::ULong & how_many_;
+  
+  const CORBA::ULong & how_many_;  
 
 };
 
@@ -2816,13 +2997,13 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::TAO_ServerRe
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
-    const CORBA::ULong & how_many
+    const CORBA::ULong & how_many    
 
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
-    how_many_ (how_many)
+    how_many_ (how_many)  
 
 {}
 
@@ -2836,15 +3017,15 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::arguments (
   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 (1);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<= how_many_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+    
 
   return safe_parameter_list._retn ();
 }
@@ -2859,11 +3040,11 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_list::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -2874,7 +3055,7 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -2908,7 +3089,8 @@ TAO_ServerRequestInfo_ImplementationRepository_Administration_list::target_is_a
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
-POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker *POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::the_TAO_Administration_Strategized_Proxy_Broker (void)
+POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker *
+POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::the_TAO_Administration_Strategized_Proxy_Broker (void)
 {
   static POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
@@ -2916,86 +3098,73 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker *POA_
 
 POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::_TAO_Administration_Strategized_Proxy_Broker (void)
 {
-  for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
-    {
-      this->proxy_cache_[i] = 0;
-    }
 }
 
 POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::~_TAO_Administration_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_Administration_Proxy_Impl&
-POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::select_proxy (
-    ::ImplementationRepository::Administration *object
+TAO::Collocation_Strategy
+POA_ImplementationRepository::_TAO_Administration_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_new (obj ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
+  
+  return strategy;
 }
 
 void
-POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::create_proxy (
-    int strategy
+POA_ImplementationRepository::_TAO_Administration_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)
+  TAO_Collocated_Skeleton collocated_skel;
+  
+  if (obj->_servant ()->_find (op,
+        collocated_skel,
+        strategy,
+        op_len) == -1)
+    ACE_THROW (CORBA::BAD_OPERATION ());
+  
+  ACE_TRY
     {
-      switch (strategy)
-        {
-        case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
-          ACE_NEW_THROW_EX (
-              this->proxy_cache_[strategy],
-              POA_ImplementationRepository::_TAO_Administration_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_Administration_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_Administration_Remote_Proxy_Impl,
-              CORBA::NO_MEMORY ()
-          );
-          ACE_CHECK;
-          break;
-        }
+      collocated_skel (
+        obj,
+        forward_obj,
+        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;
 }
 
 //
@@ -3003,26 +3172,32 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::crea
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:598
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:603
 
-ImplementationRepository::_TAO_Administration_Proxy_Broker *
-ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+TAO::Collocation_Proxy_Broker *
+ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function (CORBA::Object_ptr)
 {
-  ACE_UNUSED_ARG (obj);
-  return ::POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::the_TAO_Administration_Strategized_Proxy_Broker();
+  return
+    ::POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::the_TAO_Administration_Strategized_Proxy_Broker();
 }
 
 int
 ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (size_t)
 {
-  ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer =
+  ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer = 
     ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function;
-
+  
   return 0;
 }
 
-static int ImplementationRepository__TAO_Administration_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-  ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer));
+static int
+ImplementationRepository__TAO_Administration_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+  ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (
+      ACE_reinterpret_cast (
+          size_t,
+          ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer
+        )
+    );
 
 
 ///////////////////////////////////////////////////////////////////////
@@ -3037,12 +3212,15 @@ POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::_TAO_Admin
 
 // 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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
-void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server (
-    CORBA::Object *_collocated_tao_target_,
-    const char * server
+void
+POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out forward,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3051,43 +3229,44 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activ
     , ImplementationRepository::CannotActivate
   ))
 {
-
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-  CORBA::Object_var forward_to;
+  
   servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
+      obj->_stubobj ()->object_key (),
       "activate_server",
-      forward_to.out ()
+      forward
       ACE_ENV_ARG_PARAMETER
     );
   ACE_CHECK;
-
+  
   servant_upcall.pre_invoke_collocated_request (
       ACE_ENV_SINGLE_ARG_PARAMETER
     );
   ACE_CHECK;
-
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->activate_server (
-
-        server
+        ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
-char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server_with_startup (
-    CORBA::Object *_collocated_tao_target_,
-    const char * server,
-    CORBA::Long check_startup
+void
+POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::activate_server_with_startup (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out forward,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3096,45 +3275,46 @@ char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::act
     , ImplementationRepository::CannotActivate
   ))
 {
-  CORBA::String_var _tao_retval;
-  ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-  CORBA::Object_var forward_to;
+  
   servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
+      obj->_stubobj ()->object_key (),
       "activate_server_with_startup",
-      forward_to.out ()
+      forward
       ACE_ENV_ARG_PARAMETER
     );
-  ACE_CHECK_RETURN (_tao_retval._retn ());
-
+  ACE_CHECK;
+  
   servant_upcall.pre_invoke_collocated_request (
       ACE_ENV_SINGLE_ARG_PARAMETER
     );
-  ACE_CHECK_RETURN (_tao_retval._retn ());
-
-  return ACE_reinterpret_cast (
-      POA_ImplementationRepository::Administration_ptr,
-      servant_upcall.servant ()->_downcast (
-          "IDL:ImplementationRepository/Administration:1.0"
-        )
-    )->activate_server_with_startup (
-
-        server,
-        check_startup
-        ACE_ENV_ARG_PARAMETER
-      );
+  ACE_CHECK;
+  
+  ((TAO::Arg_Traits<CORBA::Char *>::ret_val *) args[0])->arg () =
+    ACE_reinterpret_cast (
+        POA_ImplementationRepository::Administration_ptr,
+        servant_upcall.servant ()->_downcast (
+            "IDL:ImplementationRepository/Administration:1.0"
+          )
+      )->activate_server_with_startup (
+          ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits<CORBA::Long>::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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
-void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::register_server (
-    CORBA::Object *_collocated_tao_target_,
-    const char * server,
-    const ImplementationRepository::StartupOptions & options
+void
+POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::register_server (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out forward,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3142,87 +3322,90 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::regis
     , ImplementationRepository::AlreadyRegistered
   ))
 {
-
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-  CORBA::Object_var forward_to;
+  
   servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
+      obj->_stubobj ()->object_key (),
       "register_server",
-      forward_to.out ()
+      forward
       ACE_ENV_ARG_PARAMETER
     );
   ACE_CHECK;
-
+  
   servant_upcall.pre_invoke_collocated_request (
       ACE_ENV_SINGLE_ARG_PARAMETER
     );
   ACE_CHECK;
-
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->register_server (
-
-        server,
-        options
+        ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->arg (),
+        ((TAO::Arg_Traits<ImplementationRepository::StartupOptions>::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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
-void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::reregister_server (
-    CORBA::Object *_collocated_tao_target_,
-    const char * server,
-    const ImplementationRepository::StartupOptions & options
+void
+POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::reregister_server (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out forward,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-  CORBA::Object_var forward_to;
+  
   servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
+      obj->_stubobj ()->object_key (),
       "reregister_server",
-      forward_to.out ()
+      forward
       ACE_ENV_ARG_PARAMETER
     );
   ACE_CHECK;
-
+  
   servant_upcall.pre_invoke_collocated_request (
       ACE_ENV_SINGLE_ARG_PARAMETER
     );
   ACE_CHECK;
-
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->reregister_server (
-
-        server,
-        options
+        ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->arg (),
+        ((TAO::Arg_Traits<ImplementationRepository::StartupOptions>::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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
-void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remove_server (
-    CORBA::Object *_collocated_tao_target_,
-    const char * server
+void
+POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remove_server (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out forward,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3230,42 +3413,44 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::remov
     , ImplementationRepository::NotFound
   ))
 {
-
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-  CORBA::Object_var forward_to;
+  
   servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
+      obj->_stubobj ()->object_key (),
       "remove_server",
-      forward_to.out ()
+      forward
       ACE_ENV_ARG_PARAMETER
     );
   ACE_CHECK;
-
+  
   servant_upcall.pre_invoke_collocated_request (
       ACE_ENV_SINGLE_ARG_PARAMETER
     );
   ACE_CHECK;
-
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->remove_server (
-
-        server
+        ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
-void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutdown_server (
-    CORBA::Object *_collocated_tao_target_,
-    const char * server
+void
+POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutdown_server (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out forward,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3273,44 +3458,44 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::shutd
     , ImplementationRepository::NotFound
   ))
 {
-
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-  CORBA::Object_var forward_to;
+  
   servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
+      obj->_stubobj ()->object_key (),
       "shutdown_server",
-      forward_to.out ()
+      forward
       ACE_ENV_ARG_PARAMETER
     );
   ACE_CHECK;
-
+  
   servant_upcall.pre_invoke_collocated_request (
       ACE_ENV_SINGLE_ARG_PARAMETER
     );
   ACE_CHECK;
-
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->shutdown_server (
-
-        server
+        ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
-char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_running (
-    CORBA::Object *_collocated_tao_target_,
-    const char * server,
-    const char * addr,
-    ImplementationRepository::ServerObject_ptr server_object
+void
+POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_running (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out forward,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3318,45 +3503,47 @@ char * POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::ser
     , ImplementationRepository::NotFound
   ))
 {
-  CORBA::String_var _tao_retval;
-  ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-  CORBA::Object_var forward_to;
+  
   servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
+      obj->_stubobj ()->object_key (),
       "server_is_running",
-      forward_to.out ()
+      forward
       ACE_ENV_ARG_PARAMETER
     );
-  ACE_CHECK_RETURN (_tao_retval._retn ());
-
+  ACE_CHECK;
+  
   servant_upcall.pre_invoke_collocated_request (
       ACE_ENV_SINGLE_ARG_PARAMETER
     );
-  ACE_CHECK_RETURN (_tao_retval._retn ());
-
-  return ACE_reinterpret_cast (
-      POA_ImplementationRepository::Administration_ptr,
-      servant_upcall.servant ()->_downcast (
-          "IDL:ImplementationRepository/Administration:1.0"
-        )
-    )->server_is_running (
-
-        server,
-        addr,
-        server_object
-        ACE_ENV_ARG_PARAMETER
-      );
+  ACE_CHECK;
+  
+  ((TAO::Arg_Traits<ImplementationRepository::Address>::ret_val *) args[0])->arg () =
+    ACE_reinterpret_cast (
+        POA_ImplementationRepository::Administration_ptr,
+        servant_upcall.servant ()->_downcast (
+            "IDL:ImplementationRepository/Administration:1.0"
+          )
+      )->server_is_running (
+          ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits<ImplementationRepository::Address>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits<ImplementationRepository::ServerObject>::in_arg_val *) args[3])->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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
-void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_shutting_down (
-    CORBA::Object *_collocated_tao_target_,
-    const char * server
+void
+POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::server_is_shutting_down (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out forward,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3364,43 +3551,44 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::serve
     , ImplementationRepository::NotFound
   ))
 {
-
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-  CORBA::Object_var forward_to;
+  
   servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
+      obj->_stubobj ()->object_key (),
       "server_is_shutting_down",
-      forward_to.out ()
+      forward
       ACE_ENV_ARG_PARAMETER
     );
   ACE_CHECK;
-
+  
   servant_upcall.pre_invoke_collocated_request (
       ACE_ENV_SINGLE_ARG_PARAMETER
     );
   ACE_CHECK;
-
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->server_is_shutting_down (
-
-        server
+        ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
-void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find (
-    CORBA::Object *_collocated_tao_target_,
-    const char * server,
-    ImplementationRepository::ServerInformation_out info
+void
+POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out forward,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -3408,86 +3596,86 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::find
     , ImplementationRepository::NotFound
   ))
 {
-
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-  CORBA::Object_var forward_to;
+  
   servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
+      obj->_stubobj ()->object_key (),
       "find",
-      forward_to.out ()
+      forward
       ACE_ENV_ARG_PARAMETER
     );
   ACE_CHECK;
-
+  
   servant_upcall.pre_invoke_collocated_request (
       ACE_ENV_SINGLE_ARG_PARAMETER
     );
   ACE_CHECK;
-
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->find (
-
-        server,
-        info
+        ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->arg (),
+        ((TAO::Arg_Traits<ImplementationRepository::ServerInformation>::out_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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
-void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list (
-    CORBA::Object *_collocated_tao_target_,
-    CORBA::ULong how_many,
-    ImplementationRepository::ServerInformationList_out server_list,
-    ImplementationRepository::ServerInformationIterator_out server_iterator
+void
+POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out forward,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-  CORBA::Object_var forward_to;
+  
   servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
+      obj->_stubobj ()->object_key (),
       "list",
-      forward_to.out ()
+      forward
       ACE_ENV_ARG_PARAMETER
     );
   ACE_CHECK;
-
+  
   servant_upcall.pre_invoke_collocated_request (
       ACE_ENV_SINGLE_ARG_PARAMETER
     );
   ACE_CHECK;
-
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:ImplementationRepository/Administration:1.0"
         )
     )->list (
-
-        how_many,
-        server_list,
-        server_iterator
+        ((TAO::Arg_Traits<CORBA::ULong>::in_arg_val *) args[1])->arg (),
+        ((TAO::Arg_Traits<ImplementationRepository::ServerInformationList>::out_arg_val *) args[2])->arg (),
+        ((TAO::Arg_Traits<ImplementationRepository::ServerInformationIterator>::out_arg_val *) args[3])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
+  ACE_CHECK;
 }
 
 //
 //           End ThruPOA Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
+
 ///////////////////////////////////////////////////////////////////////
 //                 Direct Proxy  Implementation
 //
@@ -3495,228 +3683,323 @@ void POA_ImplementationRepository::_TAO_Administration_ThruPOA_Proxy_Impl::list
 POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::_TAO_Administration_Direct_Proxy_Impl (void)
 {}
 
-void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server  (
-    CORBA::Object *_collocated_tao_target_,
-    const char * server
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
+
+void
+POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
     , ImplementationRepository::CannotActivate
-  )){
+  ))
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
+      servant_upcall.servant ()->_downcast (
+          "IDL:ImplementationRepository/Administration:1.0"
+        )
     )->activate_server (
+        ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->arg ()
+        ACE_ENV_ARG_PARAMETER
+      );
+  ACE_CHECK;
+}// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
-          server
-          ACE_ENV_ARG_PARAMETER
-        );
-
-}
-
-char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server_with_startup  (
-    CORBA::Object *_collocated_tao_target_,
-    const char * server,
-    CORBA::Long check_startup
+void
+POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::activate_server_with_startup (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
     , ImplementationRepository::CannotActivate
-  )){
-  return ACE_reinterpret_cast (
-      POA_ImplementationRepository::Administration_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
-    )->activate_server_with_startup (
-
-          server,
-          check_startup
+  ))
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  
+  ((TAO::Arg_Traits<CORBA::Char *>::ret_val *) args[0])->arg () =
+    ACE_reinterpret_cast (
+        POA_ImplementationRepository::Administration_ptr,
+        servant_upcall.servant ()->_downcast (
+            "IDL:ImplementationRepository/Administration:1.0"
+          )
+      )->activate_server_with_startup (
+          ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits<CORBA::Long>::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/direct_proxy_impl_ss.cpp:42
 
-}
-
-void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::register_server  (
-    CORBA::Object *_collocated_tao_target_,
-    const char * server,
-    const ImplementationRepository::StartupOptions & options
+void
+POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::register_server (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::AlreadyRegistered
-  )){
+  ))
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
+      servant_upcall.servant ()->_downcast (
+          "IDL:ImplementationRepository/Administration:1.0"
+        )
     )->register_server (
+        ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->arg (),
+        ((TAO::Arg_Traits<ImplementationRepository::StartupOptions>::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/direct_proxy_impl_ss.cpp:42
 
-          server,
-          options
-          ACE_ENV_ARG_PARAMETER
-        );
-
-}
-
-void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregister_server  (
-    CORBA::Object *_collocated_tao_target_,
-    const char * server,
-    const ImplementationRepository::StartupOptions & options
+void
+POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::reregister_server (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
-  )){
+  ))
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
+      servant_upcall.servant ()->_downcast (
+          "IDL:ImplementationRepository/Administration:1.0"
+        )
     )->reregister_server (
+        ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->arg (),
+        ((TAO::Arg_Traits<ImplementationRepository::StartupOptions>::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/direct_proxy_impl_ss.cpp:42
 
-          server,
-          options
-          ACE_ENV_ARG_PARAMETER
-        );
-
-}
-
-void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_server  (
-    CORBA::Object *_collocated_tao_target_,
-    const char * server
+void
+POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::remove_server (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
-  )){
+  ))
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
+      servant_upcall.servant ()->_downcast (
+          "IDL:ImplementationRepository/Administration:1.0"
+        )
     )->remove_server (
+        ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->arg ()
+        ACE_ENV_ARG_PARAMETER
+      );
+  ACE_CHECK;
+}// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
-          server
-          ACE_ENV_ARG_PARAMETER
-        );
-
-}
-
-void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_server  (
-    CORBA::Object *_collocated_tao_target_,
-    const char * server
+void
+POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::shutdown_server (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
-  )){
+  ))
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
+      servant_upcall.servant ()->_downcast (
+          "IDL:ImplementationRepository/Administration:1.0"
+        )
     )->shutdown_server (
+        ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->arg ()
+        ACE_ENV_ARG_PARAMETER
+      );
+  ACE_CHECK;
+}// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
-          server
-          ACE_ENV_ARG_PARAMETER
-        );
-
-}
-
-char * POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_running  (
-    CORBA::Object *_collocated_tao_target_,
-    const char * server,
-    const char * addr,
-    ImplementationRepository::ServerObject_ptr server_object
+void
+POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_running (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
-  )){
-  return ACE_reinterpret_cast (
-      POA_ImplementationRepository::Administration_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
-    )->server_is_running (
-
-          server,
-          addr,
-          server_object
+  ))
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  
+  ((TAO::Arg_Traits<ImplementationRepository::Address>::ret_val *) args[0])->arg () =
+    ACE_reinterpret_cast (
+        POA_ImplementationRepository::Administration_ptr,
+        servant_upcall.servant ()->_downcast (
+            "IDL:ImplementationRepository/Administration:1.0"
+          )
+      )->server_is_running (
+          ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits<ImplementationRepository::Address>::in_arg_val *) args[2])->arg (),
+          ((TAO::Arg_Traits<ImplementationRepository::ServerObject>::in_arg_val *) args[3])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
+  ACE_CHECK;
+}// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
-}
-
-void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_shutting_down  (
-    CORBA::Object *_collocated_tao_target_,
-    const char * server
+void
+POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::server_is_shutting_down (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
-  )){
+  ))
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
+      servant_upcall.servant ()->_downcast (
+          "IDL:ImplementationRepository/Administration:1.0"
+        )
     )->server_is_shutting_down (
+        ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->arg ()
+        ACE_ENV_ARG_PARAMETER
+      );
+  ACE_CHECK;
+}// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
-          server
-          ACE_ENV_ARG_PARAMETER
-        );
-
-}
-
-void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find  (
-    CORBA::Object *_collocated_tao_target_,
-    const char * server,
-    ImplementationRepository::ServerInformation_out info
+void
+POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::find (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
     , ImplementationRepository::NotFound
-  )){
+  ))
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
+      servant_upcall.servant ()->_downcast (
+          "IDL:ImplementationRepository/Administration:1.0"
+        )
     )->find (
+        ((TAO::Arg_Traits<CORBA::Char *>::in_arg_val *) args[1])->arg (),
+        ((TAO::Arg_Traits<ImplementationRepository::ServerInformation>::out_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/direct_proxy_impl_ss.cpp:42
 
-          server,
-          info
-          ACE_ENV_ARG_PARAMETER
-        );
-
-}
-
-void POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list  (
-    CORBA::Object *_collocated_tao_target_,
-    CORBA::ULong how_many,
-    ImplementationRepository::ServerInformationList_out server_list,
-    ImplementationRepository::ServerInformationIterator_out server_iterator
+void
+POA_ImplementationRepository::_TAO_Administration_Direct_Proxy_Impl::list (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
-  )){
+  ))
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::Administration_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/Administration:1.0")
+      servant_upcall.servant ()->_downcast (
+          "IDL:ImplementationRepository/Administration:1.0"
+        )
     )->list (
-
-          how_many,
-          server_list,
-          server_iterator
-          ACE_ENV_ARG_PARAMETER
-        );
-
+        ((TAO::Arg_Traits<CORBA::ULong>::in_arg_val *) args[1])->arg (),
+        ((TAO::Arg_Traits<ImplementationRepository::ServerInformationList>::out_arg_val *) args[2])->arg (),
+        ((TAO::Arg_Traits<ImplementationRepository::ServerInformationIterator>::out_arg_val *) args[3])->arg ()
+        ACE_ENV_ARG_PARAMETER
+      );
+  ACE_CHECK;
 }
 
-
 //
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:98
 
 POA_ImplementationRepository::Administration::Administration (void)
@@ -3727,14 +4010,15 @@ POA_ImplementationRepository::Administration::Administration (void)
 POA_ImplementationRepository::Administration::Administration (const Administration& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs)
-{}
+{
+}
 
 POA_ImplementationRepository::Administration::~Administration (void)
 {
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Administration::activate_server_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -3750,58 +4034,63 @@ void POA_ImplementationRepository::Administration::activate_server_skel (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-
+  
   CORBA::String_var server;
-
+  
   if (!(
       (_tao_in >> server.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_Administration_activate_server _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       server.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 (
-
+                
                 server.in ()
                 ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
-
+            
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -3817,52 +4106,52 @@ void POA_ImplementationRepository::Administration::activate_server_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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Administration::activate_server_with_startup_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -3880,61 +4169,66 @@ void POA_ImplementationRepository::Administration::activate_server_with_startup_
   CORBA::String_var _tao_retval;
   CORBA::String_var server;
   CORBA::Long check_startup;
-
+  
   if (!(
       (_tao_in >> server.out ()) &&
       (_tao_in >> check_startup)
-    ))
-    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_Administration_activate_server_with_startup _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       server.in (),
-
+      
       check_startup
       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->activate_server_with_startup (
-
+                
                 server.in (),
-
+                
                 check_startup
                 ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
-
+            
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           char * _tao_retval_info = _tao_retval._retn ();
@@ -3953,59 +4247,64 @@ void POA_ImplementationRepository::Administration::activate_server_with_startup_
           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.in ())
-    ))
-    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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Administration::register_server_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -4021,64 +4320,69 @@ void POA_ImplementationRepository::Administration::register_server_skel (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-
+  
   CORBA::String_var server;
   ImplementationRepository::StartupOptions options;
-
+  
   if (!(
       (_tao_in >> server.out ()) &&
       (_tao_in >> options)
-    ))
-    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_Administration_register_server _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       server.in (),
-
+      
       options
       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->register_server (
-
+                
                 server.in (),
-
+                
                 options
                 ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
-
+            
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -4094,52 +4398,52 @@ void POA_ImplementationRepository::Administration::register_server_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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Administration::reregister_server_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -4155,64 +4459,69 @@ void POA_ImplementationRepository::Administration::reregister_server_skel (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-
+  
   CORBA::String_var server;
   ImplementationRepository::StartupOptions options;
-
+  
   if (!(
       (_tao_in >> server.out ()) &&
       (_tao_in >> options)
-    ))
-    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_Administration_reregister_server _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       server.in (),
-
+      
       options
       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->reregister_server (
-
+                
                 server.in (),
-
+                
                 options
                 ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
-
+            
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -4228,52 +4537,52 @@ void POA_ImplementationRepository::Administration::reregister_server_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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Administration::remove_server_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -4289,58 +4598,63 @@ void POA_ImplementationRepository::Administration::remove_server_skel (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-
+  
   CORBA::String_var server;
-
+  
   if (!(
       (_tao_in >> server.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_Administration_remove_server _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       server.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 (
-
+                
                 server.in ()
                 ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
-
+            
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -4356,52 +4670,52 @@ void POA_ImplementationRepository::Administration::remove_server_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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Administration::shutdown_server_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -4417,58 +4731,63 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-
+  
   CORBA::String_var server;
-
+  
   if (!(
       (_tao_in >> server.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_Administration_shutdown_server _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       server.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 (
-
+                
                 server.in ()
                 ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
-
+            
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -4484,52 +4803,52 @@ void POA_ImplementationRepository::Administration::shutdown_server_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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Administration::server_is_running_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -4548,66 +4867,71 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
   CORBA::String_var server;
   CORBA::String_var addr;
   ImplementationRepository::ServerObject_var server_object;
-
+  
   if (!(
       (_tao_in >> server.out ()) &&
       (_tao_in >> addr.out ()) &&
       (_tao_in >> server_object.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_Administration_server_is_running _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       server.in (),
-
+      
       addr.in (),
-
+      
       server_object.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->server_is_running (
-
+                
                 server.in (),
-
+                
                 addr.in (),
-
+                
                 server_object.in ()
                 ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
-
+            
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           char * _tao_retval_info = _tao_retval._retn ();
@@ -4626,59 +4950,64 @@ void POA_ImplementationRepository::Administration::server_is_running_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.in ())
-    ))
-    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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Administration::server_is_shutting_down_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -4694,58 +5023,63 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-
+  
   CORBA::String_var server;
-
+  
   if (!(
       (_tao_in >> server.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_Administration_server_is_shutting_down _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       server.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 (
-
+                
                 server.in ()
                 ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
-
+            
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -4761,52 +5095,52 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Administration::find_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -4821,61 +5155,66 @@ void POA_ImplementationRepository::Administration::find_skel (
         POA_ImplementationRepository::Administration *,
         _tao_servant
       );
-
+  
   CORBA::String_var server;
   ImplementationRepository::ServerInformation_var info;
-
+  
   if (!(
       (_tao_in >> server.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_Administration_find _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       server.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->find (
-
+                
                 server.in (),
-
+                
                 info.out ()
                 ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
-
+            
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -4891,59 +5230,64 @@ void POA_ImplementationRepository::Administration::find_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 << info.in ())
-    ))
-    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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::Administration::list_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -4958,66 +5302,71 @@ void POA_ImplementationRepository::Administration::list_skel (
         POA_ImplementationRepository::Administration *,
         _tao_servant
       );
-
+  
   CORBA::ULong how_many;
   ImplementationRepository::ServerInformationList_var server_list;
-
+  
   ImplementationRepository::ServerInformationIterator_var server_iterator;
-
+  
   if (!(
       (_tao_in >> how_many)
-    ))
-    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_Administration_list _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
-      how_many
+      
+      how_many      
 
       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->list (
-
+                
                 how_many,
-
+                
                 server_list.out (),
-
+                
                 server_iterator.out ()
                 ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
-
+            
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -5033,63 +5382,68 @@ void POA_ImplementationRepository::Administration::list_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 << server_list.in ()) &&
       (_tao_out << server_iterator.in ())
-    ))
-    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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:165
 
 void POA_ImplementationRepository::Administration::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -5099,22 +5453,22 @@ void POA_ImplementationRepository::Administration::_is_a_skel (
   POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _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::Administration::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -5124,16 +5478,16 @@ void POA_ImplementationRepository::Administration::_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::Administration::_interface_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -5142,27 +5496,27 @@ void POA_ImplementationRepository::Administration::_interface_skel (
   POA_ImplementationRepository::Administration *_tao_impl = (POA_ImplementationRepository::Administration *) _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,
@@ -5174,7 +5528,7 @@ void POA_ImplementationRepository::Administration::_interface_skel (
       _tao_adapter->dispose (_tao_retval);
     }
   ACE_ENDTRY;
-
+  
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -5182,7 +5536,7 @@ void POA_ImplementationRepository::Administration::_interface_skel (
 }
 
 void POA_ImplementationRepository::Administration::_component_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -5192,10 +5546,10 @@ void POA_ImplementationRepository::Administration::_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 ());
 }
@@ -5233,13 +5587,13 @@ void* POA_ImplementationRepository::Administration::_downcast (
     {
       return ACE_static_cast (POA_ImplementationRepository::Administration_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;
 }
 
@@ -5249,7 +5603,7 @@ const char* POA_ImplementationRepository::Administration::_interface_repository_
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:532
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:539
 
 void POA_ImplementationRepository::Administration::_dispatch (
     TAO_ServerRequest &req,
@@ -5264,17 +5618,17 @@ void POA_ImplementationRepository::Administration::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:478
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:479
 
 ImplementationRepository::Administration *
 POA_ImplementationRepository::Administration::_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 (
@@ -5299,14 +5653,19 @@ POA_ImplementationRepository::Administration::_this (ACE_ENV_SINGLE_ARG_DECL)
           0
         );
     }
-
+  
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  return ::ImplementationRepository::Administration::_unchecked_narrow (obj.in ());
+  typedef ::ImplementationRepository::Administration STUB_SCOPED_NAME;
+  return
+    TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
+        obj.in (),
+        ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer
+      );
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1731
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1403
 
 class TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
@@ -5317,7 +5676,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_ServerInformationIterator_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_ServerInformationIterator_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -5386,16 +5745,16 @@ TAO_ImplementationRepository_ServerInformationIterator_Perfect_Hash_OpTable::loo
 
   static const class TAO_operation_db_entry  wordlist[] =
     {
-      {"",0},{"",0},{"",0},{"",0},{"",0},
-      {"_is_a",  &POA_ImplementationRepository::ServerInformationIterator::_is_a_skel},
-      {"next_n",        &POA_ImplementationRepository::ServerInformationIterator::next_n_skel},
-      {"destroy",       &POA_ImplementationRepository::ServerInformationIterator::destroy_skel},
-      {"",0},{"",0},
-      {"_component",  &POA_ImplementationRepository::ServerInformationIterator::_component_skel},
-      {"",0},{"",0},
-      {"_non_existent",  &POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel},
-      {"",0},
-      {"_interface",  &POA_ImplementationRepository::ServerInformationIterator::_interface_skel},
+      {"",0,0,0},{"",0,0,0},{"",0,0,0},{"",0,0,0},{"",0,0,0},
+      {"_is_a", &POA_ImplementationRepository::ServerInformationIterator::_is_a_skel, 0, 0},
+      {"next_n", &POA_ImplementationRepository::ServerInformationIterator::next_n_skel, &POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::next_n, &POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::next_n},
+      {"destroy", &POA_ImplementationRepository::ServerInformationIterator::destroy_skel, &POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::destroy, &POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::destroy},
+      {"",0,0,0},{"",0,0,0},
+      {"_component", &POA_ImplementationRepository::ServerInformationIterator::_component_skel, 0, 0},
+      {"",0,0,0},{"",0,0,0},
+      {"_non_existent", &POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel, 0, 0},
+      {"",0,0,0},
+      {"_interface", &POA_ImplementationRepository::ServerInformationIterator::_interface_skel, 0, 0},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -5432,48 +5791,49 @@ public:
       const CORBA::ULong & how_many
       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::Boolean result);
 
 private:
   TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (
       const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n &
     );
-
+  
 private:
   POA_ImplementationRepository::ServerInformationIterator *_tao_impl;
-
-  const CORBA::ULong & how_many_;CORBA::Boolean _result;
+  
+  const CORBA::ULong & how_many_;
+  CORBA::Boolean _result;
 };
 
 // TAO_IDL - Generated from
@@ -5501,15 +5861,15 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
   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 (1);
   CORBA::ULong len = 0;
-
+  
   (*parameter_list)[len].argument <<= how_many_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
-
+  
   return safe_parameter_list._retn ();
 }
 
@@ -5523,11 +5883,11 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -5538,11 +5898,11 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
   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) <<= CORBA::Any::from_boolean (this->_result);
-
+  
   return safe_result_any._retn ();
 }
 
@@ -5566,7 +5926,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n:
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::result (CORBA::Boolean result)
 {
   // Update the result.
@@ -5585,45 +5945,45 @@ public:
       POA_ImplementationRepository::ServerInformationIterator *tao_impl
       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_ServerInformationIterator_destroy (
       const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy &
     );
-
+  
 private:
   POA_ImplementationRepository::ServerInformationIterator *_tao_impl;
-
+  
 };
 
 // TAO_IDL - Generated from
@@ -5649,7 +6009,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -5663,11 +6023,11 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -5678,7 +6038,7 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -5712,7 +6072,8 @@ TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
-POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker *POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::the_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void)
+POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker *
+POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::the_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void)
 {
   static POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
@@ -5720,86 +6081,73 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
 
 POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void)
 {
-  for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
-    {
-      this->proxy_cache_[i] = 0;
-    }
 }
 
 POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::~_TAO_ServerInformationIterator_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_ServerInformationIterator_Proxy_Impl&
-POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::select_proxy (
-    ::ImplementationRepository::ServerInformationIterator *object
+TAO::Collocation_Strategy
+POA_ImplementationRepository::_TAO_ServerInformationIterator_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_new (obj ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
+  
+  return strategy;
 }
 
 void
-POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::create_proxy (
-    int strategy
+POA_ImplementationRepository::_TAO_ServerInformationIterator_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)
+  TAO_Collocated_Skeleton collocated_skel;
+  
+  if (obj->_servant ()->_find (op,
+        collocated_skel,
+        strategy,
+        op_len) == -1)
+    ACE_THROW (CORBA::BAD_OPERATION ());
+  
+  ACE_TRY
     {
-      switch (strategy)
-        {
-        case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
-          ACE_NEW_THROW_EX (
-              this->proxy_cache_[strategy],
-              POA_ImplementationRepository::_TAO_ServerInformationIterator_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_ServerInformationIterator_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_ServerInformationIterator_Remote_Proxy_Impl,
-              CORBA::NO_MEMORY ()
-          );
-          ACE_CHECK;
-          break;
-        }
+      collocated_skel (
+        obj,
+        forward_obj,
+        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;
 }
 
 //
@@ -5807,26 +6155,32 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:598
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:603
 
-ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker *
-ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+TAO::Collocation_Proxy_Broker *
+ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function (CORBA::Object_ptr)
 {
-  ACE_UNUSED_ARG (obj);
-  return ::POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::the_TAO_ServerInformationIterator_Strategized_Proxy_Broker();
+  return
+    ::POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker::the_TAO_ServerInformationIterator_Strategized_Proxy_Broker();
 }
 
 int
 ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer (size_t)
 {
-  ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer =
+  ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer = 
     ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function;
-
+  
   return 0;
 }
 
-static int ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-  ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer));
+static int
+ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+  ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer (
+      ACE_reinterpret_cast (
+          size_t,
+          ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Initializer
+        )
+    );
 
 
 ///////////////////////////////////////////////////////////////////////
@@ -5841,94 +6195,99 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl:
 
 // 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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
-CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::next_n (
-    CORBA::Object *_collocated_tao_target_,
-    CORBA::ULong how_many,
-    ImplementationRepository::ServerInformationList_out server_list
+void
+POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::next_n (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out forward,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  CORBA::Boolean _tao_retval = 0;
-  ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-  CORBA::Object_var forward_to;
+  
   servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
+      obj->_stubobj ()->object_key (),
       "next_n",
-      forward_to.out ()
+      forward
       ACE_ENV_ARG_PARAMETER
     );
-  ACE_CHECK_RETURN (_tao_retval);
-
+  ACE_CHECK;
+  
   servant_upcall.pre_invoke_collocated_request (
       ACE_ENV_SINGLE_ARG_PARAMETER
     );
-  ACE_CHECK_RETURN (_tao_retval);
-
-  return ACE_reinterpret_cast (
-      POA_ImplementationRepository::ServerInformationIterator_ptr,
-      servant_upcall.servant ()->_downcast (
-          "IDL:ImplementationRepository/ServerInformationIterator:1.0"
-        )
-    )->next_n (
-
-        how_many,
-        server_list
-        ACE_ENV_ARG_PARAMETER
-      );
+  ACE_CHECK;
+  
+  ((TAO::Arg_Traits<ACE_InputCDR::to_boolean>::ret_val *) args[0])->arg () =
+    ACE_reinterpret_cast (
+        POA_ImplementationRepository::ServerInformationIterator_ptr,
+        servant_upcall.servant ()->_downcast (
+            "IDL:ImplementationRepository/ServerInformationIterator:1.0"
+          )
+      )->next_n (
+          ((TAO::Arg_Traits<CORBA::ULong>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits<ImplementationRepository::ServerInformationList>::out_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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
-void POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::destroy (
-    CORBA::Object *_collocated_tao_target_
+void
+POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_Impl::destroy (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out forward,
+    TAO::Argument **,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-  CORBA::Object_var forward_to;
+  
   servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
+      obj->_stubobj ()->object_key (),
       "destroy",
-      forward_to.out ()
+      forward
       ACE_ENV_ARG_PARAMETER
     );
   ACE_CHECK;
-
+  
   servant_upcall.pre_invoke_collocated_request (
       ACE_ENV_SINGLE_ARG_PARAMETER
     );
   ACE_CHECK;
-
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::ServerInformationIterator_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:ImplementationRepository/ServerInformationIterator:1.0"
         )
     )->destroy (
-
         ACE_ENV_SINGLE_ARG_PARAMETER
       );
+  ACE_CHECK;
 }
 
 //
 //           End ThruPOA Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
+
 ///////////////////////////////////////////////////////////////////////
 //                 Direct Proxy  Implementation
 //
@@ -5936,50 +6295,72 @@ void POA_ImplementationRepository::_TAO_ServerInformationIterator_ThruPOA_Proxy_
 POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::_TAO_ServerInformationIterator_Direct_Proxy_Impl (void)
 {}
 
-CORBA::Boolean POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::next_n  (
-    CORBA::Object *_collocated_tao_target_,
-    CORBA::ULong how_many,
-    ImplementationRepository::ServerInformationList_out server_list
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
+
+void
+POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::next_n (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
-  )){
-  return ACE_reinterpret_cast (
-      POA_ImplementationRepository::ServerInformationIterator_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/ServerInformationIterator:1.0")
-    )->next_n (
-
-          how_many,
-          server_list
+  ))
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  
+  ((TAO::Arg_Traits<ACE_InputCDR::to_boolean>::ret_val *) args[0])->arg () =
+    ACE_reinterpret_cast (
+        POA_ImplementationRepository::ServerInformationIterator_ptr,
+        servant_upcall.servant ()->_downcast (
+            "IDL:ImplementationRepository/ServerInformationIterator:1.0"
+          )
+      )->next_n (
+          ((TAO::Arg_Traits<CORBA::ULong>::in_arg_val *) args[1])->arg (),
+          ((TAO::Arg_Traits<ImplementationRepository::ServerInformationList>::out_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/direct_proxy_impl_ss.cpp:42
 
-}
-
-void POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::destroy  (
-    CORBA::Object *_collocated_tao_target_
+void
+POA_ImplementationRepository::_TAO_ServerInformationIterator_Direct_Proxy_Impl::destroy (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out,
+    TAO::Argument **,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
-  )){
+  ))
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  
   ACE_reinterpret_cast (
       POA_ImplementationRepository::ServerInformationIterator_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:ImplementationRepository/ServerInformationIterator:1.0")
+      servant_upcall.servant ()->_downcast (
+          "IDL:ImplementationRepository/ServerInformationIterator:1.0"
+        )
     )->destroy (
-
-          ACE_ENV_SINGLE_ARG_PARAMETER
-        );
-
+        ACE_ENV_SINGLE_ARG_PARAMETER
+      );
+  ACE_CHECK;
 }
 
-
 //
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:98
 
 POA_ImplementationRepository::ServerInformationIterator::ServerInformationIterator (void)
@@ -5990,14 +6371,15 @@ POA_ImplementationRepository::ServerInformationIterator::ServerInformationIterat
 POA_ImplementationRepository::ServerInformationIterator::ServerInformationIterator (const ServerInformationIterator& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs)
-{}
+{
+}
 
 POA_ImplementationRepository::ServerInformationIterator::~ServerInformationIterator (void)
 {
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -6015,59 +6397,64 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
   CORBA::Boolean _tao_retval = 0;
   CORBA::ULong how_many;
   ImplementationRepository::ServerInformationList_var server_list;
-
-
+  
+  
   if (!(
       (_tao_in >> how_many)
-    ))
-    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_ServerInformationIterator_next_n _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-
+      
       how_many
       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->next_n (
-
+                
                 how_many,
-
+                
                 server_list.out ()
                 ACE_ENV_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
-
+            
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           CORBA::Boolean _tao_retval_info = _tao_retval;
@@ -6085,60 +6472,65 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_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 << CORBA::Any::from_boolean (_tao_retval)) &&
       (_tao_out << server_list.in ())
-    ))
-    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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -6153,49 +6545,49 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-
+  
 
 #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_ServerInformationIterator_destroy _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
       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->destroy (
-
+                
                 ACE_ENV_SINGLE_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
-
+            
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -6211,55 +6603,55 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_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_interface/interface_ss.cpp:163
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:165
 
 void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -6269,22 +6661,22 @@ void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel (
   POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *) _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::ServerInformationIterator::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -6294,16 +6686,16 @@ void POA_ImplementationRepository::ServerInformationIterator::_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::ServerInformationIterator::_interface_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -6312,27 +6704,27 @@ void POA_ImplementationRepository::ServerInformationIterator::_interface_skel (
   POA_ImplementationRepository::ServerInformationIterator *_tao_impl = (POA_ImplementationRepository::ServerInformationIterator *) _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,
@@ -6344,7 +6736,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_interface_skel (
       _tao_adapter->dispose (_tao_retval);
     }
   ACE_ENDTRY;
-
+  
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -6352,7 +6744,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_interface_skel (
 }
 
 void POA_ImplementationRepository::ServerInformationIterator::_component_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -6362,10 +6754,10 @@ void POA_ImplementationRepository::ServerInformationIterator::_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 ());
 }
@@ -6403,13 +6795,13 @@ void* POA_ImplementationRepository::ServerInformationIterator::_downcast (
     {
       return ACE_static_cast (POA_ImplementationRepository::ServerInformationIterator_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;
 }
 
@@ -6419,7 +6811,7 @@ const char* POA_ImplementationRepository::ServerInformationIterator::_interface_
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:532
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:539
 
 void POA_ImplementationRepository::ServerInformationIterator::_dispatch (
     TAO_ServerRequest &req,
@@ -6434,17 +6826,17 @@ void POA_ImplementationRepository::ServerInformationIterator::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:478
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:479
 
 ImplementationRepository::ServerInformationIterator *
 POA_ImplementationRepository::ServerInformationIterator::_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 (
@@ -6469,10 +6861,80 @@ POA_ImplementationRepository::ServerInformationIterator::_this (ACE_ENV_SINGLE_A
           0
         );
     }
-
+  
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  return ::ImplementationRepository::ServerInformationIterator::_unchecked_narrow (obj.in ());
+  typedef ::ImplementationRepository::ServerInformationIterator STUB_SCOPED_NAME;
+  return
+    TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
+        obj.in (),
+        ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer
+      );
 }
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1740
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Out_Var_Size_SArgument_T<
+        ImplementationRepository::ServerInformationList,
+        ImplementationRepository::ServerInformationList_out
+      >;
+
+  template class
+    TAO::In_Var_Size_SArgument_T<
+        ImplementationRepository::StartupOptions
+      >;
+
+  template class
+    TAO::In_Object_SArgument_T<
+        ImplementationRepository::ServerObject_ptr
+      >;
+
+  template class
+    TAO::Out_Var_Size_SArgument_T<
+        ImplementationRepository::ServerInformation,
+        ImplementationRepository::ServerInformation_out
+      >;
+
+  template class
+    TAO::Out_Object_SArgument_T<
+        ImplementationRepository::ServerInformationIterator_ptr,
+        ImplementationRepository::ServerInformationIterator_out
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Out_Var_Size_SArgument_T< \
+        ImplementationRepository::ServerInformationList, \
+        ImplementationRepository::ServerInformationList_out \
+      >
+
+# pragma instantiate \
+    TAO::In_Var_Size_SArgument_T< \
+        ImplementationRepository::StartupOptions \
+      >
+
+# pragma instantiate \
+    TAO::In_Object_SArgument_T< \
+        ImplementationRepository::ServerObject_ptr \
+      >
+
+# pragma instantiate \
+    TAO::Out_Var_Size_SArgument_T< \
+        ImplementationRepository::ServerInformation, \
+        ImplementationRepository::ServerInformation_out \
+      >
+
+# pragma instantiate \
+    TAO::Out_Object_SArgument_T< \
+        ImplementationRepository::ServerInformationIterator_ptr, \
+        ImplementationRepository::ServerInformationIterator_out \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ImplRepoS.h b/TAO/tao/PortableServer/ImplRepoS.h
index 8107e8023ca..0fcf07b8312 100644
--- a/TAO/tao/PortableServer/ImplRepoS.h
+++ b/TAO/tao/PortableServer/ImplRepoS.h
@@ -15,12 +15,18 @@
 //       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:443
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_IMPLREPOS_H_
 #define _TAO_IDL_ORIG_IMPLREPOS_H_
@@ -32,6 +38,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Collocation_Proxy_Broker.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/PortableServer/Servant_Base.h"
 #include "tao/PortableServer/Collocated_Object.h"
@@ -52,10 +59,12 @@
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:49
 
-TAO_NAMESPACE  POA_ImplementationRepository
+namespace POA_ImplementationRepository
 {
+  
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:86
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:87
   
   class ServerObject;
   typedef ServerObject *ServerObject_ptr;
@@ -71,6 +80,11 @@ TAO_NAMESPACE  POA_ImplementationRepository
     ServerObject (void);
   
   public:
+    // Useful for template programming.
+    typedef ::ImplementationRepository::ServerObject _stub_type;
+    typedef ::ImplementationRepository::ServerObject_ptr _stub_ptr_type;
+    typedef ::ImplementationRepository::ServerObject_var _stub_var_type;
+    
     ServerObject (const ServerObject& rhs);
     virtual ~ServerObject (void);
     
@@ -156,104 +170,112 @@ TAO_NAMESPACE  POA_ImplementationRepository
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-  };  
+  };
   
   ///////////////////////////////////////////////////////////////////////
   //               Strategized Proxy Broker Declaration 
   //
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:39
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:37
   
-  class TAO_PortableServer_Export _TAO_ServerObject_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Broker
+  class TAO_PortableServer_Export _TAO_ServerObject_Strategized_Proxy_Broker
+    : public virtual TAO::Collocation_Proxy_Broker
   {
   public: 
     _TAO_ServerObject_Strategized_Proxy_Broker (void);
     
     virtual ~_TAO_ServerObject_Strategized_Proxy_Broker (void);
     
-    virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Impl &select_proxy (
-      ::ImplementationRepository::ServerObject *object
-      ACE_ENV_ARG_DECL
-    );
-  
-  private:
-    // Helper methods that takes care to create the proxy
-    // as soon as their use is necessary.
-    void create_proxy (
-      int collocation_strategy
-      ACE_ENV_ARG_DECL
-    );
-    
-    // Caches the proxy implementations. The proxy implementation
-    // are totally stateless, and those can be shared by all the
-    // instances of a given IDL interface type.
-    ::ImplementationRepository::_TAO_ServerObject_Proxy_Impl
-    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
+    TAO::Collocation_Strategy
+    get_strategy (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::SystemException));
     
-    TAO_SYNCH_MUTEX mutex_;
-    // This funxtion is used to get an handle to the unique instance
-    // of the Strategized Proxy Broker that is available for a given
-    // interface.
+    void
+    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));
   
-  public:
-    static _TAO_ServerObject_Strategized_Proxy_Broker *the_TAO_ServerObject_Strategized_Proxy_Broker (void);
-  };
+  static
+  _TAO_ServerObject_Strategized_Proxy_Broker *
+  the_TAO_ServerObject_Strategized_Proxy_Broker (void);
+};
+
+//
+//            End Strategized Proxy Broker Declaration 
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+//                    ThruPOA Proxy Impl. Declaration
+//
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+
+class TAO_PortableServer_Export _TAO_ServerObject_ThruPOA_Proxy_Impl
+  : public virtual TAO_ThruPOA_Object_Proxy_Impl
+{
+public:
+  _TAO_ServerObject_ThruPOA_Proxy_Impl (void);
   
-  //
-  //            End Strategized Proxy Broker Declaration 
-  ///////////////////////////////////////////////////////////////////////
+  virtual ~_TAO_ServerObject_ThruPOA_Proxy_Impl (void) {}
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  ///////////////////////////////////////////////////////////////////////
-  //                    ThruPOA  Impl. Declaration
-  //
+  static void
+  ping (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-  
-  class TAO_PortableServer_Export _TAO_ServerObject_ThruPOA_Proxy_Impl : 
-    public virtual ::ImplementationRepository::_TAO_ServerObject_Proxy_Impl,
-    public virtual TAO_ThruPOA_Object_Proxy_Impl
-  {
-  public:
-    _TAO_ServerObject_ThruPOA_Proxy_Impl (void);
-    
-    virtual ~_TAO_ServerObject_ThruPOA_Proxy_Impl (void) {}
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    virtual void ping (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    virtual void shutdown (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  //
-  //                ThruPOA  Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
+  static void
+  shutdown (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+};
+
+//
+//                ThruPOA  Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
+
 ///////////////////////////////////////////////////////////////////////
 //                    Direct  Impl. Declaration
 //
 
-class TAO_PortableServer_Export _TAO_ServerObject_Direct_Proxy_Impl : 
-  public virtual ImplementationRepository::_TAO_ServerObject_Proxy_Impl,
-  public virtual TAO_Direct_Object_Proxy_Impl
+class TAO_PortableServer_Export _TAO_ServerObject_Direct_Proxy_Impl
+  : public virtual TAO_Direct_Object_Proxy_Impl
 {
 public:
   _TAO_ServerObject_Direct_Proxy_Impl (void);
@@ -263,8 +285,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual void ping (
-      CORBA::Object *_collocated_tao_target_
+  static void
+  ping (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -274,21 +300,27 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual void shutdown (
-      CORBA::Object *_collocated_tao_target_
+  static void
+  shutdown (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
-    ));};
-
+    ));
+};
 
 //
 //                Direct  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
+
+
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:86
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:87
 
 class Administration;
 typedef Administration *Administration_ptr;
@@ -304,6 +336,11 @@ protected:
   Administration (void);
 
 public:
+  // Useful for template programming.
+  typedef ::ImplementationRepository::Administration _stub_type;
+  typedef ::ImplementationRepository::Administration_ptr _stub_ptr_type;
+  typedef ::ImplementationRepository::Administration_var _stub_var_type;
+  
   Administration (const Administration& rhs);
   virtual ~Administration (void);
   
@@ -560,41 +597,39 @@ public:
 //
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:39
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:37
 
-class TAO_PortableServer_Export _TAO_Administration_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_Administration_Proxy_Broker
+class TAO_PortableServer_Export _TAO_Administration_Strategized_Proxy_Broker
+  : public virtual TAO::Collocation_Proxy_Broker
 {
 public: 
   _TAO_Administration_Strategized_Proxy_Broker (void);
   
   virtual ~_TAO_Administration_Strategized_Proxy_Broker (void);
   
-  virtual ::ImplementationRepository::_TAO_Administration_Proxy_Impl &select_proxy (
-    ::ImplementationRepository::Administration *object
-    ACE_ENV_ARG_DECL
-  );
-
-private:
-  // Helper methods that takes care to create the proxy
-  // as soon as their use is necessary.
-  void create_proxy (
-    int collocation_strategy
-    ACE_ENV_ARG_DECL
-  );
-  
-  // Caches the proxy implementations. The proxy implementation
-  // are totally stateless, and those can be shared by all the
-  // instances of a given IDL interface type.
-  ::ImplementationRepository::_TAO_Administration_Proxy_Impl
-  *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
-  TAO_SYNCH_MUTEX mutex_;
-  // This funxtion is used to get an handle to the unique instance
-  // of the Strategized Proxy Broker that is available for a given
-  // interface.
+  TAO::Collocation_Strategy
+  get_strategy (
+      CORBA::Object_ptr obj
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  void
+  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));
 
-public:
-  static _TAO_Administration_Strategized_Proxy_Broker *the_TAO_Administration_Strategized_Proxy_Broker (void);
+static
+_TAO_Administration_Strategized_Proxy_Broker *
+the_TAO_Administration_Strategized_Proxy_Broker (void);
 };
 
 //
@@ -603,15 +638,14 @@ public:
 
 
 ///////////////////////////////////////////////////////////////////////
-//                    ThruPOA  Impl. Declaration
+//                    ThruPOA Proxy Impl. Declaration
 //
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
 
-class TAO_PortableServer_Export _TAO_Administration_ThruPOA_Proxy_Impl : 
-  public virtual ::ImplementationRepository::_TAO_Administration_Proxy_Impl,
-  public virtual TAO_ThruPOA_Object_Proxy_Impl
+class TAO_PortableServer_Export _TAO_Administration_ThruPOA_Proxy_Impl
+  : public virtual TAO_ThruPOA_Object_Proxy_Impl
 {
 public:
   _TAO_Administration_ThruPOA_Proxy_Impl (void);
@@ -621,9 +655,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual void activate_server (
-      CORBA::Object *_collocated_tao_target_,
-      const char * server
+  static void
+  activate_server (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -635,10 +672,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual char * activate_server_with_startup (
-      CORBA::Object *_collocated_tao_target_,
-      const char * server,
-      CORBA::Long check_startup
+  static void
+  activate_server_with_startup (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -650,10 +689,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual void register_server (
-      CORBA::Object *_collocated_tao_target_,
-      const char * server,
-      const ImplementationRepository::StartupOptions & options
+  static void
+  register_server (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -664,10 +705,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual void reregister_server (
-      CORBA::Object *_collocated_tao_target_,
-      const char * server,
-      const ImplementationRepository::StartupOptions & options
+  static void
+  reregister_server (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -677,9 +720,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual void remove_server (
-      CORBA::Object *_collocated_tao_target_,
-      const char * server
+  static void
+  remove_server (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -690,9 +736,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual void shutdown_server (
-      CORBA::Object *_collocated_tao_target_,
-      const char * server
+  static void
+  shutdown_server (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -703,11 +752,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual char * server_is_running (
-      CORBA::Object *_collocated_tao_target_,
-      const char * server,
-      const char * addr,
-      ImplementationRepository::ServerObject_ptr server_object
+  static void
+  server_is_running (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -718,9 +768,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual void server_is_shutting_down (
-      CORBA::Object *_collocated_tao_target_,
-      const char * server
+  static void
+  server_is_shutting_down (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -731,10 +784,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual void find (
-      CORBA::Object *_collocated_tao_target_,
-      const char * server,
-      ImplementationRepository::ServerInformation_out info
+  static void
+  find (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -745,11 +800,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual void list (
-      CORBA::Object *_collocated_tao_target_,
-      CORBA::ULong how_many,
-      ImplementationRepository::ServerInformationList_out server_list,
-      ImplementationRepository::ServerInformationIterator_out server_iterator
+  static void
+  list (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -760,13 +816,16 @@ public:
 //
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
+
 ///////////////////////////////////////////////////////////////////////
 //                    Direct  Impl. Declaration
 //
 
-class TAO_PortableServer_Export _TAO_Administration_Direct_Proxy_Impl : 
-  public virtual ImplementationRepository::_TAO_Administration_Proxy_Impl,
-  public virtual TAO_Direct_Object_Proxy_Impl
+class TAO_PortableServer_Export _TAO_Administration_Direct_Proxy_Impl
+  : public virtual TAO_Direct_Object_Proxy_Impl
 {
 public:
   _TAO_Administration_Direct_Proxy_Impl (void);
@@ -776,9 +835,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual void activate_server (
-      CORBA::Object *_collocated_tao_target_,
-      const char * server
+  static void
+  activate_server (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -790,10 +852,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual char * activate_server_with_startup (
-      CORBA::Object *_collocated_tao_target_,
-      const char * server,
-      CORBA::Long check_startup
+  static void
+  activate_server_with_startup (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -805,10 +869,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual void register_server (
-      CORBA::Object *_collocated_tao_target_,
-      const char * server,
-      const ImplementationRepository::StartupOptions & options
+  static void
+  register_server (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -819,10 +885,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual void reregister_server (
-      CORBA::Object *_collocated_tao_target_,
-      const char * server,
-      const ImplementationRepository::StartupOptions & options
+  static void
+  reregister_server (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -832,9 +900,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual void remove_server (
-      CORBA::Object *_collocated_tao_target_,
-      const char * server
+  static void
+  remove_server (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -845,9 +916,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual void shutdown_server (
-      CORBA::Object *_collocated_tao_target_,
-      const char * server
+  static void
+  shutdown_server (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -858,11 +932,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual char * server_is_running (
-      CORBA::Object *_collocated_tao_target_,
-      const char * server,
-      const char * addr,
-      ImplementationRepository::ServerObject_ptr server_object
+  static void
+  server_is_running (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -873,9 +948,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual void server_is_shutting_down (
-      CORBA::Object *_collocated_tao_target_,
-      const char * server
+  static void
+  server_is_shutting_down (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -886,10 +964,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual void find (
-      CORBA::Object *_collocated_tao_target_,
-      const char * server,
-      ImplementationRepository::ServerInformation_out info
+  static void
+  find (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -900,24 +980,27 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual void list (
-      CORBA::Object *_collocated_tao_target_,
-      CORBA::ULong how_many,
-      ImplementationRepository::ServerInformationList_out server_list,
-      ImplementationRepository::ServerInformationIterator_out server_iterator
+  static void
+  list (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
-    ));};
-
+    ));
+};
 
 //
 //                Direct  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
 
+
+
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:86
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:87
 
 class ServerInformationIterator;
 typedef ServerInformationIterator *ServerInformationIterator_ptr;
@@ -933,6 +1016,11 @@ protected:
   ServerInformationIterator (void);
 
 public:
+  // Useful for template programming.
+  typedef ::ImplementationRepository::ServerInformationIterator _stub_type;
+  typedef ::ImplementationRepository::ServerInformationIterator_ptr _stub_ptr_type;
+  typedef ::ImplementationRepository::ServerInformationIterator_var _stub_var_type;
+  
   ServerInformationIterator (const ServerInformationIterator& rhs);
   virtual ~ServerInformationIterator (void);
   
@@ -1027,41 +1115,39 @@ public:
 //
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:39
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:37
 
-class TAO_PortableServer_Export _TAO_ServerInformationIterator_Strategized_Proxy_Broker : public virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Broker
+class TAO_PortableServer_Export _TAO_ServerInformationIterator_Strategized_Proxy_Broker
+  : public virtual TAO::Collocation_Proxy_Broker
 {
 public: 
   _TAO_ServerInformationIterator_Strategized_Proxy_Broker (void);
   
   virtual ~_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void);
   
-  virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl &select_proxy (
-    ::ImplementationRepository::ServerInformationIterator *object
-    ACE_ENV_ARG_DECL
-  );
-
-private:
-  // Helper methods that takes care to create the proxy
-  // as soon as their use is necessary.
-  void create_proxy (
-    int collocation_strategy
-    ACE_ENV_ARG_DECL
-  );
-  
-  // Caches the proxy implementations. The proxy implementation
-  // are totally stateless, and those can be shared by all the
-  // instances of a given IDL interface type.
-  ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl
-  *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
-  TAO_SYNCH_MUTEX mutex_;
-  // This funxtion is used to get an handle to the unique instance
-  // of the Strategized Proxy Broker that is available for a given
-  // interface.
+  TAO::Collocation_Strategy
+  get_strategy (
+      CORBA::Object_ptr obj
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException));
+  
+  void
+  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));
 
-public:
-  static _TAO_ServerInformationIterator_Strategized_Proxy_Broker *the_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void);
+static
+_TAO_ServerInformationIterator_Strategized_Proxy_Broker *
+the_TAO_ServerInformationIterator_Strategized_Proxy_Broker (void);
 };
 
 //
@@ -1070,15 +1156,14 @@ public:
 
 
 ///////////////////////////////////////////////////////////////////////
-//                    ThruPOA  Impl. Declaration
+//                    ThruPOA Proxy Impl. Declaration
 //
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
 
-class TAO_PortableServer_Export _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl : 
-  public virtual ::ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl,
-  public virtual TAO_ThruPOA_Object_Proxy_Impl
+class TAO_PortableServer_Export _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl
+  : public virtual TAO_ThruPOA_Object_Proxy_Impl
 {
 public:
   _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void);
@@ -1088,10 +1173,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual CORBA::Boolean next_n (
-      CORBA::Object *_collocated_tao_target_,
-      CORBA::ULong how_many,
-      ImplementationRepository::ServerInformationList_out server_list
+  static void
+  next_n (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -1101,8 +1188,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual void destroy (
-      CORBA::Object *_collocated_tao_target_
+  static void
+  destroy (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -1113,13 +1204,16 @@ public:
 //
 //                ThruPOA  Proxy Impl. Declaration
 ///////////////////////////////////////////////////////////////////////
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
+
 ///////////////////////////////////////////////////////////////////////
 //                    Direct  Impl. Declaration
 //
 
-class TAO_PortableServer_Export _TAO_ServerInformationIterator_Direct_Proxy_Impl : 
-  public virtual ImplementationRepository::_TAO_ServerInformationIterator_Proxy_Impl,
-  public virtual TAO_Direct_Object_Proxy_Impl
+class TAO_PortableServer_Export _TAO_ServerInformationIterator_Direct_Proxy_Impl
+  : public virtual TAO_Direct_Object_Proxy_Impl
 {
 public:
   _TAO_ServerInformationIterator_Direct_Proxy_Impl (void);
@@ -1129,10 +1223,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual CORBA::Boolean next_n (
-      CORBA::Object *_collocated_tao_target_,
-      CORBA::ULong how_many,
-      ImplementationRepository::ServerInformationList_out server_list
+  static void
+  next_n (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -1142,14 +1238,18 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual void destroy (
-      CORBA::Object *_collocated_tao_target_
+  static void
+  destroy (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
-    ));};
-
+    ));
+};
 
 //
 //                Direct  Proxy Impl. Declaration
@@ -1160,11 +1260,10 @@ public:
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:80
 
-}
-TAO_NAMESPACE_CLOSE // module ImplementationRepository
+} // module ImplementationRepository
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1044
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:961
 
 #include "ImplRepoS_T.h"
 
diff --git a/TAO/tao/PortableServer/ImplRepoS.i b/TAO/tao/PortableServer/ImplRepoS.i
index e86a7e25a26..1d2df31bd57 100644
--- a/TAO/tao/PortableServer/ImplRepoS.i
+++ b/TAO/tao/PortableServer/ImplRepoS.i
@@ -15,8 +15,12 @@
 //       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
-
-
diff --git a/TAO/tao/PortableServer/ImplRepoS_T.cpp b/TAO/tao/PortableServer/ImplRepoS_T.cpp
index c02c3ce9c7c..5775957cb39 100644
--- a/TAO/tao/PortableServer/ImplRepoS_T.cpp
+++ b/TAO/tao/PortableServer/ImplRepoS_T.cpp
@@ -15,12 +15,18 @@
 //       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:777
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:694
 
 #ifndef _TAO_IDL_ORIG_IMPLREPOS_T_CPP_
 #define _TAO_IDL_ORIG_IMPLREPOS_T_CPP_
diff --git a/TAO/tao/PortableServer/ImplRepoS_T.h b/TAO/tao/PortableServer/ImplRepoS_T.h
index e2f83e0a224..5212d216dc4 100644
--- a/TAO/tao/PortableServer/ImplRepoS_T.h
+++ b/TAO/tao/PortableServer/ImplRepoS_T.h
@@ -15,12 +15,18 @@
 //       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:604
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:553
 
 #ifndef _TAO_IDL_ORIG_IMPLREPOS_T_H_
 #define _TAO_IDL_ORIG_IMPLREPOS_T_H_
@@ -39,7 +45,7 @@
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_sth.cpp:116
 
 #if defined (ACE_HAS_USING_KEYWORD)
-TAO_NAMESPACE  POA_ImplementationRepository
+namespace POA_ImplementationRepository
 {
   
   // TAO_IDL - Generated from
@@ -361,12 +367,11 @@ TAO_NAMESPACE  POA_ImplementationRepository
     ServerInformationIterator_tie (const ServerInformationIterator_tie &);
     void operator= (const ServerInformationIterator_tie &);
   };
-}
-TAO_NAMESPACE_CLOSE // module ImplementationRepository
+} // module ImplementationRepository
 #endif /* ACE_HAS_USING_KEYWORD */
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1141
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1058
 
 #if defined (__ACE_INLINE__)
 #include "ImplRepoS_T.i"
diff --git a/TAO/tao/PortableServer/ImplRepoS_T.i b/TAO/tao/PortableServer/ImplRepoS_T.i
index 7f714d333b3..ce93246b034 100644
--- a/TAO/tao/PortableServer/ImplRepoS_T.i
+++ b/TAO/tao/PortableServer/ImplRepoS_T.i
@@ -15,6 +15,12 @@
 //       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
@@ -584,3 +590,4 @@ void POA_ImplementationRepository::ServerInformationIterator_tie<T>::destroy  (
 }
 
 #endif /* ACE_HAS_USING_KEYWORD */
+
diff --git a/TAO/tao/PortableServer/ORB_Manager.cpp b/TAO/tao/PortableServer/ORB_Manager.cpp
index 15c7c7e640b..b0087f811a2 100644
--- a/TAO/tao/PortableServer/ORB_Manager.cpp
+++ b/TAO/tao/PortableServer/ORB_Manager.cpp
@@ -13,7 +13,9 @@
 #include "ORB_Manager.h"
 #include "tao/Environment.h"
 
-ACE_RCSID(tao, ORB_Manager, "$Id$")
+ACE_RCSID (tao, 
+           ORB_Manager, 
+           "$Id$")
 
 // constructor
 TAO_ORB_Manager::TAO_ORB_Manager (CORBA::ORB_ptr orb,
diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp
index 84bd2c91f0e..c7fbd7ef8e3 100644
--- a/TAO/tao/PortableServer/POA.cpp
+++ b/TAO/tao/PortableServer/POA.cpp
@@ -779,7 +779,7 @@ TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
             this->server_object_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
-          tao_poa = poa->_tao_poa_downcast();
+          tao_poa = poa->_tao_poa_downcast ();
           PortableServer::ObjectId_var id =
             tao_poa->servant_to_id_i (this->server_object_
                                       ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp
index 22bd497358e..41847e3ea4e 100644
--- a/TAO/tao/PortableServer/PolicyS.cpp
+++ b/TAO/tao/PortableServer/PolicyS.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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:619
 
 #ifndef _TAO_IDL_ORIG_POLICYS_CPP_
 #define _TAO_IDL_ORIG_POLICYS_CPP_
@@ -32,9 +38,13 @@
 #include "tao/PortableServer/Operation_Table.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/ORB_Core.h"
-#include "tao/Stub.h"
 #include "tao/Profile.h"
+#include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
+#include "tao/Object_T.h"
+#include "tao/Basic_Arguments.h"
+#include "tao/Object_Argument_T.h"
+#include "tao/Var_Size_Argument_T.h"
 #include "tao/PortableInterceptor.h"
 #if TAO_HAS_INTERCEPTORS == 1
 #include "tao/RequestInfo_Util.h"
@@ -44,6 +54,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 +67,104 @@
 
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1731
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59
+
+// Arg traits specializations.
+namespace TAO
+{
+
+#if !defined (_CORBA_POLICY__ARG_TRAITS_SS_)
+#define _CORBA_POLICY__ARG_TRAITS_SS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_Export Arg_Traits<CORBA::Policy>
+    : public
+        Object_Arg_Traits_T<
+            CORBA::Policy_ptr,
+            CORBA::Policy_var,
+            CORBA::Policy_out,
+            TAO::Objref_Traits<CORBA::Policy>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:262
+
+#if !defined (__TAO_SEQ_CORBA_POLICY___ARG_TRAITS_SS_)
+#define __TAO_SEQ_CORBA_POLICY___ARG_TRAITS_SS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_Export Arg_Traits<CORBA::PolicyList>
+    : public
+        Var_Size_Arg_Traits_T<
+            CORBA::PolicyList,
+            CORBA::PolicyList_var,
+            CORBA::PolicyList_out
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:262
+
+#if !defined (__TAO_SEQ_CORBA_POLICYTYPE___ARG_TRAITS_SS_)
+#define __TAO_SEQ_CORBA_POLICYTYPE___ARG_TRAITS_SS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_Export Arg_Traits<CORBA::PolicyTypeSeq>
+    : public
+        Var_Size_Arg_Traits_T<
+            CORBA::PolicyTypeSeq,
+            CORBA::PolicyTypeSeq_var,
+            CORBA::PolicyTypeSeq_out
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:390
+
+#if !defined (_CORBA_SETOVERRIDETYPE__ARG_TRAITS_SS_)
+#define _CORBA_SETOVERRIDETYPE__ARG_TRAITS_SS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_Export Arg_Traits<CORBA::SetOverrideType>
+    : public
+        Basic_Arg_Traits_T<
+            CORBA::SetOverrideType
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_POLICY__ARG_TRAITS_SS_)
+#define _CORBA_POLICY__ARG_TRAITS_SS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_Export Arg_Traits<CORBA::Policy>
+    : public
+        Object_Arg_Traits_T<
+            CORBA::Policy_ptr,
+            CORBA::Policy_var,
+            CORBA::Policy_out,
+            TAO::Objref_Traits<CORBA::Policy>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+};
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:1403
 
 class TAO_CORBA_Policy_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable
 {
@@ -67,7 +175,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_CORBA_Policy_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_CORBA_Policy_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_Policy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -136,19 +244,19 @@ TAO_CORBA_Policy_Perfect_Hash_OpTable::lookup (const char *str, unsigned int len
 
   static const class TAO_operation_db_entry  wordlist[] =
     {
-      {"",0},{"",0},{"",0},{"",0},
-      {"copy",  &POA_CORBA::Policy::copy_skel},
-      {"_is_a",  &POA_CORBA::Policy::_is_a_skel},
-      {"",0},
-      {"destroy",       &POA_CORBA::Policy::destroy_skel},
-      {"",0},{"",0},
-      {"_component",  &POA_CORBA::Policy::_component_skel},
-      {"",0},{"",0},
-      {"_non_existent",  &POA_CORBA::Policy::_non_existent_skel},
-      {"",0},
-      {"_interface",  &POA_CORBA::Policy::_interface_skel},
-      {"",0},{"",0},{"",0},{"",0},{"",0},
-      {"_get_policy_type",      &POA_CORBA::Policy::_get_policy_type_skel},
+      {"",0,0,0},{"",0,0,0},{"",0,0,0},{"",0,0,0},
+      {"copy", &POA_CORBA::Policy::copy_skel, &POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::copy, &POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy},
+      {"_is_a", &POA_CORBA::Policy::_is_a_skel, 0, 0},
+      {"",0,0,0},
+      {"destroy", &POA_CORBA::Policy::destroy_skel, &POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::destroy, &POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy},
+      {"",0,0,0},{"",0,0,0},
+      {"_component", &POA_CORBA::Policy::_component_skel, 0, 0},
+      {"",0,0,0},{"",0,0,0},
+      {"_non_existent", &POA_CORBA::Policy::_non_existent_skel, 0, 0},
+      {"",0,0,0},
+      {"_interface", &POA_CORBA::Policy::_interface_skel, 0, 0},
+      {"",0,0,0},{"",0,0,0},{"",0,0,0},{"",0,0,0},{"",0,0,0},
+      {"_get_policy_type", &POA_CORBA::Policy::_get_policy_type_skel, &POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::_get_policy_type, &POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_get_policy_type},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -184,46 +292,47 @@ public:
       POA_CORBA::Policy *tao_impl
       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::PolicyType result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Policy_policy_type_get (
       const TAO_ServerRequestInfo_CORBA_Policy_policy_type_get &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_Policy_policy_type_get &
     );
-
+  
 private:
   POA_CORBA::Policy *_tao_impl;
+  
   CORBA::PolicyType _result;
 };
 
@@ -250,7 +359,7 @@ TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -264,11 +373,11 @@ TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -279,11 +388,11 @@ TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::result (
   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 ();
 }
 
@@ -307,7 +416,7 @@ TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::target_is_a (
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::result (CORBA::PolicyType result)
 {
   // Update the result.
@@ -326,46 +435,47 @@ public:
       POA_CORBA::Policy *tao_impl
       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::Policy_ptr result);
 
 private:
   TAO_ServerRequestInfo_CORBA_Policy_copy (
       const TAO_ServerRequestInfo_CORBA_Policy_copy &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_Policy_copy &
     );
-
+  
 private:
   POA_CORBA::Policy *_tao_impl;
+  
   ::CORBA::Policy_ptr _result;
 };
 
@@ -392,7 +502,7 @@ TAO_ServerRequestInfo_CORBA_Policy_copy::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -406,11 +516,11 @@ TAO_ServerRequestInfo_CORBA_Policy_copy::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_Policy_copy::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -421,11 +531,11 @@ TAO_ServerRequestInfo_CORBA_Policy_copy::result (
   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 ();
 }
 
@@ -449,7 +559,7 @@ TAO_ServerRequestInfo_CORBA_Policy_copy::target_is_a (
   return this->_tao_impl->_is_a (id ACE_ENV_ARG_PARAMETER);
 }
 
-void
+void 
 TAO_ServerRequestInfo_CORBA_Policy_copy::result (::CORBA::Policy_ptr result)
 {
   // Update the result.
@@ -468,45 +578,45 @@ public:
       POA_CORBA::Policy *tao_impl
       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_CORBA_Policy_destroy (
       const TAO_ServerRequestInfo_CORBA_Policy_destroy &
     );
-
+  
   void operator= (
       const TAO_ServerRequestInfo_CORBA_Policy_destroy &
     );
-
+  
 private:
   POA_CORBA::Policy *_tao_impl;
-
+  
 };
 
 // TAO_IDL - Generated from
@@ -532,7 +642,7 @@ TAO_ServerRequestInfo_CORBA_Policy_destroy::arguments (
   Dynamic::ParameterList *parameter_list =
     TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return parameter_list;
 }
 
@@ -546,11 +656,11 @@ TAO_ServerRequestInfo_CORBA_Policy_destroy::exceptions (
   Dynamic::ExceptionList *exception_list =
     TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return exception_list;
 }
 
-CORBA::Any *
+CORBA::Any * 
 TAO_ServerRequestInfo_CORBA_Policy_destroy::result (
     ACE_ENV_SINGLE_ARG_DECL
   )
@@ -561,7 +671,7 @@ TAO_ServerRequestInfo_CORBA_Policy_destroy::result (
   CORBA::Any *result_any =
     TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-
+  
   return result_any;
 }
 
@@ -595,7 +705,8 @@ TAO_ServerRequestInfo_CORBA_Policy_destroy::target_is_a (
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_ss.cpp:40
 
 // Factory function Implementation.
-POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker *POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::the_TAO_Policy_Strategized_Proxy_Broker (void)
+POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker *
+POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::the_TAO_Policy_Strategized_Proxy_Broker (void)
 {
   static POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker strategized_proxy_broker;
   return &strategized_proxy_broker;
@@ -603,86 +714,73 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker *POA_CORBA::_TAO_Policy_Strategi
 
 POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::_TAO_Policy_Strategized_Proxy_Broker (void)
 {
-  for (int i = 0; i < TAO_Collocation_Strategies::CS_LAST; ++i)
-    {
-      this->proxy_cache_[i] = 0;
-    }
 }
 
 POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::~_TAO_Policy_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;
-    }
 }
 
-CORBA::_TAO_Policy_Proxy_Impl&
-POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA::Policy *object
+TAO::Collocation_Strategy
+POA_CORBA::_TAO_Policy_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_new (obj ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
+  
+  return strategy;
 }
 
 void
-POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::create_proxy (
-    int strategy
+POA_CORBA::_TAO_Policy_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)
+  TAO_Collocated_Skeleton collocated_skel;
+  
+  if (obj->_servant ()->_find (op,
+        collocated_skel,
+        strategy,
+        op_len) == -1)
+    ACE_THROW (CORBA::BAD_OPERATION ());
+  
+  ACE_TRY
     {
-      switch (strategy)
-        {
-        case TAO_Collocation_Strategies::CS_THRU_POA_STRATEGY:
-          ACE_NEW_THROW_EX (
-              this->proxy_cache_[strategy],
-              POA_CORBA::_TAO_Policy_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_CORBA::_TAO_Policy_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],
-              ::CORBA::_TAO_Policy_Remote_Proxy_Impl,
-              CORBA::NO_MEMORY ()
-          );
-          ACE_CHECK;
-          break;
-        }
+      collocated_skel (
+        obj,
+        forward_obj,
+        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;
 }
 
 //
@@ -690,26 +788,32 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::create_proxy (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:598
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:603
 
-CORBA::_TAO_Policy_Proxy_Broker *
-CORBA__TAO_Policy_Proxy_Broker_Factory_function (CORBA::Object_ptr obj)
+TAO::Collocation_Proxy_Broker *
+CORBA__TAO_Policy_Proxy_Broker_Factory_function (CORBA::Object_ptr)
 {
-  ACE_UNUSED_ARG (obj);
-  return ::POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::the_TAO_Policy_Strategized_Proxy_Broker();
+  return
+    ::POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::the_TAO_Policy_Strategized_Proxy_Broker();
 }
 
 int
 CORBA__TAO_Policy_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer =
+  CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer = 
     CORBA__TAO_Policy_Proxy_Broker_Factory_function;
-
+  
   return 0;
 }
 
-static int CORBA__TAO_Policy_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
-  CORBA__TAO_Policy_Proxy_Broker_Factory_Initializer (ACE_reinterpret_cast (size_t, CORBA__TAO_Policy_Proxy_Broker_Factory_Initializer));
+static int
+CORBA__TAO_Policy_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
+  CORBA__TAO_Policy_Proxy_Broker_Factory_Initializer (
+      ACE_reinterpret_cast (
+          size_t,
+          CORBA__TAO_Policy_Proxy_Broker_Factory_Initializer
+        )
+    );
 
 
 ///////////////////////////////////////////////////////////////////////
@@ -724,129 +828,141 @@ POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::_TAO_Policy_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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
-CORBA::PolicyType POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::policy_type (
-    CORBA::Object *_collocated_tao_target_
+void
+POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::_get_policy_type (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out forward,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  CORBA::PolicyType _tao_retval = 0;
-  ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-  CORBA::Object_var forward_to;
+  
   servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
-      "policy_type",
-      forward_to.out ()
+      obj->_stubobj ()->object_key (),
+      "_get_policy_type",
+      forward
       ACE_ENV_ARG_PARAMETER
     );
-  ACE_CHECK_RETURN (_tao_retval);
-
+  ACE_CHECK;
+  
   servant_upcall.pre_invoke_collocated_request (
       ACE_ENV_SINGLE_ARG_PARAMETER
     );
-  ACE_CHECK_RETURN (_tao_retval);
-
-  return ACE_reinterpret_cast (
-      POA_CORBA::Policy_ptr,
-      servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Policy:1.0"
-        )
-    )->policy_type (
-
-        ACE_ENV_SINGLE_ARG_PARAMETER
-      );
+  ACE_CHECK;
+  
+  ((TAO::Arg_Traits<CORBA::PolicyType>::ret_val *) args[0])->arg () =
+    ACE_reinterpret_cast (
+        POA_CORBA::Policy_ptr,
+        servant_upcall.servant ()->_downcast (
+            "IDL:omg.org/CORBA/Policy:1.0"
+          )
+      )->policy_type (
+          ACE_ENV_SINGLE_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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
-::CORBA::Policy_ptr POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::copy (
-    CORBA::Object *_collocated_tao_target_
+void
+POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::copy (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out forward,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-  ::CORBA::Policy_var _tao_retval;
-  ACE_UNUSED_ARG (_tao_retval);
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-  CORBA::Object_var forward_to;
+  
   servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
+      obj->_stubobj ()->object_key (),
       "copy",
-      forward_to.out ()
+      forward
       ACE_ENV_ARG_PARAMETER
     );
-  ACE_CHECK_RETURN (_tao_retval._retn ());
-
+  ACE_CHECK;
+  
   servant_upcall.pre_invoke_collocated_request (
       ACE_ENV_SINGLE_ARG_PARAMETER
     );
-  ACE_CHECK_RETURN (_tao_retval._retn ());
-
-  return ACE_reinterpret_cast (
-      POA_CORBA::Policy_ptr,
-      servant_upcall.servant ()->_downcast (
-          "IDL:omg.org/CORBA/Policy:1.0"
-        )
-    )->copy (
-
-        ACE_ENV_SINGLE_ARG_PARAMETER
-      );
+  ACE_CHECK;
+  
+  ((TAO::Arg_Traits<CORBA::Policy>::ret_val *) args[0])->arg () =
+    ACE_reinterpret_cast (
+        POA_CORBA::Policy_ptr,
+        servant_upcall.servant ()->_downcast (
+            "IDL:omg.org/CORBA/Policy:1.0"
+          )
+      )->copy (
+          ACE_ENV_SINGLE_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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/thru_poa_proxy_impl_ss.cpp:52
 
-void POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::destroy (
-    CORBA::Object *_collocated_tao_target_
+void
+POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::destroy (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out forward,
+    TAO::Argument **,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
-
   TAO_Object_Adapter::Servant_Upcall servant_upcall (
-      _collocated_tao_target_->_stubobj ()->servant_orb_var ()->orb_core ()
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
-  CORBA::Object_var forward_to;
+  
   servant_upcall.prepare_for_upcall (
-      _collocated_tao_target_->_stubobj ()->object_key (),
+      obj->_stubobj ()->object_key (),
       "destroy",
-      forward_to.out ()
+      forward
       ACE_ENV_ARG_PARAMETER
     );
   ACE_CHECK;
-
+  
   servant_upcall.pre_invoke_collocated_request (
       ACE_ENV_SINGLE_ARG_PARAMETER
     );
   ACE_CHECK;
-
+  
   ACE_reinterpret_cast (
       POA_CORBA::Policy_ptr,
       servant_upcall.servant ()->_downcast (
           "IDL:omg.org/CORBA/Policy:1.0"
         )
     )->destroy (
-
         ACE_ENV_SINGLE_ARG_PARAMETER
       );
-}//
+  ACE_CHECK;
+}
+
+//
 //           End ThruPOA Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
+
 ///////////////////////////////////////////////////////////////////////
 //                 Direct Proxy  Implementation
 //
@@ -854,64 +970,99 @@ void POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::destroy (
 POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_TAO_Policy_Direct_Proxy_Impl (void)
 {}
 
-CORBA::PolicyType POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::policy_type  (
-    CORBA::Object *_collocated_tao_target_
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
+
+void
+POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_get_policy_type (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
-  )){
-  return ACE_reinterpret_cast (
-      POA_CORBA::Policy_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0")
-    )->policy_type (
-
+  ))
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  
+  ((TAO::Arg_Traits<CORBA::PolicyType>::ret_val *) args[0])->arg () =
+    ACE_reinterpret_cast (
+        POA_CORBA::Policy_ptr,
+        servant_upcall.servant ()->_downcast (
+            "IDL:omg.org/CORBA/Policy:1.0"
+          )
+      )->policy_type (
           ACE_ENV_SINGLE_ARG_PARAMETER
         );
+  ACE_CHECK;
+}// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
-}
-
-::CORBA::Policy_ptr POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy  (
-    CORBA::Object *_collocated_tao_target_
+void
+POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out,
+    TAO::Argument ** args,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
-  )){
-  return ACE_reinterpret_cast (
-      POA_CORBA::Policy_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0")
-    )->copy (
-
+  ))
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  
+  ((TAO::Arg_Traits<CORBA::Policy>::ret_val *) args[0])->arg () =
+    ACE_reinterpret_cast (
+        POA_CORBA::Policy_ptr,
+        servant_upcall.servant ()->_downcast (
+            "IDL:omg.org/CORBA/Policy:1.0"
+          )
+      )->copy (
           ACE_ENV_SINGLE_ARG_PARAMETER
         );
+  ACE_CHECK;
+}// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
-}
-
-void POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy  (
-    CORBA::Object *_collocated_tao_target_
+void
+POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy (
+    CORBA::Object_ptr obj,
+    CORBA::Object_out,
+    TAO::Argument **,
+    int 
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
-  )){
+  ))
+{
+  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+      obj->_stubobj ()->servant_orb_var ()->orb_core ()
+    );
+  
   ACE_reinterpret_cast (
       POA_CORBA::Policy_ptr,
-      _collocated_tao_target_->_servant ()->_downcast ("IDL:omg.org/CORBA/Policy:1.0")
+      servant_upcall.servant ()->_downcast (
+          "IDL:omg.org/CORBA/Policy:1.0"
+        )
     )->destroy (
-
-          ACE_ENV_SINGLE_ARG_PARAMETER
-        );
-
+        ACE_ENV_SINGLE_ARG_PARAMETER
+      );
+  ACE_CHECK;
 }
 
-
 //
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:98
 
 POA_CORBA::Policy::Policy (void)
@@ -922,14 +1073,15 @@ POA_CORBA::Policy::Policy (void)
 POA_CORBA::Policy::Policy (const Policy& rhs)
   : TAO_Abstract_ServantBase (rhs),
     TAO_ServantBase (rhs)
-{}
+{
+}
 
 POA_CORBA::Policy::~Policy (void)
 {
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:100
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Policy::_get_policy_type_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -948,44 +1100,44 @@ void POA_CORBA::Policy::_get_policy_type_skel (
 #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_CORBA_Policy_policy_type_get _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
       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->policy_type (
-
+                
                 ACE_ENV_SINGLE_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
-
+            
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           CORBA::PolicyType _tao_retval_info = _tao_retval;
@@ -1003,59 +1155,64 @@ void POA_CORBA::Policy::_get_policy_type_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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Policy::copy_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -1074,44 +1231,44 @@ void POA_CORBA::Policy::copy_skel (
 #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_CORBA_Policy_copy _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
       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->copy (
-
+                
                 ACE_ENV_SINGLE_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
-
+            
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           ::CORBA::Policy_ptr _tao_retval_info = _tao_retval._retn ();
@@ -1130,59 +1287,64 @@ void POA_CORBA::Policy::copy_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.in ())
-    ))
-    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 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ss.cpp:98
 
 void POA_CORBA::Policy::destroy_skel (
     TAO_ServerRequest &_tao_server_request,
@@ -1197,49 +1359,49 @@ void POA_CORBA::Policy::destroy_skel (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
-
+  
 
 #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_CORBA_Policy_destroy _tao_ri (
       _tao_server_request,
       _tao_upcall,
       _tao_impl
       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->destroy (
-
+                
                 ACE_ENV_SINGLE_ARG_PARAMETER
               );
             TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
-
+            
           }
       }
-
+      
       if (!_tao_vfr.location_forwarded ())
         {
           _tao_ri.reply_status (PortableInterceptor::SUCCESSFUL);
@@ -1255,55 +1417,55 @@ void POA_CORBA::Policy::destroy_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_interface/interface_ss.cpp:163
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:165
 
 void POA_CORBA::Policy::_is_a_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -1313,22 +1475,22 @@ void POA_CORBA::Policy::_is_a_skel (
   POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *) _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_CORBA::Policy::_non_existent_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -1338,16 +1500,16 @@ void POA_CORBA::Policy::_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_CORBA::Policy::_interface_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_servant,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -1356,27 +1518,27 @@ void POA_CORBA::Policy::_interface_skel (
   POA_CORBA::Policy *_tao_impl = (POA_CORBA::Policy *) _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,
@@ -1388,7 +1550,7 @@ void POA_CORBA::Policy::_interface_skel (
       _tao_adapter->dispose (_tao_retval);
     }
   ACE_ENDTRY;
-
+  
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -1396,7 +1558,7 @@ void POA_CORBA::Policy::_interface_skel (
 }
 
 void POA_CORBA::Policy::_component_skel (
-    TAO_ServerRequest &_tao_server_request,
+    TAO_ServerRequest &_tao_server_request, 
     void * _tao_object_reference,
     void * /* Servant_Upcall */
     ACE_ENV_ARG_DECL
@@ -1406,10 +1568,10 @@ void POA_CORBA::Policy::_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 ());
 }
@@ -1447,13 +1609,13 @@ void* POA_CORBA::Policy::_downcast (
     {
       return ACE_static_cast (POA_CORBA::Policy_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;
 }
 
@@ -1463,7 +1625,7 @@ const char* POA_CORBA::Policy::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:532
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:539
 
 void POA_CORBA::Policy::_dispatch (
     TAO_ServerRequest &req,
@@ -1478,17 +1640,17 @@ void POA_CORBA::Policy::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:478
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ss.cpp:479
 
 CORBA::Policy *
 POA_CORBA::Policy::_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 (
@@ -1513,9 +1675,78 @@ POA_CORBA::Policy::_this (ACE_ENV_SINGLE_ARG_DECL)
           0
         );
     }
-
+  
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  return ::CORBA::Policy::_unchecked_narrow (obj.in ());
+  typedef ::CORBA::Policy STUB_SCOPED_NAME;
+  return
+    TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
+        obj.in (),
+        CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer
+      );
 }
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1740
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Ret_Object_SArgument_T<
+        CORBA::Policy_ptr,
+        CORBA::Policy_var
+      >;
+
+  template class
+    TAO::Ret_Var_Size_SArgument_T<
+        CORBA::sequence,
+        CORBA::sequence_var
+      >;
+
+  template class
+    TAO::In_Var_Size_SArgument_T<
+        CORBA::sequence
+      >;
+
+  template class
+    TAO::In_Var_Size_SArgument_T<
+        CORBA::sequence
+      >;
+
+  template class
+    TAO::In_Basic_SArgument_T<
+        CORBA::SetOverrideType
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Ret_Object_SArgument_T< \
+        CORBA::Policy_ptr, \
+        CORBA::Policy_var \
+      >
+
+# pragma instantiate \
+    TAO::Ret_Var_Size_SArgument_T< \
+        CORBA::sequence, \
+        CORBA::sequence_var \
+      >
+
+# pragma instantiate \
+    TAO::In_Var_Size_SArgument_T< \
+        CORBA::sequence \
+      >
+
+# pragma instantiate \
+    TAO::In_Var_Size_SArgument_T< \
+        CORBA::sequence \
+      >
+
+# pragma instantiate \
+    TAO::In_Basic_SArgument_T< \
+        CORBA::SetOverrideType \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
 #endif /* ifndef */
diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h
index ac490226e11..97b34e25de1 100644
--- a/TAO/tao/PortableServer/PolicyS.h
+++ b/TAO/tao/PortableServer/PolicyS.h
@@ -15,23 +15,30 @@
 //       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:443
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_POLICYS_H_
 #define _TAO_IDL_ORIG_POLICYS_H_
 
 #include /**/ "ace/pre.h"
-#include "tao/PolicyC.h"
+#include "PolicyC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Collocation_Proxy_Broker.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/PortableServer/Servant_Base.h"
 #include "tao/PortableServer/Collocated_Object.h"
@@ -52,10 +59,12 @@
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:49
 
-TAO_NAMESPACE  POA_CORBA
+namespace POA_CORBA
 {
+  
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:86
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_sh.cpp:87
   
   class Policy;
   typedef Policy *Policy_ptr;
@@ -71,6 +80,11 @@ TAO_NAMESPACE  POA_CORBA
     Policy (void);
   
   public:
+    // Useful for template programming.
+    typedef ::CORBA::Policy _stub_type;
+    typedef ::CORBA::Policy_ptr _stub_ptr_type;
+    typedef ::CORBA::Policy_var _stub_var_type;
+    
     Policy (const Policy& rhs);
     virtual ~Policy (void);
     
@@ -173,115 +187,127 @@ TAO_NAMESPACE  POA_CORBA
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-  };  
+  };
   
   ///////////////////////////////////////////////////////////////////////
   //               Strategized Proxy Broker Declaration 
   //
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:39
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/strategized_proxy_broker_sh.cpp:37
   
-  class TAO_PortableServer_Export _TAO_Policy_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_Policy_Proxy_Broker
+  class TAO_PortableServer_Export _TAO_Policy_Strategized_Proxy_Broker
+    : public virtual TAO::Collocation_Proxy_Broker
   {
   public: 
     _TAO_Policy_Strategized_Proxy_Broker (void);
     
     virtual ~_TAO_Policy_Strategized_Proxy_Broker (void);
     
-    virtual ::CORBA::_TAO_Policy_Proxy_Impl &select_proxy (
-      ::CORBA::Policy *object
-      ACE_ENV_ARG_DECL
-    );
-  
-  private:
-    // Helper methods that takes care to create the proxy
-    // as soon as their use is necessary.
-    void create_proxy (
-      int collocation_strategy
-      ACE_ENV_ARG_DECL
-    );
-    
-    // Caches the proxy implementations. The proxy implementation
-    // are totally stateless, and those can be shared by all the
-    // instances of a given IDL interface type.
-    ::CORBA::_TAO_Policy_Proxy_Impl
-    *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
+    TAO::Collocation_Strategy
+    get_strategy (
+        CORBA::Object_ptr obj
+        ACE_ENV_ARG_DECL
+      )
+      ACE_THROW_SPEC ((CORBA::SystemException));
     
-    TAO_SYNCH_MUTEX mutex_;
-    // This funxtion is used to get an handle to the unique instance
-    // of the Strategized Proxy Broker that is available for a given
-    // interface.
+    void
+    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));
   
-  public:
-    static _TAO_Policy_Strategized_Proxy_Broker *the_TAO_Policy_Strategized_Proxy_Broker (void);
-  };
+  static
+  _TAO_Policy_Strategized_Proxy_Broker *
+  the_TAO_Policy_Strategized_Proxy_Broker (void);
+};
+
+//
+//            End Strategized Proxy Broker Declaration 
+///////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////
+//                    ThruPOA Proxy Impl. Declaration
+//
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+
+class TAO_PortableServer_Export _TAO_Policy_ThruPOA_Proxy_Impl
+  : public virtual TAO_ThruPOA_Object_Proxy_Impl
+{
+public:
+  _TAO_Policy_ThruPOA_Proxy_Impl (void);
   
-  //
-  //            End Strategized Proxy Broker Declaration 
-  ///////////////////////////////////////////////////////////////////////
+  virtual ~_TAO_Policy_ThruPOA_Proxy_Impl (void) {}
   
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  ///////////////////////////////////////////////////////////////////////
-  //                    ThruPOA  Impl. Declaration
-  //
+  static void
+  _get_policy_type (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
   
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  class TAO_PortableServer_Export _TAO_Policy_ThruPOA_Proxy_Impl : 
-    public virtual ::CORBA::_TAO_Policy_Proxy_Impl,
-    public virtual TAO_ThruPOA_Object_Proxy_Impl
-  {
-  public:
-    _TAO_Policy_ThruPOA_Proxy_Impl (void);
-    
-    virtual ~_TAO_Policy_ThruPOA_Proxy_Impl (void) {}
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    virtual CORBA::PolicyType policy_type (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    virtual ::CORBA::Policy_ptr copy (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
-    virtual void destroy (
-        CORBA::Object *_collocated_tao_target_
-        ACE_ENV_ARG_DECL
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
+  static void
+  copy (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
   
-  //
-  //                ThruPOA  Proxy Impl. Declaration
-  ///////////////////////////////////////////////////////////////////////
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
+  
+  static void
+  destroy (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
+};
+
+//
+//                ThruPOA  Proxy Impl. Declaration
+///////////////////////////////////////////////////////////////////////
+
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/direct_proxy_impl_sh.cpp:31
+
 ///////////////////////////////////////////////////////////////////////
 //                    Direct  Impl. Declaration
 //
 
-class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl : 
-  public virtual CORBA::_TAO_Policy_Proxy_Impl,
-  public virtual TAO_Direct_Object_Proxy_Impl
+class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl
+  : public virtual TAO_Direct_Object_Proxy_Impl
 {
 public:
   _TAO_Policy_Direct_Proxy_Impl (void);
@@ -291,8 +317,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual CORBA::PolicyType policy_type (
-      CORBA::Object *_collocated_tao_target_
+  static void
+  _get_policy_type (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -302,8 +332,12 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual ::CORBA::Policy_ptr copy (
-      CORBA::Object *_collocated_tao_target_
+  static void
+  copy (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
@@ -313,14 +347,18 @@ public:
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/proxy_impl_xh.cpp:24
   
-  virtual void destroy (
-      CORBA::Object *_collocated_tao_target_
+  static void
+  destroy (
+      CORBA::Object_ptr obj,
+      CORBA::Object_out obj_forward,
+      TAO::Argument ** args,
+      int num_args
       ACE_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
-    ));};
-
+    ));
+};
 
 //
 //                Direct  Proxy Impl. Declaration
@@ -331,11 +369,10 @@ public:
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:80
 
-}
-TAO_NAMESPACE_CLOSE // module CORBA
+} // module CORBA
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1044
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1004
 
 #include "PolicyS_T.h"
 
diff --git a/TAO/tao/PortableServer/PolicyS.i b/TAO/tao/PortableServer/PolicyS.i
index e86a7e25a26..1d2df31bd57 100644
--- a/TAO/tao/PortableServer/PolicyS.i
+++ b/TAO/tao/PortableServer/PolicyS.i
@@ -15,8 +15,12 @@
 //       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
-
-
diff --git a/TAO/tao/PortableServer/PolicyS_T.cpp b/TAO/tao/PortableServer/PolicyS_T.cpp
index 12fd2e6c3b9..4cb76e23430 100644
--- a/TAO/tao/PortableServer/PolicyS_T.cpp
+++ b/TAO/tao/PortableServer/PolicyS_T.cpp
@@ -15,12 +15,18 @@
 //       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:777
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:737
 
 #ifndef _TAO_IDL_ORIG_POLICYS_T_CPP_
 #define _TAO_IDL_ORIG_POLICYS_T_CPP_
diff --git a/TAO/tao/PortableServer/PolicyS_T.h b/TAO/tao/PortableServer/PolicyS_T.h
index 37580bfc1af..55be4d879ea 100644
--- a/TAO/tao/PortableServer/PolicyS_T.h
+++ b/TAO/tao/PortableServer/PolicyS_T.h
@@ -15,12 +15,18 @@
 //       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:604
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:553
 
 #ifndef _TAO_IDL_ORIG_POLICYS_T_H_
 #define _TAO_IDL_ORIG_POLICYS_T_H_
@@ -39,7 +45,7 @@
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_sth.cpp:116
 
 #if defined (ACE_HAS_USING_KEYWORD)
-TAO_NAMESPACE  POA_CORBA
+namespace POA_CORBA
 {
   
   // TAO_IDL - Generated from
@@ -121,12 +127,11 @@ TAO_NAMESPACE  POA_CORBA
     Policy_tie (const Policy_tie &);
     void operator= (const Policy_tie &);
   };
-}
-TAO_NAMESPACE_CLOSE // module CORBA
+} // module CORBA
 #endif /* ACE_HAS_USING_KEYWORD */
 
 // TAO_IDL - Generated from 
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1141
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1101
 
 #if defined (__ACE_INLINE__)
 #include "PolicyS_T.i"
diff --git a/TAO/tao/PortableServer/PolicyS_T.i b/TAO/tao/PortableServer/PolicyS_T.i
index d404b061c43..c548a1c3fc6 100644
--- a/TAO/tao/PortableServer/PolicyS_T.i
+++ b/TAO/tao/PortableServer/PolicyS_T.i
@@ -15,6 +15,12 @@
 //       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
diff --git a/TAO/tao/PortableServer/PortableServer.pidl b/TAO/tao/PortableServer/PortableServer.pidl
index ae4beae8a7a..740dd3c1200 100644
--- a/TAO/tao/PortableServer/PortableServer.pidl
+++ b/TAO/tao/PortableServer/PortableServer.pidl
@@ -9,9 +9,9 @@
  * PortableServerC.{h,i,cpp}, using the following command:
  *
  * tao_idl.exe \
- *     -o orig -Gp -Gd -Ge 1
+ *     -o orig -Gp -Gd -Ge 1 -GT
  *          -Wb,export_macro=TAO_PortableServer_Export \
- *          -Wb,export_include="tao/corbafwd.h" \
+ *          -Wb,export_include="portableserver_export.h" \
  *          -Wb,pre_include="ace/pre.h" \
  *          -Wb,post_include="ace/post.h" \
  *          PortableServer.pidl
diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp
index db11d3a4fe8..be9d9bf3757 100644
--- a/TAO/tao/PortableServer/PortableServerC.cpp
+++ b/TAO/tao/PortableServer/PortableServerC.cpp
@@ -15,26 +15,34 @@
 //       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:314
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:301
 
 
 #include "PortableServerC.h"
 #include "tao/Stub.h"
-#include "tao/Invocation.h"
-#include "tao/PortableInterceptor.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
-#include "tao/ClientRequestInfo_i.h"
-#include "tao/ClientInterceptorAdapter.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-#include "POA.h"
+#include "tao/Invocation_Adapter.h"
+#include "tao/Object_T.h"
+#include "tao/Any_Impl_T.h"
+#include "tao/Any_Dual_Impl_T.h"
+#include "tao/Any_Basic_Impl_T.h"
+#include "tao/Basic_Arguments.h"
+#include "tao/Object_Argument_T.h"
+#include "tao/Special_Basic_Arguments.h"
+#include "tao/UB_String_Arguments.h"
+#include "tao/Var_Size_Argument_T.h"
+
+#include "tao/PortableServer/POA.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -44,6 +52,451 @@
 #include "PortableServerC.i"
 #endif /* !defined INLINE */
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:59
+
+// Arg traits specializations.
+namespace TAO
+{
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:262
+
+#if !defined (__TAO_SEQ_CORBA_POLICY___ARG_TRAITS_CS_)
+#define __TAO_SEQ_CORBA_POLICY___ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<CORBA::PolicyList>
+    : public
+        Var_Size_Arg_Traits_T<
+            CORBA::PolicyList,
+            CORBA::PolicyList_var,
+            CORBA::PolicyList_out
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:262
+
+#if !defined (__TAO_SEQ_CORBA_OCTET___ARG_TRAITS_CS_)
+#define __TAO_SEQ_CORBA_OCTET___ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<CORBA::OctetSeq>
+    : public
+        Var_Size_Arg_Traits_T<
+            CORBA::OctetSeq,
+            CORBA::OctetSeq_var,
+            CORBA::OctetSeq_out
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_PORTABLESERVER_POA__ARG_TRAITS_CS_)
+#define _PORTABLESERVER_POA__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<PortableServer::POA>
+    : public
+        Object_Arg_Traits_T<
+            PortableServer::POA_ptr,
+            PortableServer::POA_var,
+            PortableServer::POA_out,
+            TAO::Objref_Traits<PortableServer::POA>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:262
+
+#if !defined (__TAO_SEQ_PORTABLESERVER_POA___ARG_TRAITS_CS_)
+#define __TAO_SEQ_PORTABLESERVER_POA___ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<PortableServer::POAList>
+    : public
+        Var_Size_Arg_Traits_T<
+            PortableServer::POAList,
+            PortableServer::POAList_var,
+            PortableServer::POAList_out
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:262
+
+#if !defined (__TAO_SEQ_CORBA_OCTET___ARG_TRAITS_CS_)
+#define __TAO_SEQ_CORBA_OCTET___ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<PortableServer::ObjectId>
+    : public
+        Var_Size_Arg_Traits_T<
+            PortableServer::ObjectId,
+            PortableServer::ObjectId_var,
+            PortableServer::ObjectId_out
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:262
+
+#if !defined (__TAO_SEQ_PORTABLESERVER_OBJECTID___ARG_TRAITS_CS_)
+#define __TAO_SEQ_PORTABLESERVER_OBJECTID___ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<PortableServer::IDs>
+    : public
+        Var_Size_Arg_Traits_T<
+            PortableServer::IDs,
+            PortableServer::IDs_var,
+            PortableServer::IDs_out
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:390
+
+#if !defined (_PORTABLESERVER_THREADPOLICYVALUE__ARG_TRAITS_CS_)
+#define _PORTABLESERVER_THREADPOLICYVALUE__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<PortableServer::ThreadPolicyValue>
+    : public
+        Basic_Arg_Traits_T<
+            PortableServer::ThreadPolicyValue
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_PORTABLESERVER_THREADPOLICY__ARG_TRAITS_CS_)
+#define _PORTABLESERVER_THREADPOLICY__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<PortableServer::ThreadPolicy>
+    : public
+        Object_Arg_Traits_T<
+            PortableServer::ThreadPolicy_ptr,
+            PortableServer::ThreadPolicy_var,
+            PortableServer::ThreadPolicy_out,
+            TAO::Objref_Traits<PortableServer::ThreadPolicy>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:390
+
+#if !defined (_PORTABLESERVER_LIFESPANPOLICYVALUE__ARG_TRAITS_CS_)
+#define _PORTABLESERVER_LIFESPANPOLICYVALUE__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<PortableServer::LifespanPolicyValue>
+    : public
+        Basic_Arg_Traits_T<
+            PortableServer::LifespanPolicyValue
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_PORTABLESERVER_LIFESPANPOLICY__ARG_TRAITS_CS_)
+#define _PORTABLESERVER_LIFESPANPOLICY__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<PortableServer::LifespanPolicy>
+    : public
+        Object_Arg_Traits_T<
+            PortableServer::LifespanPolicy_ptr,
+            PortableServer::LifespanPolicy_var,
+            PortableServer::LifespanPolicy_out,
+            TAO::Objref_Traits<PortableServer::LifespanPolicy>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:390
+
+#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICYVALUE__ARG_TRAITS_CS_)
+#define _PORTABLESERVER_IDUNIQUENESSPOLICYVALUE__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<PortableServer::IdUniquenessPolicyValue>
+    : public
+        Basic_Arg_Traits_T<
+            PortableServer::IdUniquenessPolicyValue
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY__ARG_TRAITS_CS_)
+#define _PORTABLESERVER_IDUNIQUENESSPOLICY__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<PortableServer::IdUniquenessPolicy>
+    : public
+        Object_Arg_Traits_T<
+            PortableServer::IdUniquenessPolicy_ptr,
+            PortableServer::IdUniquenessPolicy_var,
+            PortableServer::IdUniquenessPolicy_out,
+            TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:390
+
+#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICYVALUE__ARG_TRAITS_CS_)
+#define _PORTABLESERVER_IDASSIGNMENTPOLICYVALUE__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<PortableServer::IdAssignmentPolicyValue>
+    : public
+        Basic_Arg_Traits_T<
+            PortableServer::IdAssignmentPolicyValue
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY__ARG_TRAITS_CS_)
+#define _PORTABLESERVER_IDASSIGNMENTPOLICY__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<PortableServer::IdAssignmentPolicy>
+    : public
+        Object_Arg_Traits_T<
+            PortableServer::IdAssignmentPolicy_ptr,
+            PortableServer::IdAssignmentPolicy_var,
+            PortableServer::IdAssignmentPolicy_out,
+            TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:390
+
+#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICYVALUE__ARG_TRAITS_CS_)
+#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICYVALUE__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<PortableServer::ImplicitActivationPolicyValue>
+    : public
+        Basic_Arg_Traits_T<
+            PortableServer::ImplicitActivationPolicyValue
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY__ARG_TRAITS_CS_)
+#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<PortableServer::ImplicitActivationPolicy>
+    : public
+        Object_Arg_Traits_T<
+            PortableServer::ImplicitActivationPolicy_ptr,
+            PortableServer::ImplicitActivationPolicy_var,
+            PortableServer::ImplicitActivationPolicy_out,
+            TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:390
+
+#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICYVALUE__ARG_TRAITS_CS_)
+#define _PORTABLESERVER_SERVANTRETENTIONPOLICYVALUE__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<PortableServer::ServantRetentionPolicyValue>
+    : public
+        Basic_Arg_Traits_T<
+            PortableServer::ServantRetentionPolicyValue
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY__ARG_TRAITS_CS_)
+#define _PORTABLESERVER_SERVANTRETENTIONPOLICY__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<PortableServer::ServantRetentionPolicy>
+    : public
+        Object_Arg_Traits_T<
+            PortableServer::ServantRetentionPolicy_ptr,
+            PortableServer::ServantRetentionPolicy_var,
+            PortableServer::ServantRetentionPolicy_out,
+            TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:390
+
+#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICYVALUE__ARG_TRAITS_CS_)
+#define _PORTABLESERVER_REQUESTPROCESSINGPOLICYVALUE__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<PortableServer::RequestProcessingPolicyValue>
+    : public
+        Basic_Arg_Traits_T<
+            PortableServer::RequestProcessingPolicyValue
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY__ARG_TRAITS_CS_)
+#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<PortableServer::RequestProcessingPolicy>
+    : public
+        Object_Arg_Traits_T<
+            PortableServer::RequestProcessingPolicy_ptr,
+            PortableServer::RequestProcessingPolicy_var,
+            PortableServer::RequestProcessingPolicy_out,
+            TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_PORTABLESERVER_POAMANAGER__ARG_TRAITS_CS_)
+#define _PORTABLESERVER_POAMANAGER__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<PortableServer::POAManager>
+    : public
+        Object_Arg_Traits_T<
+            PortableServer::POAManager_ptr,
+            PortableServer::POAManager_var,
+            PortableServer::POAManager_out,
+            TAO::Objref_Traits<PortableServer::POAManager>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_arg_traits.cpp:390
+
+#if !defined (_PORTABLESERVER_POAMANAGER_STATE__ARG_TRAITS_CS_)
+#define _PORTABLESERVER_POAMANAGER_STATE__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<PortableServer::POAManager::State>
+    : public
+        Basic_Arg_Traits_T<
+            PortableServer::POAManager::State
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_)
+#define _PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<PortableServer::AdapterActivator>
+    : public
+        Object_Arg_Traits_T<
+            PortableServer::AdapterActivator_ptr,
+            PortableServer::AdapterActivator_var,
+            PortableServer::AdapterActivator_out,
+            TAO::Objref_Traits<PortableServer::AdapterActivator>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_PORTABLESERVER_SERVANTMANAGER__ARG_TRAITS_CS_)
+#define _PORTABLESERVER_SERVANTMANAGER__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<PortableServer::ServantManager>
+    : public
+        Object_Arg_Traits_T<
+            PortableServer::ServantManager_ptr,
+            PortableServer::ServantManager_var,
+            PortableServer::ServantManager_out,
+            TAO::Objref_Traits<PortableServer::ServantManager>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_PORTABLESERVER_POA__ARG_TRAITS_CS_)
+#define _PORTABLESERVER_POA__ARG_TRAITS_CS_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  class TAO_PortableServer_Export Arg_Traits<PortableServer::POA>
+    : public
+        Object_Arg_Traits_T<
+            PortableServer::POA_ptr,
+            PortableServer::POA_var,
+            PortableServer::POA_out,
+            TAO::Objref_Traits<PortableServer::POA>
+          >
+  {
+  };
+
+#endif /* end #if !defined */
+};
+
+// Hand crafted.
+
 char *
 PortableServer::ObjectId_to_string (const PortableServer::ObjectId &id)
 {
@@ -68,13 +521,18 @@ PortableServer::wstring_to_ObjectId (const CORBA::WChar *id)
   return TAO_POA::wstring_to_ObjectId (id);
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66
+
+#if !defined (_PORTABLESERVER_POALIST_CS_)
+#define _PORTABLESERVER_POALIST_CS_
 
 PortableServer::POAList::POAList (void)
 {}
 
-PortableServer::POAList::POAList (CORBA::ULong max)
+PortableServer::POAList::POAList (
+    CORBA::ULong max
+  )
   : TAO_Unbounded_Object_Sequence<
         PortableServer::POA,
         PortableServer::POA_var
@@ -85,7 +543,7 @@ PortableServer::POAList::POAList (CORBA::ULong max)
 PortableServer::POAList::POAList (
     CORBA::ULong max,
     CORBA::ULong length,
-    PortableServer::POA_ptr* buffer,
+    PortableServer::POA_ptr * buffer,
     CORBA::Boolean release
   )
   : TAO_Unbounded_Object_Sequence<
@@ -95,7 +553,9 @@ PortableServer::POAList::POAList (
     (max, length, buffer, release)
 {}
 
-PortableServer::POAList::POAList (const POAList &seq)
+PortableServer::POAList::POAList (
+    const POAList &seq
+  )
   : TAO_Unbounded_Object_Sequence<
         PortableServer::POA,
         PortableServer::POA_var
@@ -106,306 +566,251 @@ PortableServer::POAList::POAList (const POAList &seq)
 PortableServer::POAList::~POAList (void)
 {}
 
-void PortableServer::POAList::_tao_any_destructor (void *_tao_void_pointer)
+void PortableServer::POAList::_tao_any_destructor (
+    void * _tao_void_pointer
+  )
 {
-  POAList *tmp = ACE_static_cast (POAList*, _tao_void_pointer);
-  delete tmp;
+  POAList * _tao_tmp_pointer =
+    ACE_static_cast (POAList *, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+#endif /* end #if !defined */
 
-template class
-  TAO_MngSeq_Var_T<
-      PortableServer::POAList,
-      TAO_Object_Manager<
-          PortableServer::POA,
-          PortableServer::POA_var
-        >
-    >;
-
-template class
-  TAO_MngSeq_Out_T<
-      PortableServer::POAList,
-      PortableServer::POAList_var,
-      TAO_Object_Manager<
-          PortableServer::POA,
-          PortableServer::POA_var,
-          PortableServer::tao_POA_life
-        >
-    >;
-
-template class TAO_Unbounded_Object_Sequence<PortableServer::POA,
-                                             TAO_Objref_Var_T<PortableServer::POA, PortableServer::tao_POA_life>,
-                                             PortableServer::tao_POA_life,
-                                             PortableServer::tao_POA_cast>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate \
-    TAO_MngSeq_Var_T< \
-        PortableServer::POAList, \
-        TAO_Object_Manager< \
-            PortableServer::POA, \
-            PortableServer::POA_var, \
-            PortableServer::tao_POA_life \
-          > \
-      >
-
-# pragma instantiate TAO_Unbounded_Object_Sequence<PortableServer::POA,
-      TAO_Objref_Var_T<PortableServer::POA, PortableServer::tao_POA_life>,
-      PortableServer::tao_POA_life, PortableServer::tao_POA_cast>
-
-# pragma instantiate \
-    TAO_Seq_Out_T< \
-        PortableServer::POAList, \
-        PortableServer::POAList_var, \
-        TAO_Object_Manager< \
-            PortableServer::POA, \
-            PortableServer::POA_var, \
-            PortableServer::tao_POA_life \
-          > \
-      >
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-  static const CORBA::Long _oc_PortableServer_POAList[] =
-  {
-        TAO_ENCAP_BYTE_ORDER, // byte order
-    39,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x506f7274),
-    ACE_NTOHL (0x61626c65),
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x65722f50),
-    ACE_NTOHL (0x4f414c69),
-    ACE_NTOHL (0x73743a32),
-    ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POAList:2.3
-        8,
-    ACE_NTOHL (0x504f414c),
-    ACE_NTOHL (0x69737400),  // name = POAList
-        CORBA::tk_sequence, // typecode kind
-    68, // encapsulation length
+static const CORBA::Long _oc_PortableServer_POAList[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  39,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f50), 
+  ACE_NTOHL (0x4f414c69), 
+  ACE_NTOHL (0x73743a32), 
+  ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POAList:2.3
+    8,
+  ACE_NTOHL (0x504f414c), 
+  ACE_NTOHL (0x69737400),  // name = POAList
+    CORBA::tk_sequence, // typecode kind
+  68, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_objref, // typecode kind
+    52, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      CORBA::tk_objref, // typecode kind
-      52, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        35,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x506f7274),
-        ACE_NTOHL (0x61626c65),
-        ACE_NTOHL (0x53657276),
-        ACE_NTOHL (0x65722f50),
-        ACE_NTOHL (0x4f413a32),
-        ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA:2.3
-                4,
-        ACE_NTOHL (0x504f4100),  // name = POA
-
-      0U,
+      35,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x506f7274), 
+      ACE_NTOHL (0x61626c65), 
+      ACE_NTOHL (0x53657276), 
+      ACE_NTOHL (0x65722f50), 
+      ACE_NTOHL (0x4f413a32), 
+      ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA:2.3
+            4,
+      ACE_NTOHL (0x504f4100),  // name = POA
+      
+    0U,
 
 };
 
-  static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAList (
-      CORBA::tk_alias,
-      sizeof (_oc_PortableServer_POAList),
-      (char *) &_oc_PortableServer_POAList,
-      0,
-      sizeof (PortableServer::POAList)
-    );
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAList (
+    CORBA::tk_alias,
+    sizeof (_oc_PortableServer_POAList),
+    (char *) &_oc_PortableServer_POAList,
+    0,
+    sizeof (PortableServer::POAList)
+  );
 
-  TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-  TAO_NAMESPACE_BEGIN (PortableServer)
-  TAO_NAMESPACE_DEFINE (
-      ::CORBA::TypeCode_ptr,
-      _tc_POAList,
-      &_tc_TAO_tc_PortableServer_POAList
-    )
-  TAO_NAMESPACE_END
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_POAList =
+    &_tc_TAO_tc_PortableServer_POAList;
+}
 
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-  static const CORBA::Long _oc_PortableServer_ObjectId[] =
-  {
-        TAO_ENCAP_BYTE_ORDER, // byte order
-    40,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x506f7274),
-    ACE_NTOHL (0x61626c65),
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x65722f4f),
-    ACE_NTOHL (0x626a6563),
-    ACE_NTOHL (0x7449643a),
-    ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/ObjectId:2.3
+static const CORBA::Long _oc_PortableServer_ObjectId[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  40,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f4f), 
+  ACE_NTOHL (0x626a6563), 
+  ACE_NTOHL (0x7449643a), 
+  ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/ObjectId:2.3
+    9,
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63744964), 
+  ACE_NTOHL (0x0),  // name = ObjectId
+    CORBA::tk_alias, // typecode kind for typedefs
+  76, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    31,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4f63), 
+    ACE_NTOHL (0x74657453), 
+    ACE_NTOHL (0x65713a31), 
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
         9,
-    ACE_NTOHL (0x4f626a65),
-    ACE_NTOHL (0x63744964),
-    ACE_NTOHL (0x0),  // name = ObjectId
-        CORBA::tk_alias, // typecode kind for typedefs
-    76, // encapsulation length
+    ACE_NTOHL (0x4f637465), 
+    ACE_NTOHL (0x74536571), 
+    ACE_NTOHL (0x0),  // name = OctetSeq
+        CORBA::tk_sequence, // typecode kind
+    12, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
-      31,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x434f5242),
-      ACE_NTOHL (0x412f4f63),
-      ACE_NTOHL (0x74657453),
-      ACE_NTOHL (0x65713a31),
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
-            9,
-      ACE_NTOHL (0x4f637465),
-      ACE_NTOHL (0x74536571),
-      ACE_NTOHL (0x0),  // name = OctetSeq
-            CORBA::tk_sequence, // typecode kind
-      12, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        CORBA::tk_octet,
+      CORBA::tk_octet,
 
-        0U,
+      0U,
 
 
 };
 
-  static CORBA::TypeCode _tc_TAO_tc_PortableServer_ObjectId (
-      CORBA::tk_alias,
-      sizeof (_oc_PortableServer_ObjectId),
-      (char *) &_oc_PortableServer_ObjectId,
-      0,
-      sizeof (PortableServer::ObjectId)
-    );
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ObjectId (
+    CORBA::tk_alias,
+    sizeof (_oc_PortableServer_ObjectId),
+    (char *) &_oc_PortableServer_ObjectId,
+    0,
+    sizeof (PortableServer::ObjectId)
+  );
 
-  TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-  TAO_NAMESPACE_BEGIN (PortableServer)
-  TAO_NAMESPACE_DEFINE (
-      ::CORBA::TypeCode_ptr,
-      _tc_ObjectId,
-      &_tc_TAO_tc_PortableServer_ObjectId
-    )
-  TAO_NAMESPACE_END
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_ObjectId =
+    &_tc_TAO_tc_PortableServer_ObjectId;
+}
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
-  PortableServer::ForwardRequest::ForwardRequest (void)
-    : CORBA::UserException (
-          "IDL:omg.org/PortableServer/ForwardRequest:2.3",
-          "ForwardRequest"
-        )
-  {
-  }
+PortableServer::ForwardRequest::ForwardRequest (void)
+  : CORBA::UserException (
+        "IDL:omg.org/PortableServer/ForwardRequest:2.3",
+        "ForwardRequest"
+      )
+{
+}
 
-  PortableServer::ForwardRequest::~ForwardRequest (void)
-  {
-  }
+PortableServer::ForwardRequest::~ForwardRequest (void)
+{
+}
 
-  PortableServer::ForwardRequest::ForwardRequest (const ::PortableServer::ForwardRequest &_tao_excp)
-    : CORBA::UserException (
-          _tao_excp._rep_id (),
-          _tao_excp._name ()
-        )
-  {
-    this->forward_reference = CORBA::Object::_duplicate (_tao_excp.forward_reference.in ());
-  }
+PortableServer::ForwardRequest::ForwardRequest (const ::PortableServer::ForwardRequest &_tao_excp)
+  : CORBA::UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
+{
+  this->forward_reference = CORBA::Object::_duplicate (_tao_excp.forward_reference.in ());
+}
 
-  PortableServer::ForwardRequest&
-  PortableServer::ForwardRequest::operator= (const ::PortableServer::ForwardRequest &_tao_excp)
-  {
-    this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-    this->forward_reference = CORBA::Object::_duplicate (_tao_excp.forward_reference.in ());
-    return *this;
-  }
+PortableServer::ForwardRequest&
+PortableServer::ForwardRequest::operator= (const ::PortableServer::ForwardRequest &_tao_excp)
+{
+  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->forward_reference = CORBA::Object::_duplicate (_tao_excp.forward_reference.in ());
+  return *this;
+}
 
-  void PortableServer::ForwardRequest::_tao_any_destructor (void *_tao_void_pointer)
-  {
-    ForwardRequest *tmp = ACE_static_cast (ForwardRequest*, _tao_void_pointer);
-    delete tmp;
-  }
+void PortableServer::ForwardRequest::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ForwardRequest *_tao_tmp_pointer =
+    ACE_static_cast (ForwardRequest*, _tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
 
-  PortableServer::ForwardRequest *
-  PortableServer::ForwardRequest::_downcast (CORBA::Exception *_tao_excp)
-  {
-    if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/ForwardRequest:2.3", _tao_excp->_rep_id ()))
-      {
-        return ACE_dynamic_cast (ForwardRequest *, _tao_excp);
-      }
-    else
-      {
-        return 0;
-      }
-  }
-
-  CORBA::Exception *PortableServer::ForwardRequest::_alloc (void)
-  {
-    CORBA::Exception *retval = 0;
-    ACE_NEW_RETURN (retval, ::PortableServer::ForwardRequest, 0);
-    return retval;
-  }
+PortableServer::ForwardRequest *
+PortableServer::ForwardRequest::_downcast (CORBA::Exception *_tao_excp)
+{
+  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/ForwardRequest:2.3", _tao_excp->_rep_id ()))
+    {
+      return ACE_dynamic_cast (ForwardRequest *, _tao_excp);
+    }
+  else
+    {
+      return 0;
+    }
+}
 
-  CORBA::Exception *
-  PortableServer::ForwardRequest::_tao_duplicate (void) const
-  {
-    CORBA::Exception *result;
-    ACE_NEW_RETURN (
-        result,
-        ::PortableServer::ForwardRequest (*this),
-        0
-      );
-    return result;
-  }
+CORBA::Exception *PortableServer::ForwardRequest::_alloc (void)
+{
+  CORBA::Exception *retval = 0;
+  ACE_NEW_RETURN (retval, ::PortableServer::ForwardRequest, 0);
+  return retval;
+}
 
-  void PortableServer::ForwardRequest::_raise (void)
-  {
-    TAO_RAISE (*this);
-  }
+CORBA::Exception *
+PortableServer::ForwardRequest::_tao_duplicate (void) const
+{
+  CORBA::Exception *result;
+  ACE_NEW_RETURN (
+      result,
+      ::PortableServer::ForwardRequest (*this),
+      0
+    );
+  return result;
+}
 
-  void PortableServer::ForwardRequest::_tao_encode (
-      TAO_OutputCDR &cdr
-      ACE_ENV_ARG_DECL
-    ) const
-  {
-    if (cdr << *this)
-      {
-        return;
-      }
-
-    ACE_THROW (CORBA::MARSHAL ());
-  }
-
-  void PortableServer::ForwardRequest::_tao_decode (
-      TAO_InputCDR &cdr
-      ACE_ENV_ARG_DECL
-    )
-  {
-    if (cdr >> *this)
-      {
-        return;
-      }
+void PortableServer::ForwardRequest::_raise (void)
+{
+  TAO_RAISE (*this);
+}
 
-    ACE_THROW (CORBA::MARSHAL ());
-  }
+void PortableServer::ForwardRequest::_tao_encode (
+    TAO_OutputCDR &cdr
+    ACE_ENV_ARG_DECL
+  ) const
+{
+  if (cdr << *this)
+    {
+      return;
+    }
+  
+  ACE_THROW (CORBA::MARSHAL ());
+}
 
+void PortableServer::ForwardRequest::_tao_decode (
+    TAO_InputCDR &cdr
+    ACE_ENV_ARG_DECL
+  )
+{
+  if (cdr >> *this)
+    {
+      return;
+    }
+  
+  ACE_THROW (CORBA::MARSHAL ());
+}
 
 
-  // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
 
-  PortableServer::ForwardRequest::ForwardRequest (
-      const CORBA::Object_ptr  _tao_forward_reference
-    )  : CORBA::UserException (
-          "IDL:omg.org/PortableServer/ForwardRequest:2.3",
-          "ForwardRequest"
-        )
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
+
+PortableServer::ForwardRequest::ForwardRequest (
+    const CORBA::Object_ptr  _tao_forward_reference
+  )
+  : CORBA::UserException (
+        "IDL:omg.org/PortableServer/ForwardRequest:2.3",
+        "ForwardRequest"
+      )
 {
   this->forward_reference = CORBA::Object::_duplicate (_tao_forward_reference);
 }
@@ -423,46 +828,46 @@ static const CORBA::Long _oc_PortableServer_ForwardRequest[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f46),
-  ACE_NTOHL (0x6f727761),
-  ACE_NTOHL (0x72645265),
-  ACE_NTOHL (0x71756573),
-  ACE_NTOHL (0x743a322e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f46), 
+  ACE_NTOHL (0x6f727761), 
+  ACE_NTOHL (0x72645265), 
+  ACE_NTOHL (0x71756573), 
+  ACE_NTOHL (0x743a322e), 
   ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/ForwardRequest:2.3
     15,
-  ACE_NTOHL (0x466f7277),
-  ACE_NTOHL (0x61726452),
-  ACE_NTOHL (0x65717565),
+  ACE_NTOHL (0x466f7277), 
+  ACE_NTOHL (0x61726452), 
+  ACE_NTOHL (0x65717565), 
   ACE_NTOHL (0x73740000),  // name = ForwardRequest
   1, // member count
     18,
-  ACE_NTOHL (0x666f7277),
-  ACE_NTOHL (0x6172645f),
-  ACE_NTOHL (0x72656665),
-  ACE_NTOHL (0x72656e63),
+  ACE_NTOHL (0x666f7277), 
+  ACE_NTOHL (0x6172645f), 
+  ACE_NTOHL (0x72656665), 
+  ACE_NTOHL (0x72656e63), 
   ACE_NTOHL (0x65000000),  // name = forward_reference
     CORBA::tk_objref,
   52, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     29,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x434f5242),
-    ACE_NTOHL (0x412f4f62),
-    ACE_NTOHL (0x6a656374),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x434f5242), 
+    ACE_NTOHL (0x412f4f62), 
+    ACE_NTOHL (0x6a656374), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Object:1.0
         7,
-    ACE_NTOHL (0x4f626a65),
+    ACE_NTOHL (0x4f626a65), 
     ACE_NTOHL (0x63740000),  // name = Object
-
+    
 };
 
 static CORBA::TypeCode _tc_TAO_tc_PortableServer_ForwardRequest (
@@ -473,20 +878,17 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ForwardRequest (
     sizeof (PortableServer::ForwardRequest)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ForwardRequest,
-    &_tc_TAO_tc_PortableServer_ForwardRequest
-  )
-TAO_NAMESPACE_END
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_ForwardRequest =
+    &_tc_TAO_tc_PortableServer_ForwardRequest;
+}
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::NotAGroupObject::NotAGroupObject (void)
@@ -518,8 +920,9 @@ PortableServer::NotAGroupObject::operator= (const ::PortableServer::NotAGroupObj
 
 void PortableServer::NotAGroupObject::_tao_any_destructor (void *_tao_void_pointer)
 {
-  NotAGroupObject *tmp = ACE_static_cast (NotAGroupObject*, _tao_void_pointer);
-  delete tmp;
+  NotAGroupObject *_tao_tmp_pointer =
+    ACE_static_cast (NotAGroupObject*, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
 PortableServer::NotAGroupObject *
@@ -568,7 +971,7 @@ void PortableServer::NotAGroupObject::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -581,7 +984,7 @@ void PortableServer::NotAGroupObject::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -598,22 +1001,22 @@ static const CORBA::Long _oc_PortableServer_NotAGroupObject[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   47,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f4e),
-  ACE_NTOHL (0x6f744147),
-  ACE_NTOHL (0x726f7570),
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63743a32),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f4e), 
+  ACE_NTOHL (0x6f744147), 
+  ACE_NTOHL (0x726f7570), 
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63743a32), 
   ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/NotAGroupObject:2.3
     16,
-  ACE_NTOHL (0x4e6f7441),
-  ACE_NTOHL (0x47726f75),
-  ACE_NTOHL (0x704f626a),
+  ACE_NTOHL (0x4e6f7441), 
+  ACE_NTOHL (0x47726f75), 
+  ACE_NTOHL (0x704f626a), 
   ACE_NTOHL (0x65637400),  // name = NotAGroupObject
   0, // member count
   };
@@ -626,22 +1029,24 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_NotAGroupObject (
     sizeof (PortableServer::NotAGroupObject)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_NotAGroupObject,
-    &_tc_TAO_tc_PortableServer_NotAGroupObject
-  )
-TAO_NAMESPACE_END
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_NotAGroupObject =
+    &_tc_TAO_tc_PortableServer_NotAGroupObject;
+}
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:49
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_cs.cpp:66
+
+#if !defined (_PORTABLESERVER_IDS_CS_)
+#define _PORTABLESERVER_IDS_CS_
 
 PortableServer::IDs::IDs (void)
 {}
 
-PortableServer::IDs::IDs (CORBA::ULong max)
+PortableServer::IDs::IDs (
+    CORBA::ULong max
+  )
   : TAO_Unbounded_Sequence<
         PortableServer::ObjectId
       >
@@ -651,7 +1056,7 @@ PortableServer::IDs::IDs (CORBA::ULong max)
 PortableServer::IDs::IDs (
     CORBA::ULong max,
     CORBA::ULong length,
-    PortableServer::ObjectId* buffer,
+    PortableServer::ObjectId * buffer,
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
@@ -660,7 +1065,9 @@ PortableServer::IDs::IDs (
     (max, length, buffer, release)
 {}
 
-PortableServer::IDs::IDs (const IDs &seq)
+PortableServer::IDs::IDs (
+    const IDs &seq
+  )
   : TAO_Unbounded_Sequence<
         PortableServer::ObjectId
       >
@@ -670,52 +1077,16 @@ PortableServer::IDs::IDs (const IDs &seq)
 PortableServer::IDs::~IDs (void)
 {}
 
-void PortableServer::IDs::_tao_any_destructor (void *_tao_void_pointer)
+void PortableServer::IDs::_tao_any_destructor (
+    void * _tao_void_pointer
+  )
 {
-  IDs *tmp = ACE_static_cast (IDs*, _tao_void_pointer);
-  delete tmp;
+  IDs * _tao_tmp_pointer =
+    ACE_static_cast (IDs *, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class
-  TAO_VarSeq_Var_T<
-      PortableServer::IDs,
-      PortableServer::ObjectId
-    >;
-
-template class TAO_Seq_Var_Base_T<PortableServer::IDs,
-                                  PortableServer::ObjectId>;
-
-template class TAO_Unbounded_Sequence<CORBA::OctetSeq>;
-
-template class
-  TAO_Seq_Out_T<
-      PortableServer::IDs,
-      PortableServer::IDs_var,
-      PortableServer::ObjectId
-    >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate \
-  TAO_VarSeq_Var_T< \
-      PortableServer::IDs, \
-      PortableServer::ObjectId \
-    >
-# pragma instantiate TAO_Seq_Var_Base_T<PortableServer::IDs,
-      PortableServer::ObjectId>
-
-# pragms instantiate TAO_Unbounded_Sequence<CORBA::OctetSeq>
-
-# pragma instantiate \
-  TAO_Seq_Out_T< \
-      PortableServer::IDs, \
-      PortableServer::IDs_var, \
-      PortableServer::ObjectId \
-    >
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* end #if !defined */
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -724,14 +1095,14 @@ static const CORBA::Long _oc_PortableServer_IDs[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f49),
-  ACE_NTOHL (0x44733a32),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f49), 
+  ACE_NTOHL (0x44733a32), 
   ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/IDs:2.3
     4,
   ACE_NTOHL (0x49447300),  // name = IDs
@@ -742,35 +1113,35 @@ static const CORBA::Long _oc_PortableServer_IDs[] =
     148, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       40,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x506f7274),
-      ACE_NTOHL (0x61626c65),
-      ACE_NTOHL (0x53657276),
-      ACE_NTOHL (0x65722f4f),
-      ACE_NTOHL (0x626a6563),
-      ACE_NTOHL (0x7449643a),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x506f7274), 
+      ACE_NTOHL (0x61626c65), 
+      ACE_NTOHL (0x53657276), 
+      ACE_NTOHL (0x65722f4f), 
+      ACE_NTOHL (0x626a6563), 
+      ACE_NTOHL (0x7449643a), 
       ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/ObjectId:2.3
             9,
-      ACE_NTOHL (0x4f626a65),
-      ACE_NTOHL (0x63744964),
+      ACE_NTOHL (0x4f626a65), 
+      ACE_NTOHL (0x63744964), 
       ACE_NTOHL (0x0),  // name = ObjectId
             CORBA::tk_alias, // typecode kind for typedefs
       76, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         31,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x434f5242),
-        ACE_NTOHL (0x412f4f63),
-        ACE_NTOHL (0x74657453),
-        ACE_NTOHL (0x65713a31),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x434f5242), 
+        ACE_NTOHL (0x412f4f63), 
+        ACE_NTOHL (0x74657453), 
+        ACE_NTOHL (0x65713a31), 
         ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OctetSeq:1.0
                 9,
-        ACE_NTOHL (0x4f637465),
-        ACE_NTOHL (0x74536571),
+        ACE_NTOHL (0x4f637465), 
+        ACE_NTOHL (0x74536571), 
         ACE_NTOHL (0x0),  // name = OctetSeq
                 CORBA::tk_sequence, // typecode kind
         12, // encapsulation length
@@ -793,18 +1164,11 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_IDs (
     sizeof (PortableServer::IDs)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_IDs,
-    &_tc_TAO_tc_PortableServer_IDs
-  )
-TAO_NAMESPACE_END
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_IDs =
+    &_tc_TAO_tc_PortableServer_IDs;
+}
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -813,36 +1177,36 @@ static const CORBA::Long _oc_PortableServer_ThreadPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   49,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f54),
-  ACE_NTOHL (0x68726561),
-  ACE_NTOHL (0x64506f6c),
-  ACE_NTOHL (0x69637956),
-  ACE_NTOHL (0x616c7565),
-  ACE_NTOHL (0x3a322e33),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f54), 
+  ACE_NTOHL (0x68726561), 
+  ACE_NTOHL (0x64506f6c), 
+  ACE_NTOHL (0x69637956), 
+  ACE_NTOHL (0x616c7565), 
+  ACE_NTOHL (0x3a322e33), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/ThreadPolicyValue:2.3
   18,
-  ACE_NTOHL (0x54687265),
-  ACE_NTOHL (0x6164506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x56616c75),
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x56616c75), 
   ACE_NTOHL (0x65000000),  // name = ThreadPolicyValue
   2, // member count
   15,
-  ACE_NTOHL (0x4f52425f),
-  ACE_NTOHL (0x4354524c),
-  ACE_NTOHL (0x5f4d4f44),
+  ACE_NTOHL (0x4f52425f), 
+  ACE_NTOHL (0x4354524c), 
+  ACE_NTOHL (0x5f4d4f44), 
   ACE_NTOHL (0x454c0000),  // name = ORB_CTRL_MODEL
   20,
-  ACE_NTOHL (0x53494e47),
-  ACE_NTOHL (0x4c455f54),
-  ACE_NTOHL (0x48524541),
-  ACE_NTOHL (0x445f4d4f),
+  ACE_NTOHL (0x53494e47), 
+  ACE_NTOHL (0x4c455f54), 
+  ACE_NTOHL (0x48524541), 
+  ACE_NTOHL (0x445f4d4f), 
   ACE_NTOHL (0x44454c00),  // name = SINGLE_THREAD_MODEL
   };
 
@@ -854,46 +1218,53 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ThreadPolicyValue (
     sizeof (PortableServer::ThreadPolicyValue)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ThreadPolicyValue,
-    &_tc_TAO_tc_PortableServer_ThreadPolicyValue
-  )
-TAO_NAMESPACE_END
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_ThreadPolicyValue =
+    &_tc_TAO_tc_PortableServer_ThreadPolicyValue;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-int PortableServer::ThreadPolicy::_tao_class_id = 0;
+// Traits specializations for PortableServer::ThreadPolicy.
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        PortableServer::ThreadPolicy,
-        PortableServer::tao_ThreadPolicy_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        PortableServer::ThreadPolicy,
-        PortableServer::tao_ThreadPolicy_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableServer::ThreadPolicy, \
-        PortableServer::tao_ThreadPolicy_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableServer::ThreadPolicy, \
-        PortableServer::tao_ThreadPolicy_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+PortableServer::ThreadPolicy_ptr
+TAO::Objref_Traits<PortableServer::ThreadPolicy>::tao_duplicate (
+    PortableServer::ThreadPolicy_ptr p
+  )
+{
+  return PortableServer::ThreadPolicy::_duplicate (p);
+}
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+void
+TAO::Objref_Traits<PortableServer::ThreadPolicy>::tao_release (
+    PortableServer::ThreadPolicy_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+PortableServer::ThreadPolicy_ptr
+TAO::Objref_Traits<PortableServer::ThreadPolicy>::tao_nil (void)
+{
+  return PortableServer::ThreadPolicy::_nil ();
+}
+
+CORBA::Boolean
+TAO::Objref_Traits<PortableServer::ThreadPolicy>::tao_marshal (
+    PortableServer::ThreadPolicy_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker * 
+(*PortableServer__TAO_ThreadPolicy_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 PortableServer::ThreadPolicy::ThreadPolicy (void)
 {}
@@ -901,43 +1272,29 @@ PortableServer::ThreadPolicy::ThreadPolicy (void)
 PortableServer::ThreadPolicy::~ThreadPolicy (void)
 {}
 
-void
+void 
 PortableServer::ThreadPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ThreadPolicy *tmp = ACE_static_cast (ThreadPolicy *, _tao_void_pointer);
-  CORBA::release (tmp);
+  ThreadPolicy *_tao_tmp_pointer =
+    ACE_static_cast (ThreadPolicy *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 PortableServer::ThreadPolicy_ptr
 PortableServer::ThreadPolicy::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ThreadPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-PortableServer::ThreadPolicy_ptr
-PortableServer::ThreadPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
+  if (CORBA::is_nil (_tao_objref))
     {
       return ThreadPolicy::_nil ();
     }
-
-  return
-      ACE_reinterpret_cast (
-          ThreadPolicy_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &ThreadPolicy::_tao_class_id
-                )
-            )
-        );
+  
+  ThreadPolicy_ptr proxy =
+    dynamic_cast<ThreadPolicy_ptr> (_tao_objref);
+  
+  return ThreadPolicy::_duplicate (proxy);
 }
 
 PortableServer::ThreadPolicy_ptr
@@ -947,53 +1304,41 @@ PortableServer::ThreadPolicy::_duplicate (ThreadPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
-void *PortableServer::ThreadPolicy::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+PortableServer::ThreadPolicy::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::PortableServer, ThreadPolicy)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &::CORBA::Policy::_tao_class_id)
-            )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                CORBA::Policy_ptr,
-                this
-              )
-          );
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Policy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/PortableServer/ThreadPolicy:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
+      return 1; // success using local knowledge
     }
-
-  if (retv != 0)
+  else
     {
-      this->_add_ref ();
+      return 0;
     }
-
-  return retv;
 }
 
 const char* PortableServer::ThreadPolicy::_interface_repository_id (void) const
@@ -1014,21 +1359,21 @@ static const CORBA::Long _oc_PortableServer_ThreadPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   44,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f54),
-  ACE_NTOHL (0x68726561),
-  ACE_NTOHL (0x64506f6c),
-  ACE_NTOHL (0x6963793a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f54), 
+  ACE_NTOHL (0x68726561), 
+  ACE_NTOHL (0x64506f6c), 
+  ACE_NTOHL (0x6963793a), 
   ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/ThreadPolicy:2.3
     13,
-  ACE_NTOHL (0x54687265),
-  ACE_NTOHL (0x6164506f),
-  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164506f), 
+  ACE_NTOHL (0x6c696379), 
   ACE_NTOHL (0x0),  // name = ThreadPolicy
   };
 
@@ -1040,14 +1385,11 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ThreadPolicy (
     sizeof (PortableServer::ThreadPolicy)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ThreadPolicy,
-    &_tc_TAO_tc_PortableServer_ThreadPolicy
-  )
-TAO_NAMESPACE_END
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_ThreadPolicy =
+    &_tc_TAO_tc_PortableServer_ThreadPolicy;
+}
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
@@ -1058,33 +1400,33 @@ static const CORBA::Long _oc_PortableServer_LifespanPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   51,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f4c),
-  ACE_NTOHL (0x69666573),
-  ACE_NTOHL (0x70616e50),
-  ACE_NTOHL (0x6f6c6963),
-  ACE_NTOHL (0x7956616c),
-  ACE_NTOHL (0x75653a32),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f4c), 
+  ACE_NTOHL (0x69666573), 
+  ACE_NTOHL (0x70616e50), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x7956616c), 
+  ACE_NTOHL (0x75653a32), 
   ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/LifespanPolicyValue:2.3
   20,
-  ACE_NTOHL (0x4c696665),
-  ACE_NTOHL (0x7370616e),
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63795661),
+  ACE_NTOHL (0x4c696665), 
+  ACE_NTOHL (0x7370616e), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63795661), 
   ACE_NTOHL (0x6c756500),  // name = LifespanPolicyValue
   2, // member count
   10,
-  ACE_NTOHL (0x5452414e),
-  ACE_NTOHL (0x5349454e),
+  ACE_NTOHL (0x5452414e), 
+  ACE_NTOHL (0x5349454e), 
   ACE_NTOHL (0x54000000),  // name = TRANSIENT
   11,
-  ACE_NTOHL (0x50455253),
-  ACE_NTOHL (0x49535445),
+  ACE_NTOHL (0x50455253), 
+  ACE_NTOHL (0x49535445), 
   ACE_NTOHL (0x4e540000),  // name = PERSISTENT
   };
 
@@ -1096,46 +1438,53 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_LifespanPolicyValue (
     sizeof (PortableServer::LifespanPolicyValue)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_LifespanPolicyValue,
-    &_tc_TAO_tc_PortableServer_LifespanPolicyValue
-  )
-TAO_NAMESPACE_END
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_LifespanPolicyValue =
+    &_tc_TAO_tc_PortableServer_LifespanPolicyValue;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-int PortableServer::LifespanPolicy::_tao_class_id = 0;
+// Traits specializations for PortableServer::LifespanPolicy.
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        PortableServer::LifespanPolicy,
-        PortableServer::tao_LifespanPolicy_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        PortableServer::LifespanPolicy,
-        PortableServer::tao_LifespanPolicy_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableServer::LifespanPolicy, \
-        PortableServer::tao_LifespanPolicy_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableServer::LifespanPolicy, \
-        PortableServer::tao_LifespanPolicy_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+PortableServer::LifespanPolicy_ptr
+TAO::Objref_Traits<PortableServer::LifespanPolicy>::tao_duplicate (
+    PortableServer::LifespanPolicy_ptr p
+  )
+{
+  return PortableServer::LifespanPolicy::_duplicate (p);
+}
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+void
+TAO::Objref_Traits<PortableServer::LifespanPolicy>::tao_release (
+    PortableServer::LifespanPolicy_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+PortableServer::LifespanPolicy_ptr
+TAO::Objref_Traits<PortableServer::LifespanPolicy>::tao_nil (void)
+{
+  return PortableServer::LifespanPolicy::_nil ();
+}
+
+CORBA::Boolean
+TAO::Objref_Traits<PortableServer::LifespanPolicy>::tao_marshal (
+    PortableServer::LifespanPolicy_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker * 
+(*PortableServer__TAO_LifespanPolicy_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 PortableServer::LifespanPolicy::LifespanPolicy (void)
 {}
@@ -1143,43 +1492,29 @@ PortableServer::LifespanPolicy::LifespanPolicy (void)
 PortableServer::LifespanPolicy::~LifespanPolicy (void)
 {}
 
-void
+void 
 PortableServer::LifespanPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
-  LifespanPolicy *tmp = ACE_static_cast (LifespanPolicy *, _tao_void_pointer);
-  CORBA::release (tmp);
+  LifespanPolicy *_tao_tmp_pointer =
+    ACE_static_cast (LifespanPolicy *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 PortableServer::LifespanPolicy_ptr
 PortableServer::LifespanPolicy::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return LifespanPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-PortableServer::LifespanPolicy_ptr
-PortableServer::LifespanPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
+  if (CORBA::is_nil (_tao_objref))
     {
       return LifespanPolicy::_nil ();
     }
-
-  return
-      ACE_reinterpret_cast (
-          LifespanPolicy_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &LifespanPolicy::_tao_class_id
-                )
-            )
-        );
+  
+  LifespanPolicy_ptr proxy =
+    dynamic_cast<LifespanPolicy_ptr> (_tao_objref);
+  
+  return LifespanPolicy::_duplicate (proxy);
 }
 
 PortableServer::LifespanPolicy_ptr
@@ -1189,53 +1524,41 @@ PortableServer::LifespanPolicy::_duplicate (LifespanPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
-void *PortableServer::LifespanPolicy::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+PortableServer::LifespanPolicy::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::PortableServer, LifespanPolicy)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &::CORBA::Policy::_tao_class_id)
-            )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                CORBA::Policy_ptr,
-                this
-              )
-          );
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Policy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/PortableServer/LifespanPolicy:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
+      return 1; // success using local knowledge
     }
-
-  if (retv != 0)
+  else
     {
-      this->_add_ref ();
+      return 0;
     }
-
-  return retv;
 }
 
 const char* PortableServer::LifespanPolicy::_interface_repository_id (void) const
@@ -1256,22 +1579,22 @@ static const CORBA::Long _oc_PortableServer_LifespanPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f4c),
-  ACE_NTOHL (0x69666573),
-  ACE_NTOHL (0x70616e50),
-  ACE_NTOHL (0x6f6c6963),
-  ACE_NTOHL (0x793a322e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f4c), 
+  ACE_NTOHL (0x69666573), 
+  ACE_NTOHL (0x70616e50), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x793a322e), 
   ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/LifespanPolicy:2.3
     15,
-  ACE_NTOHL (0x4c696665),
-  ACE_NTOHL (0x7370616e),
-  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x4c696665), 
+  ACE_NTOHL (0x7370616e), 
+  ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63790000),  // name = LifespanPolicy
   };
 
@@ -1283,14 +1606,11 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_LifespanPolicy (
     sizeof (PortableServer::LifespanPolicy)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_LifespanPolicy,
-    &_tc_TAO_tc_PortableServer_LifespanPolicy
-  )
-TAO_NAMESPACE_END
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_LifespanPolicy =
+    &_tc_TAO_tc_PortableServer_LifespanPolicy;
+}
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -1299,35 +1619,35 @@ static const CORBA::Long _oc_PortableServer_IdUniquenessPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   55,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f49),
-  ACE_NTOHL (0x64556e69),
-  ACE_NTOHL (0x7175656e),
-  ACE_NTOHL (0x65737350),
-  ACE_NTOHL (0x6f6c6963),
-  ACE_NTOHL (0x7956616c),
-  ACE_NTOHL (0x75653a32),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f49), 
+  ACE_NTOHL (0x64556e69), 
+  ACE_NTOHL (0x7175656e), 
+  ACE_NTOHL (0x65737350), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x7956616c), 
+  ACE_NTOHL (0x75653a32), 
   ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/IdUniquenessPolicyValue:2.3
   24,
-  ACE_NTOHL (0x4964556e),
-  ACE_NTOHL (0x69717565),
-  ACE_NTOHL (0x6e657373),
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63795661),
+  ACE_NTOHL (0x4964556e), 
+  ACE_NTOHL (0x69717565), 
+  ACE_NTOHL (0x6e657373), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63795661), 
   ACE_NTOHL (0x6c756500),  // name = IdUniquenessPolicyValue
   2, // member count
   10,
-  ACE_NTOHL (0x554e4951),
-  ACE_NTOHL (0x55455f49),
+  ACE_NTOHL (0x554e4951), 
+  ACE_NTOHL (0x55455f49), 
   ACE_NTOHL (0x44000000),  // name = UNIQUE_ID
   12,
-  ACE_NTOHL (0x4d554c54),
-  ACE_NTOHL (0x49504c45),
+  ACE_NTOHL (0x4d554c54), 
+  ACE_NTOHL (0x49504c45), 
   ACE_NTOHL (0x5f494400),  // name = MULTIPLE_ID
   };
 
@@ -1339,46 +1659,53 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdUniquenessPolicyValue (
     sizeof (PortableServer::IdUniquenessPolicyValue)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_IdUniquenessPolicyValue,
-    &_tc_TAO_tc_PortableServer_IdUniquenessPolicyValue
-  )
-TAO_NAMESPACE_END
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_IdUniquenessPolicyValue =
+    &_tc_TAO_tc_PortableServer_IdUniquenessPolicyValue;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-int PortableServer::IdUniquenessPolicy::_tao_class_id = 0;
+// Traits specializations for PortableServer::IdUniquenessPolicy.
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        PortableServer::IdUniquenessPolicy,
-        PortableServer::tao_IdUniquenessPolicy_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        PortableServer::IdUniquenessPolicy,
-        PortableServer::tao_IdUniquenessPolicy_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableServer::IdUniquenessPolicy, \
-        PortableServer::tao_IdUniquenessPolicy_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableServer::IdUniquenessPolicy, \
-        PortableServer::tao_IdUniquenessPolicy_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+PortableServer::IdUniquenessPolicy_ptr
+TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::tao_duplicate (
+    PortableServer::IdUniquenessPolicy_ptr p
+  )
+{
+  return PortableServer::IdUniquenessPolicy::_duplicate (p);
+}
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+void
+TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::tao_release (
+    PortableServer::IdUniquenessPolicy_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+PortableServer::IdUniquenessPolicy_ptr
+TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::tao_nil (void)
+{
+  return PortableServer::IdUniquenessPolicy::_nil ();
+}
+
+CORBA::Boolean
+TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::tao_marshal (
+    PortableServer::IdUniquenessPolicy_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker * 
+(*PortableServer__TAO_IdUniquenessPolicy_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 PortableServer::IdUniquenessPolicy::IdUniquenessPolicy (void)
 {}
@@ -1386,43 +1713,29 @@ PortableServer::IdUniquenessPolicy::IdUniquenessPolicy (void)
 PortableServer::IdUniquenessPolicy::~IdUniquenessPolicy (void)
 {}
 
-void
+void 
 PortableServer::IdUniquenessPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
-  IdUniquenessPolicy *tmp = ACE_static_cast (IdUniquenessPolicy *, _tao_void_pointer);
-  CORBA::release (tmp);
+  IdUniquenessPolicy *_tao_tmp_pointer =
+    ACE_static_cast (IdUniquenessPolicy *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 PortableServer::IdUniquenessPolicy_ptr
 PortableServer::IdUniquenessPolicy::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return IdUniquenessPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-PortableServer::IdUniquenessPolicy_ptr
-PortableServer::IdUniquenessPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
+  if (CORBA::is_nil (_tao_objref))
     {
       return IdUniquenessPolicy::_nil ();
     }
-
-  return
-      ACE_reinterpret_cast (
-          IdUniquenessPolicy_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &IdUniquenessPolicy::_tao_class_id
-                )
-            )
-        );
+  
+  IdUniquenessPolicy_ptr proxy =
+    dynamic_cast<IdUniquenessPolicy_ptr> (_tao_objref);
+  
+  return IdUniquenessPolicy::_duplicate (proxy);
 }
 
 PortableServer::IdUniquenessPolicy_ptr
@@ -1432,53 +1745,41 @@ PortableServer::IdUniquenessPolicy::_duplicate (IdUniquenessPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
-void *PortableServer::IdUniquenessPolicy::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+PortableServer::IdUniquenessPolicy::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::PortableServer, IdUniquenessPolicy)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &::CORBA::Policy::_tao_class_id)
-            )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                CORBA::Policy_ptr,
-                this
-              )
-          );
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Policy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/PortableServer/IdUniquenessPolicy:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
+      return 1; // success using local knowledge
     }
-
-  if (retv != 0)
+  else
     {
-      this->_add_ref ();
+      return 0;
     }
-
-  return retv;
 }
 
 const char* PortableServer::IdUniquenessPolicy::_interface_repository_id (void) const
@@ -1499,24 +1800,24 @@ static const CORBA::Long _oc_PortableServer_IdUniquenessPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   50,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f49),
-  ACE_NTOHL (0x64556e69),
-  ACE_NTOHL (0x7175656e),
-  ACE_NTOHL (0x65737350),
-  ACE_NTOHL (0x6f6c6963),
-  ACE_NTOHL (0x793a322e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f49), 
+  ACE_NTOHL (0x64556e69), 
+  ACE_NTOHL (0x7175656e), 
+  ACE_NTOHL (0x65737350), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x793a322e), 
   ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/IdUniquenessPolicy:2.3
     19,
-  ACE_NTOHL (0x4964556e),
-  ACE_NTOHL (0x69717565),
-  ACE_NTOHL (0x6e657373),
-  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x4964556e), 
+  ACE_NTOHL (0x69717565), 
+  ACE_NTOHL (0x6e657373), 
+  ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63790000),  // name = IdUniquenessPolicy
   };
 
@@ -1528,14 +1829,11 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdUniquenessPolicy (
     sizeof (PortableServer::IdUniquenessPolicy)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_IdUniquenessPolicy,
-    &_tc_TAO_tc_PortableServer_IdUniquenessPolicy
-  )
-TAO_NAMESPACE_END
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_IdUniquenessPolicy =
+    &_tc_TAO_tc_PortableServer_IdUniquenessPolicy;
+}
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -1544,34 +1842,34 @@ static const CORBA::Long _oc_PortableServer_IdAssignmentPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   55,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f49),
-  ACE_NTOHL (0x64417373),
-  ACE_NTOHL (0x69676e6d),
-  ACE_NTOHL (0x656e7450),
-  ACE_NTOHL (0x6f6c6963),
-  ACE_NTOHL (0x7956616c),
-  ACE_NTOHL (0x75653a32),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f49), 
+  ACE_NTOHL (0x64417373), 
+  ACE_NTOHL (0x69676e6d), 
+  ACE_NTOHL (0x656e7450), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x7956616c), 
+  ACE_NTOHL (0x75653a32), 
   ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/IdAssignmentPolicyValue:2.3
   24,
-  ACE_NTOHL (0x49644173),
-  ACE_NTOHL (0x7369676e),
-  ACE_NTOHL (0x6d656e74),
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63795661),
+  ACE_NTOHL (0x49644173), 
+  ACE_NTOHL (0x7369676e), 
+  ACE_NTOHL (0x6d656e74), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63795661), 
   ACE_NTOHL (0x6c756500),  // name = IdAssignmentPolicyValue
   2, // member count
   8,
-  ACE_NTOHL (0x55534552),
+  ACE_NTOHL (0x55534552), 
   ACE_NTOHL (0x5f494400),  // name = USER_ID
   10,
-  ACE_NTOHL (0x53595354),
-  ACE_NTOHL (0x454d5f49),
+  ACE_NTOHL (0x53595354), 
+  ACE_NTOHL (0x454d5f49), 
   ACE_NTOHL (0x44000000),  // name = SYSTEM_ID
   };
 
@@ -1583,46 +1881,53 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdAssignmentPolicyValue (
     sizeof (PortableServer::IdAssignmentPolicyValue)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_IdAssignmentPolicyValue,
-    &_tc_TAO_tc_PortableServer_IdAssignmentPolicyValue
-  )
-TAO_NAMESPACE_END
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_IdAssignmentPolicyValue =
+    &_tc_TAO_tc_PortableServer_IdAssignmentPolicyValue;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-int PortableServer::IdAssignmentPolicy::_tao_class_id = 0;
+// Traits specializations for PortableServer::IdAssignmentPolicy.
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        PortableServer::IdAssignmentPolicy,
-        PortableServer::tao_IdAssignmentPolicy_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        PortableServer::IdAssignmentPolicy,
-        PortableServer::tao_IdAssignmentPolicy_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableServer::IdAssignmentPolicy, \
-        PortableServer::tao_IdAssignmentPolicy_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableServer::IdAssignmentPolicy, \
-        PortableServer::tao_IdAssignmentPolicy_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+PortableServer::IdAssignmentPolicy_ptr
+TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::tao_duplicate (
+    PortableServer::IdAssignmentPolicy_ptr p
+  )
+{
+  return PortableServer::IdAssignmentPolicy::_duplicate (p);
+}
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+void
+TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::tao_release (
+    PortableServer::IdAssignmentPolicy_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+PortableServer::IdAssignmentPolicy_ptr
+TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::tao_nil (void)
+{
+  return PortableServer::IdAssignmentPolicy::_nil ();
+}
+
+CORBA::Boolean
+TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::tao_marshal (
+    PortableServer::IdAssignmentPolicy_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker * 
+(*PortableServer__TAO_IdAssignmentPolicy_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 PortableServer::IdAssignmentPolicy::IdAssignmentPolicy (void)
 {}
@@ -1630,43 +1935,29 @@ PortableServer::IdAssignmentPolicy::IdAssignmentPolicy (void)
 PortableServer::IdAssignmentPolicy::~IdAssignmentPolicy (void)
 {}
 
-void
+void 
 PortableServer::IdAssignmentPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
-  IdAssignmentPolicy *tmp = ACE_static_cast (IdAssignmentPolicy *, _tao_void_pointer);
-  CORBA::release (tmp);
+  IdAssignmentPolicy *_tao_tmp_pointer =
+    ACE_static_cast (IdAssignmentPolicy *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 PortableServer::IdAssignmentPolicy_ptr
 PortableServer::IdAssignmentPolicy::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return IdAssignmentPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-PortableServer::IdAssignmentPolicy_ptr
-PortableServer::IdAssignmentPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
+  if (CORBA::is_nil (_tao_objref))
     {
       return IdAssignmentPolicy::_nil ();
     }
-
-  return
-      ACE_reinterpret_cast (
-          IdAssignmentPolicy_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &IdAssignmentPolicy::_tao_class_id
-                )
-            )
-        );
+  
+  IdAssignmentPolicy_ptr proxy =
+    dynamic_cast<IdAssignmentPolicy_ptr> (_tao_objref);
+  
+  return IdAssignmentPolicy::_duplicate (proxy);
 }
 
 PortableServer::IdAssignmentPolicy_ptr
@@ -1676,53 +1967,41 @@ PortableServer::IdAssignmentPolicy::_duplicate (IdAssignmentPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
-void *PortableServer::IdAssignmentPolicy::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+PortableServer::IdAssignmentPolicy::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::PortableServer, IdAssignmentPolicy)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &::CORBA::Policy::_tao_class_id)
-            )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                CORBA::Policy_ptr,
-                this
-              )
-          );
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Policy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/PortableServer/IdAssignmentPolicy:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
+      return 1; // success using local knowledge
     }
-
-  if (retv != 0)
+  else
     {
-      this->_add_ref ();
+      return 0;
     }
-
-  return retv;
 }
 
 const char* PortableServer::IdAssignmentPolicy::_interface_repository_id (void) const
@@ -1743,24 +2022,24 @@ static const CORBA::Long _oc_PortableServer_IdAssignmentPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   50,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f49),
-  ACE_NTOHL (0x64417373),
-  ACE_NTOHL (0x69676e6d),
-  ACE_NTOHL (0x656e7450),
-  ACE_NTOHL (0x6f6c6963),
-  ACE_NTOHL (0x793a322e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f49), 
+  ACE_NTOHL (0x64417373), 
+  ACE_NTOHL (0x69676e6d), 
+  ACE_NTOHL (0x656e7450), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x793a322e), 
   ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/IdAssignmentPolicy:2.3
     19,
-  ACE_NTOHL (0x49644173),
-  ACE_NTOHL (0x7369676e),
-  ACE_NTOHL (0x6d656e74),
-  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x49644173), 
+  ACE_NTOHL (0x7369676e), 
+  ACE_NTOHL (0x6d656e74), 
+  ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63790000),  // name = IdAssignmentPolicy
   };
 
@@ -1772,14 +2051,11 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdAssignmentPolicy (
     sizeof (PortableServer::IdAssignmentPolicy)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_IdAssignmentPolicy,
-    &_tc_TAO_tc_PortableServer_IdAssignmentPolicy
-  )
-TAO_NAMESPACE_END
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_IdAssignmentPolicy =
+    &_tc_TAO_tc_PortableServer_IdAssignmentPolicy;
+}
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
@@ -1790,44 +2066,44 @@ static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   61,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f49),
-  ACE_NTOHL (0x6d706c69),
-  ACE_NTOHL (0x63697441),
-  ACE_NTOHL (0x63746976),
-  ACE_NTOHL (0x6174696f),
-  ACE_NTOHL (0x6e506f6c),
-  ACE_NTOHL (0x69637956),
-  ACE_NTOHL (0x616c7565),
-  ACE_NTOHL (0x3a322e33),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f49), 
+  ACE_NTOHL (0x6d706c69), 
+  ACE_NTOHL (0x63697441), 
+  ACE_NTOHL (0x63746976), 
+  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6e506f6c), 
+  ACE_NTOHL (0x69637956), 
+  ACE_NTOHL (0x616c7565), 
+  ACE_NTOHL (0x3a322e33), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/ImplicitActivationPolicyValue:2.3
   30,
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x69636974),
-  ACE_NTOHL (0x41637469),
-  ACE_NTOHL (0x76617469),
-  ACE_NTOHL (0x6f6e506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x56616c75),
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x69636974), 
+  ACE_NTOHL (0x41637469), 
+  ACE_NTOHL (0x76617469), 
+  ACE_NTOHL (0x6f6e506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x56616c75), 
   ACE_NTOHL (0x65000000),  // name = ImplicitActivationPolicyValue
   2, // member count
   20,
-  ACE_NTOHL (0x494d504c),
-  ACE_NTOHL (0x49434954),
-  ACE_NTOHL (0x5f414354),
-  ACE_NTOHL (0x49564154),
+  ACE_NTOHL (0x494d504c), 
+  ACE_NTOHL (0x49434954), 
+  ACE_NTOHL (0x5f414354), 
+  ACE_NTOHL (0x49564154), 
   ACE_NTOHL (0x494f4e00),  // name = IMPLICIT_ACTIVATION
   23,
-  ACE_NTOHL (0x4e4f5f49),
-  ACE_NTOHL (0x4d504c49),
-  ACE_NTOHL (0x4349545f),
-  ACE_NTOHL (0x41435449),
-  ACE_NTOHL (0x56415449),
+  ACE_NTOHL (0x4e4f5f49), 
+  ACE_NTOHL (0x4d504c49), 
+  ACE_NTOHL (0x4349545f), 
+  ACE_NTOHL (0x41435449), 
+  ACE_NTOHL (0x56415449), 
   ACE_NTOHL (0x4f4e0000),  // name = NO_IMPLICIT_ACTIVATION
   };
 
@@ -1839,46 +2115,53 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue (
     sizeof (PortableServer::ImplicitActivationPolicyValue)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ImplicitActivationPolicyValue,
-    &_tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue
-  )
-TAO_NAMESPACE_END
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_ImplicitActivationPolicyValue =
+    &_tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-int PortableServer::ImplicitActivationPolicy::_tao_class_id = 0;
+// Traits specializations for PortableServer::ImplicitActivationPolicy.
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        PortableServer::ImplicitActivationPolicy,
-        PortableServer::tao_ImplicitActivationPolicy_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        PortableServer::ImplicitActivationPolicy,
-        PortableServer::tao_ImplicitActivationPolicy_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableServer::ImplicitActivationPolicy, \
-        PortableServer::tao_ImplicitActivationPolicy_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableServer::ImplicitActivationPolicy, \
-        PortableServer::tao_ImplicitActivationPolicy_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+PortableServer::ImplicitActivationPolicy_ptr
+TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::tao_duplicate (
+    PortableServer::ImplicitActivationPolicy_ptr p
+  )
+{
+  return PortableServer::ImplicitActivationPolicy::_duplicate (p);
+}
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+void
+TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::tao_release (
+    PortableServer::ImplicitActivationPolicy_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+PortableServer::ImplicitActivationPolicy_ptr
+TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::tao_nil (void)
+{
+  return PortableServer::ImplicitActivationPolicy::_nil ();
+}
+
+CORBA::Boolean
+TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::tao_marshal (
+    PortableServer::ImplicitActivationPolicy_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker * 
+(*PortableServer__TAO_ImplicitActivationPolicy_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy (void)
 {}
@@ -1886,43 +2169,29 @@ PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy (void)
 PortableServer::ImplicitActivationPolicy::~ImplicitActivationPolicy (void)
 {}
 
-void
+void 
 PortableServer::ImplicitActivationPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ImplicitActivationPolicy *tmp = ACE_static_cast (ImplicitActivationPolicy *, _tao_void_pointer);
-  CORBA::release (tmp);
+  ImplicitActivationPolicy *_tao_tmp_pointer =
+    ACE_static_cast (ImplicitActivationPolicy *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 PortableServer::ImplicitActivationPolicy_ptr
 PortableServer::ImplicitActivationPolicy::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ImplicitActivationPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-PortableServer::ImplicitActivationPolicy_ptr
-PortableServer::ImplicitActivationPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
+  if (CORBA::is_nil (_tao_objref))
     {
       return ImplicitActivationPolicy::_nil ();
     }
-
-  return
-      ACE_reinterpret_cast (
-          ImplicitActivationPolicy_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &ImplicitActivationPolicy::_tao_class_id
-                )
-            )
-        );
+  
+  ImplicitActivationPolicy_ptr proxy =
+    dynamic_cast<ImplicitActivationPolicy_ptr> (_tao_objref);
+  
+  return ImplicitActivationPolicy::_duplicate (proxy);
 }
 
 PortableServer::ImplicitActivationPolicy_ptr
@@ -1932,53 +2201,41 @@ PortableServer::ImplicitActivationPolicy::_duplicate (ImplicitActivationPolicy_p
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
-void *PortableServer::ImplicitActivationPolicy::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+PortableServer::ImplicitActivationPolicy::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::PortableServer, ImplicitActivationPolicy)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &::CORBA::Policy::_tao_class_id)
-            )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                CORBA::Policy_ptr,
-                this
-              )
-          );
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Policy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/PortableServer/ImplicitActivationPolicy:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
+      return 1; // success using local knowledge
     }
-
-  if (retv != 0)
+  else
     {
-      this->_add_ref ();
+      return 0;
     }
-
-  return retv;
 }
 
 const char* PortableServer::ImplicitActivationPolicy::_interface_repository_id (void) const
@@ -1999,27 +2256,27 @@ static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   56,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f49),
-  ACE_NTOHL (0x6d706c69),
-  ACE_NTOHL (0x63697441),
-  ACE_NTOHL (0x63746976),
-  ACE_NTOHL (0x6174696f),
-  ACE_NTOHL (0x6e506f6c),
-  ACE_NTOHL (0x6963793a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f49), 
+  ACE_NTOHL (0x6d706c69), 
+  ACE_NTOHL (0x63697441), 
+  ACE_NTOHL (0x63746976), 
+  ACE_NTOHL (0x6174696f), 
+  ACE_NTOHL (0x6e506f6c), 
+  ACE_NTOHL (0x6963793a), 
   ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/ImplicitActivationPolicy:2.3
     25,
-  ACE_NTOHL (0x496d706c),
-  ACE_NTOHL (0x69636974),
-  ACE_NTOHL (0x41637469),
-  ACE_NTOHL (0x76617469),
-  ACE_NTOHL (0x6f6e506f),
-  ACE_NTOHL (0x6c696379),
+  ACE_NTOHL (0x496d706c), 
+  ACE_NTOHL (0x69636974), 
+  ACE_NTOHL (0x41637469), 
+  ACE_NTOHL (0x76617469), 
+  ACE_NTOHL (0x6f6e506f), 
+  ACE_NTOHL (0x6c696379), 
   ACE_NTOHL (0x0),  // name = ImplicitActivationPolicy
   };
 
@@ -2031,14 +2288,11 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ImplicitActivationPolicy (
     sizeof (PortableServer::ImplicitActivationPolicy)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ImplicitActivationPolicy,
-    &_tc_TAO_tc_PortableServer_ImplicitActivationPolicy
-  )
-TAO_NAMESPACE_END
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_ImplicitActivationPolicy =
+    &_tc_TAO_tc_PortableServer_ImplicitActivationPolicy;
+}
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -2047,36 +2301,36 @@ static const CORBA::Long _oc_PortableServer_ServantRetentionPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   59,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f53),
-  ACE_NTOHL (0x65727661),
-  ACE_NTOHL (0x6e745265),
-  ACE_NTOHL (0x74656e74),
-  ACE_NTOHL (0x696f6e50),
-  ACE_NTOHL (0x6f6c6963),
-  ACE_NTOHL (0x7956616c),
-  ACE_NTOHL (0x75653a32),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f53), 
+  ACE_NTOHL (0x65727661), 
+  ACE_NTOHL (0x6e745265), 
+  ACE_NTOHL (0x74656e74), 
+  ACE_NTOHL (0x696f6e50), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x7956616c), 
+  ACE_NTOHL (0x75653a32), 
   ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/ServantRetentionPolicyValue:2.3
   28,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x616e7452),
-  ACE_NTOHL (0x6574656e),
-  ACE_NTOHL (0x74696f6e),
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63795661),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x616e7452), 
+  ACE_NTOHL (0x6574656e), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63795661), 
   ACE_NTOHL (0x6c756500),  // name = ServantRetentionPolicyValue
   2, // member count
   7,
-  ACE_NTOHL (0x52455441),
+  ACE_NTOHL (0x52455441), 
   ACE_NTOHL (0x494e0000),  // name = RETAIN
   11,
-  ACE_NTOHL (0x4e4f4e5f),
-  ACE_NTOHL (0x52455441),
+  ACE_NTOHL (0x4e4f4e5f), 
+  ACE_NTOHL (0x52455441), 
   ACE_NTOHL (0x494e0000),  // name = NON_RETAIN
   };
 
@@ -2088,46 +2342,53 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantRetentionPolicyValue (
     sizeof (PortableServer::ServantRetentionPolicyValue)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ServantRetentionPolicyValue,
-    &_tc_TAO_tc_PortableServer_ServantRetentionPolicyValue
-  )
-TAO_NAMESPACE_END
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_ServantRetentionPolicyValue =
+    &_tc_TAO_tc_PortableServer_ServantRetentionPolicyValue;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-int PortableServer::ServantRetentionPolicy::_tao_class_id = 0;
+// Traits specializations for PortableServer::ServantRetentionPolicy.
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        PortableServer::ServantRetentionPolicy,
-        PortableServer::tao_ServantRetentionPolicy_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        PortableServer::ServantRetentionPolicy,
-        PortableServer::tao_ServantRetentionPolicy_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableServer::ServantRetentionPolicy, \
-        PortableServer::tao_ServantRetentionPolicy_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableServer::ServantRetentionPolicy, \
-        PortableServer::tao_ServantRetentionPolicy_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+PortableServer::ServantRetentionPolicy_ptr
+TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::tao_duplicate (
+    PortableServer::ServantRetentionPolicy_ptr p
+  )
+{
+  return PortableServer::ServantRetentionPolicy::_duplicate (p);
+}
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+void
+TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::tao_release (
+    PortableServer::ServantRetentionPolicy_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+PortableServer::ServantRetentionPolicy_ptr
+TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::tao_nil (void)
+{
+  return PortableServer::ServantRetentionPolicy::_nil ();
+}
+
+CORBA::Boolean
+TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::tao_marshal (
+    PortableServer::ServantRetentionPolicy_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker * 
+(*PortableServer__TAO_ServantRetentionPolicy_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 PortableServer::ServantRetentionPolicy::ServantRetentionPolicy (void)
 {}
@@ -2135,43 +2396,29 @@ PortableServer::ServantRetentionPolicy::ServantRetentionPolicy (void)
 PortableServer::ServantRetentionPolicy::~ServantRetentionPolicy (void)
 {}
 
-void
+void 
 PortableServer::ServantRetentionPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ServantRetentionPolicy *tmp = ACE_static_cast (ServantRetentionPolicy *, _tao_void_pointer);
-  CORBA::release (tmp);
+  ServantRetentionPolicy *_tao_tmp_pointer =
+    ACE_static_cast (ServantRetentionPolicy *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 PortableServer::ServantRetentionPolicy_ptr
 PortableServer::ServantRetentionPolicy::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ServantRetentionPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-PortableServer::ServantRetentionPolicy_ptr
-PortableServer::ServantRetentionPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
+  if (CORBA::is_nil (_tao_objref))
     {
       return ServantRetentionPolicy::_nil ();
     }
-
-  return
-      ACE_reinterpret_cast (
-          ServantRetentionPolicy_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &ServantRetentionPolicy::_tao_class_id
-                )
-            )
-        );
+  
+  ServantRetentionPolicy_ptr proxy =
+    dynamic_cast<ServantRetentionPolicy_ptr> (_tao_objref);
+  
+  return ServantRetentionPolicy::_duplicate (proxy);
 }
 
 PortableServer::ServantRetentionPolicy_ptr
@@ -2181,53 +2428,41 @@ PortableServer::ServantRetentionPolicy::_duplicate (ServantRetentionPolicy_ptr o
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
-void *PortableServer::ServantRetentionPolicy::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+PortableServer::ServantRetentionPolicy::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::PortableServer, ServantRetentionPolicy)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &::CORBA::Policy::_tao_class_id)
-            )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                CORBA::Policy_ptr,
-                this
-              )
-          );
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Policy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/PortableServer/ServantRetentionPolicy:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
+      return 1; // success using local knowledge
     }
-
-  if (retv != 0)
+  else
     {
-      this->_add_ref ();
+      return 0;
     }
-
-  return retv;
 }
 
 const char* PortableServer::ServantRetentionPolicy::_interface_repository_id (void) const
@@ -2248,26 +2483,26 @@ static const CORBA::Long _oc_PortableServer_ServantRetentionPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   54,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f53),
-  ACE_NTOHL (0x65727661),
-  ACE_NTOHL (0x6e745265),
-  ACE_NTOHL (0x74656e74),
-  ACE_NTOHL (0x696f6e50),
-  ACE_NTOHL (0x6f6c6963),
-  ACE_NTOHL (0x793a322e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f53), 
+  ACE_NTOHL (0x65727661), 
+  ACE_NTOHL (0x6e745265), 
+  ACE_NTOHL (0x74656e74), 
+  ACE_NTOHL (0x696f6e50), 
+  ACE_NTOHL (0x6f6c6963), 
+  ACE_NTOHL (0x793a322e), 
   ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/ServantRetentionPolicy:2.3
     23,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x616e7452),
-  ACE_NTOHL (0x6574656e),
-  ACE_NTOHL (0x74696f6e),
-  ACE_NTOHL (0x506f6c69),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x616e7452), 
+  ACE_NTOHL (0x6574656e), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x506f6c69), 
   ACE_NTOHL (0x63790000),  // name = ServantRetentionPolicy
   };
 
@@ -2279,14 +2514,11 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantRetentionPolicy (
     sizeof (PortableServer::ServantRetentionPolicy)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ServantRetentionPolicy,
-    &_tc_TAO_tc_PortableServer_ServantRetentionPolicy
-  )
-TAO_NAMESPACE_END
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_ServantRetentionPolicy =
+    &_tc_TAO_tc_PortableServer_ServantRetentionPolicy;
+}
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
@@ -2295,50 +2527,50 @@ static const CORBA::Long _oc_PortableServer_RequestProcessingPolicyValue[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
   60,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f52),
-  ACE_NTOHL (0x65717565),
-  ACE_NTOHL (0x73745072),
-  ACE_NTOHL (0x6f636573),
-  ACE_NTOHL (0x73696e67),
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63795661),
-  ACE_NTOHL (0x6c75653a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f52), 
+  ACE_NTOHL (0x65717565), 
+  ACE_NTOHL (0x73745072), 
+  ACE_NTOHL (0x6f636573), 
+  ACE_NTOHL (0x73696e67), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63795661), 
+  ACE_NTOHL (0x6c75653a), 
   ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/RequestProcessingPolicyValue:2.3
   29,
-  ACE_NTOHL (0x52657175),
-  ACE_NTOHL (0x65737450),
-  ACE_NTOHL (0x726f6365),
-  ACE_NTOHL (0x7373696e),
-  ACE_NTOHL (0x67506f6c),
-  ACE_NTOHL (0x69637956),
-  ACE_NTOHL (0x616c7565),
+  ACE_NTOHL (0x52657175), 
+  ACE_NTOHL (0x65737450), 
+  ACE_NTOHL (0x726f6365), 
+  ACE_NTOHL (0x7373696e), 
+  ACE_NTOHL (0x67506f6c), 
+  ACE_NTOHL (0x69637956), 
+  ACE_NTOHL (0x616c7565), 
   ACE_NTOHL (0x0),  // name = RequestProcessingPolicyValue
   3, // member count
   27,
-  ACE_NTOHL (0x5553455f),
-  ACE_NTOHL (0x41435449),
-  ACE_NTOHL (0x56455f4f),
-  ACE_NTOHL (0x424a4543),
-  ACE_NTOHL (0x545f4d41),
-  ACE_NTOHL (0x505f4f4e),
+  ACE_NTOHL (0x5553455f), 
+  ACE_NTOHL (0x41435449), 
+  ACE_NTOHL (0x56455f4f), 
+  ACE_NTOHL (0x424a4543), 
+  ACE_NTOHL (0x545f4d41), 
+  ACE_NTOHL (0x505f4f4e), 
   ACE_NTOHL (0x4c590000),  // name = USE_ACTIVE_OBJECT_MAP_ONLY
   20,
-  ACE_NTOHL (0x5553455f),
-  ACE_NTOHL (0x44454641),
-  ACE_NTOHL (0x554c545f),
-  ACE_NTOHL (0x53455256),
+  ACE_NTOHL (0x5553455f), 
+  ACE_NTOHL (0x44454641), 
+  ACE_NTOHL (0x554c545f), 
+  ACE_NTOHL (0x53455256), 
   ACE_NTOHL (0x414e5400),  // name = USE_DEFAULT_SERVANT
   20,
-  ACE_NTOHL (0x5553455f),
-  ACE_NTOHL (0x53455256),
-  ACE_NTOHL (0x414e545f),
-  ACE_NTOHL (0x4d414e41),
+  ACE_NTOHL (0x5553455f), 
+  ACE_NTOHL (0x53455256), 
+  ACE_NTOHL (0x414e545f), 
+  ACE_NTOHL (0x4d414e41), 
   ACE_NTOHL (0x47455200),  // name = USE_SERVANT_MANAGER
   };
 
@@ -2350,46 +2582,53 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicyValue (
     sizeof (PortableServer::RequestProcessingPolicyValue)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_RequestProcessingPolicyValue,
-    &_tc_TAO_tc_PortableServer_RequestProcessingPolicyValue
-  )
-TAO_NAMESPACE_END
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_RequestProcessingPolicyValue =
+    &_tc_TAO_tc_PortableServer_RequestProcessingPolicyValue;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-int PortableServer::RequestProcessingPolicy::_tao_class_id = 0;
+// Traits specializations for PortableServer::RequestProcessingPolicy.
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        PortableServer::RequestProcessingPolicy,
-        PortableServer::tao_RequestProcessingPolicy_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        PortableServer::RequestProcessingPolicy,
-        PortableServer::tao_RequestProcessingPolicy_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableServer::RequestProcessingPolicy, \
-        PortableServer::tao_RequestProcessingPolicy_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableServer::RequestProcessingPolicy, \
-        PortableServer::tao_RequestProcessingPolicy_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+PortableServer::RequestProcessingPolicy_ptr
+TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::tao_duplicate (
+    PortableServer::RequestProcessingPolicy_ptr p
+  )
+{
+  return PortableServer::RequestProcessingPolicy::_duplicate (p);
+}
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+void
+TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::tao_release (
+    PortableServer::RequestProcessingPolicy_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+PortableServer::RequestProcessingPolicy_ptr
+TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::tao_nil (void)
+{
+  return PortableServer::RequestProcessingPolicy::_nil ();
+}
+
+CORBA::Boolean
+TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::tao_marshal (
+    PortableServer::RequestProcessingPolicy_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker * 
+(*PortableServer__TAO_RequestProcessingPolicy_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 PortableServer::RequestProcessingPolicy::RequestProcessingPolicy (void)
 {}
@@ -2397,43 +2636,29 @@ PortableServer::RequestProcessingPolicy::RequestProcessingPolicy (void)
 PortableServer::RequestProcessingPolicy::~RequestProcessingPolicy (void)
 {}
 
-void
+void 
 PortableServer::RequestProcessingPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
-  RequestProcessingPolicy *tmp = ACE_static_cast (RequestProcessingPolicy *, _tao_void_pointer);
-  CORBA::release (tmp);
+  RequestProcessingPolicy *_tao_tmp_pointer =
+    ACE_static_cast (RequestProcessingPolicy *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 PortableServer::RequestProcessingPolicy_ptr
 PortableServer::RequestProcessingPolicy::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return RequestProcessingPolicy::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-PortableServer::RequestProcessingPolicy_ptr
-PortableServer::RequestProcessingPolicy::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
+  if (CORBA::is_nil (_tao_objref))
     {
       return RequestProcessingPolicy::_nil ();
     }
-
-  return
-      ACE_reinterpret_cast (
-          RequestProcessingPolicy_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &RequestProcessingPolicy::_tao_class_id
-                )
-            )
-        );
+  
+  RequestProcessingPolicy_ptr proxy =
+    dynamic_cast<RequestProcessingPolicy_ptr> (_tao_objref);
+  
+  return RequestProcessingPolicy::_duplicate (proxy);
 }
 
 PortableServer::RequestProcessingPolicy_ptr
@@ -2443,53 +2668,41 @@ PortableServer::RequestProcessingPolicy::_duplicate (RequestProcessingPolicy_ptr
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
-void *PortableServer::RequestProcessingPolicy::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+PortableServer::RequestProcessingPolicy::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::PortableServer, RequestProcessingPolicy)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &::CORBA::Policy::_tao_class_id)
-            )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                CORBA::Policy_ptr,
-                this
-              )
-          );
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Policy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/PortableServer/RequestProcessingPolicy:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
+      return 1; // success using local knowledge
     }
-
-  if (retv != 0)
+  else
     {
-      this->_add_ref ();
+      return 0;
     }
-
-  return retv;
 }
 
 const char* PortableServer::RequestProcessingPolicy::_interface_repository_id (void) const
@@ -2510,26 +2723,26 @@ static const CORBA::Long _oc_PortableServer_RequestProcessingPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   55,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f52),
-  ACE_NTOHL (0x65717565),
-  ACE_NTOHL (0x73745072),
-  ACE_NTOHL (0x6f636573),
-  ACE_NTOHL (0x73696e67),
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63793a32),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f52), 
+  ACE_NTOHL (0x65717565), 
+  ACE_NTOHL (0x73745072), 
+  ACE_NTOHL (0x6f636573), 
+  ACE_NTOHL (0x73696e67), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63793a32), 
   ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/RequestProcessingPolicy:2.3
     24,
-  ACE_NTOHL (0x52657175),
-  ACE_NTOHL (0x65737450),
-  ACE_NTOHL (0x726f6365),
-  ACE_NTOHL (0x7373696e),
-  ACE_NTOHL (0x67506f6c),
+  ACE_NTOHL (0x52657175), 
+  ACE_NTOHL (0x65737450), 
+  ACE_NTOHL (0x726f6365), 
+  ACE_NTOHL (0x7373696e), 
+  ACE_NTOHL (0x67506f6c), 
   ACE_NTOHL (0x69637900),  // name = RequestProcessingPolicy
   };
 
@@ -2541,161 +2754,57 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicy (
     sizeof (PortableServer::RequestProcessingPolicy)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_RequestProcessingPolicy,
-    &_tc_TAO_tc_PortableServer_RequestProcessingPolicy
-  )
-TAO_NAMESPACE_END
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_RequestProcessingPolicy =
+    &_tc_TAO_tc_PortableServer_RequestProcessingPolicy;
+}
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
-
-int PortableServer::POAManager::_tao_class_id = 0;
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        PortableServer::POAManager,
-        PortableServer::tao_POAManager_life
-      >;
-
-template class TAO_Seq_Var_Base_T<PortableServer::POAList,
-    TAO_Object_Manager<PortableServer::POA,
-                       TAO_Objref_Var_T<PortableServer::POA,
-                                        PortableServer::tao_POA_life>,
-                       PortableServer::tao_POA_life> >;
-template class
-    TAO_Objref_Out_T<
-        PortableServer::POAManager,
-        PortableServer::tao_POAManager_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableServer::POAManager, \
-        PortableServer::tao_POAManager_life \
-      >
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-# pragma instantiate TAO_Seq_Var_Base_T<PortableServer::POAList,
-      TAO_Object_Manager<PortableServer::POA,
-                         TAO_Objref_Var_T<PortableServer::POA,
-                                          PortableServer::tao_POA_life>,
-                         PortableServer::tao_POA_life> >
-
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableServer::POAManager, \
-        PortableServer::tao_POAManager_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
-
-PortableServer::POAManager::POAManager (void)
-{}
-
-PortableServer::POAManager::~POAManager (void)
-{}
-
-void
-PortableServer::POAManager::_tao_any_destructor (void *_tao_void_pointer)
-{
-  POAManager *tmp = ACE_static_cast (POAManager *, _tao_void_pointer);
-  CORBA::release (tmp);
-}
+// Traits specializations for PortableServer::POAManager.
 
 PortableServer::POAManager_ptr
-PortableServer::POAManager::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
+TAO::Objref_Traits<PortableServer::POAManager>::tao_duplicate (
+    PortableServer::POAManager_ptr p
   )
 {
-  return POAManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+  return PortableServer::POAManager::_duplicate (p);
 }
 
-PortableServer::POAManager_ptr
-PortableServer::POAManager::_unchecked_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL_NOT_USED
+void
+TAO::Objref_Traits<PortableServer::POAManager>::tao_release (
+    PortableServer::POAManager_ptr p
   )
 {
-  if (CORBA::is_nil (obj))
-    {
-      return POAManager::_nil ();
-    }
-
-  return
-      ACE_reinterpret_cast (
-          POAManager_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &POAManager::_tao_class_id
-                )
-            )
-        );
+  CORBA::release (p);
 }
 
 PortableServer::POAManager_ptr
-PortableServer::POAManager::_duplicate (POAManager_ptr obj)
+TAO::Objref_Traits<PortableServer::POAManager>::tao_nil (void)
 {
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-void *PortableServer::POAManager::_tao_QueryInterface (ptrdiff_t type)
-{
-  void *retv = 0;
-
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::PortableServer, POAManager)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-
-  if (retv != 0)
-    {
-      this->_add_ref ();
-    }
-
-  return retv;
-}
-
-const char* PortableServer::POAManager::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/POAManager:2.3";
+  return PortableServer::POAManager::_nil ();
 }
 
 CORBA::Boolean
-PortableServer::POAManager::marshal (TAO_OutputCDR &)
+TAO::Objref_Traits<PortableServer::POAManager>::tao_marshal (
+    PortableServer::POAManager_ptr p,
+    TAO_OutputCDR & cdr
+  )
 {
-  return 0;
+  return p->marshal (cdr);
 }
 
-// TAO_IDL - Generated from
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker * 
+(*PortableServer__TAO_POAManager_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
+// TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POAManager::AdapterInactive::AdapterInactive (void)
@@ -2727,8 +2836,9 @@ PortableServer::POAManager::AdapterInactive::operator= (const ::PortableServer::
 
 void PortableServer::POAManager::AdapterInactive::_tao_any_destructor (void *_tao_void_pointer)
 {
-  AdapterInactive *tmp = ACE_static_cast (AdapterInactive*, _tao_void_pointer);
-  delete tmp;
+  AdapterInactive *_tao_tmp_pointer =
+    ACE_static_cast (AdapterInactive*, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
 PortableServer::POAManager::AdapterInactive *
@@ -2797,25 +2907,25 @@ static const CORBA::Long _oc_PortableServer_POAManager_AdapterInactive[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   58,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f50),
-  ACE_NTOHL (0x4f414d61),
-  ACE_NTOHL (0x6e616765),
-  ACE_NTOHL (0x722f4164),
-  ACE_NTOHL (0x61707465),
-  ACE_NTOHL (0x72496e61),
-  ACE_NTOHL (0x63746976),
-  ACE_NTOHL (0x653a322e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f50), 
+  ACE_NTOHL (0x4f414d61), 
+  ACE_NTOHL (0x6e616765), 
+  ACE_NTOHL (0x722f4164), 
+  ACE_NTOHL (0x61707465), 
+  ACE_NTOHL (0x72496e61), 
+  ACE_NTOHL (0x63746976), 
+  ACE_NTOHL (0x653a322e), 
   ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/POAManager/AdapterInactive:2.3
     16,
-  ACE_NTOHL (0x41646170),
-  ACE_NTOHL (0x74657249),
-  ACE_NTOHL (0x6e616374),
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x74657249), 
+  ACE_NTOHL (0x6e616374), 
   ACE_NTOHL (0x69766500),  // name = AdapterInactive
   0, // member count
   };
@@ -2831,6 +2941,88 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAManager_AdapterInactive (
 ::CORBA::TypeCode_ptr PortableServer::POAManager::_tc_AdapterInactive =
   &_tc_TAO_tc_PortableServer_POAManager_AdapterInactive;
 
+PortableServer::POAManager::POAManager (void)
+{}
+
+PortableServer::POAManager::~POAManager (void)
+{}
+
+void 
+PortableServer::POAManager::_tao_any_destructor (void *_tao_void_pointer)
+{
+  POAManager *_tao_tmp_pointer =
+    ACE_static_cast (POAManager *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
+}
+
+PortableServer::POAManager_ptr
+PortableServer::POAManager::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return POAManager::_nil ();
+    }
+  
+  POAManager_ptr proxy =
+    dynamic_cast<POAManager_ptr> (_tao_objref);
+  
+  return POAManager::_duplicate (proxy);
+}
+
+PortableServer::POAManager_ptr
+PortableServer::POAManager::_duplicate (POAManager_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+CORBA::Boolean
+PortableServer::POAManager::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/PortableServer/POAManager:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+const char* PortableServer::POAManager::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/PortableServer/POAManager:2.3";
+}
+
+CORBA::Boolean
+PortableServer::POAManager::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -2838,20 +3030,20 @@ static const CORBA::Long _oc_PortableServer_POAManager[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   42,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f50),
-  ACE_NTOHL (0x4f414d61),
-  ACE_NTOHL (0x6e616765),
-  ACE_NTOHL (0x723a322e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f50), 
+  ACE_NTOHL (0x4f414d61), 
+  ACE_NTOHL (0x6e616765), 
+  ACE_NTOHL (0x723a322e), 
   ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/POAManager:2.3
     11,
-  ACE_NTOHL (0x504f414d),
-  ACE_NTOHL (0x616e6167),
+  ACE_NTOHL (0x504f414d), 
+  ACE_NTOHL (0x616e6167), 
   ACE_NTOHL (0x65720000),  // name = POAManager
   };
 
@@ -2863,48 +3055,55 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAManager (
     sizeof (PortableServer::POAManager)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_POAManager,
-    &_tc_TAO_tc_PortableServer_POAManager
-  )
-TAO_NAMESPACE_END
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_POAManager =
+    &_tc_TAO_tc_PortableServer_POAManager;
+}
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-int PortableServer::AdapterActivator::_tao_class_id = 0;
+// Traits specializations for PortableServer::AdapterActivator.
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        PortableServer::AdapterActivator,
-        PortableServer::tao_AdapterActivator_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        PortableServer::AdapterActivator,
-        PortableServer::tao_AdapterActivator_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableServer::AdapterActivator, \
-        PortableServer::tao_AdapterActivator_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableServer::AdapterActivator, \
-        PortableServer::tao_AdapterActivator_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+PortableServer::AdapterActivator_ptr
+TAO::Objref_Traits<PortableServer::AdapterActivator>::tao_duplicate (
+    PortableServer::AdapterActivator_ptr p
+  )
+{
+  return PortableServer::AdapterActivator::_duplicate (p);
+}
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+void
+TAO::Objref_Traits<PortableServer::AdapterActivator>::tao_release (
+    PortableServer::AdapterActivator_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+PortableServer::AdapterActivator_ptr
+TAO::Objref_Traits<PortableServer::AdapterActivator>::tao_nil (void)
+{
+  return PortableServer::AdapterActivator::_nil ();
+}
+
+CORBA::Boolean
+TAO::Objref_Traits<PortableServer::AdapterActivator>::tao_marshal (
+    PortableServer::AdapterActivator_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker * 
+(*PortableServer__TAO_AdapterActivator_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 PortableServer::AdapterActivator::AdapterActivator (void)
 {}
@@ -2912,43 +3111,29 @@ PortableServer::AdapterActivator::AdapterActivator (void)
 PortableServer::AdapterActivator::~AdapterActivator (void)
 {}
 
-void
+void 
 PortableServer::AdapterActivator::_tao_any_destructor (void *_tao_void_pointer)
 {
-  AdapterActivator *tmp = ACE_static_cast (AdapterActivator *, _tao_void_pointer);
-  CORBA::release (tmp);
+  AdapterActivator *_tao_tmp_pointer =
+    ACE_static_cast (AdapterActivator *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 PortableServer::AdapterActivator_ptr
 PortableServer::AdapterActivator::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return AdapterActivator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-PortableServer::AdapterActivator_ptr
-PortableServer::AdapterActivator::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
+  if (CORBA::is_nil (_tao_objref))
     {
       return AdapterActivator::_nil ();
     }
-
-  return
-      ACE_reinterpret_cast (
-          AdapterActivator_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &AdapterActivator::_tao_class_id
-                )
-            )
-        );
+  
+  AdapterActivator_ptr proxy =
+    dynamic_cast<AdapterActivator_ptr> (_tao_objref);
+  
+  return AdapterActivator::_duplicate (proxy);
 }
 
 PortableServer::AdapterActivator_ptr
@@ -2958,39 +3143,37 @@ PortableServer::AdapterActivator::_duplicate (AdapterActivator_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
-void *PortableServer::AdapterActivator::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+PortableServer::AdapterActivator::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::PortableServer, AdapterActivator)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/PortableServer/AdapterActivator:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
+      return 1; // success using local knowledge
     }
-
-  if (retv != 0)
+  else
     {
-      this->_add_ref ();
+      return 0;
     }
-
-  return retv;
 }
 
 const char* PortableServer::AdapterActivator::_interface_repository_id (void) const
@@ -3011,23 +3194,23 @@ static const CORBA::Long _oc_PortableServer_AdapterActivator[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f41),
-  ACE_NTOHL (0x64617074),
-  ACE_NTOHL (0x65724163),
-  ACE_NTOHL (0x74697661),
-  ACE_NTOHL (0x746f723a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f41), 
+  ACE_NTOHL (0x64617074), 
+  ACE_NTOHL (0x65724163), 
+  ACE_NTOHL (0x74697661), 
+  ACE_NTOHL (0x746f723a), 
   ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/AdapterActivator:2.3
     17,
-  ACE_NTOHL (0x41646170),
-  ACE_NTOHL (0x74657241),
-  ACE_NTOHL (0x63746976),
-  ACE_NTOHL (0x61746f72),
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x74657241), 
+  ACE_NTOHL (0x63746976), 
+  ACE_NTOHL (0x61746f72), 
   ACE_NTOHL (0x0),  // name = AdapterActivator
   };
 
@@ -3039,46 +3222,53 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_AdapterActivator (
     sizeof (PortableServer::AdapterActivator)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_AdapterActivator,
-    &_tc_TAO_tc_PortableServer_AdapterActivator
-  )
-TAO_NAMESPACE_END
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_AdapterActivator =
+    &_tc_TAO_tc_PortableServer_AdapterActivator;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-int PortableServer::ServantManager::_tao_class_id = 0;
+// Traits specializations for PortableServer::ServantManager.
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        PortableServer::ServantManager,
-        PortableServer::tao_ServantManager_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        PortableServer::ServantManager,
-        PortableServer::tao_ServantManager_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableServer::ServantManager, \
-        PortableServer::tao_ServantManager_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableServer::ServantManager, \
-        PortableServer::tao_ServantManager_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+PortableServer::ServantManager_ptr
+TAO::Objref_Traits<PortableServer::ServantManager>::tao_duplicate (
+    PortableServer::ServantManager_ptr p
+  )
+{
+  return PortableServer::ServantManager::_duplicate (p);
+}
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+void
+TAO::Objref_Traits<PortableServer::ServantManager>::tao_release (
+    PortableServer::ServantManager_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+PortableServer::ServantManager_ptr
+TAO::Objref_Traits<PortableServer::ServantManager>::tao_nil (void)
+{
+  return PortableServer::ServantManager::_nil ();
+}
+
+CORBA::Boolean
+TAO::Objref_Traits<PortableServer::ServantManager>::tao_marshal (
+    PortableServer::ServantManager_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker * 
+(*PortableServer__TAO_ServantManager_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 PortableServer::ServantManager::ServantManager (void)
 {}
@@ -3086,43 +3276,29 @@ PortableServer::ServantManager::ServantManager (void)
 PortableServer::ServantManager::~ServantManager (void)
 {}
 
-void
+void 
 PortableServer::ServantManager::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ServantManager *tmp = ACE_static_cast (ServantManager *, _tao_void_pointer);
-  CORBA::release (tmp);
+  ServantManager *_tao_tmp_pointer =
+    ACE_static_cast (ServantManager *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 PortableServer::ServantManager_ptr
 PortableServer::ServantManager::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ServantManager::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-PortableServer::ServantManager_ptr
-PortableServer::ServantManager::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
+  if (CORBA::is_nil (_tao_objref))
     {
       return ServantManager::_nil ();
     }
-
-  return
-      ACE_reinterpret_cast (
-          ServantManager_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &ServantManager::_tao_class_id
-                )
-            )
-        );
+  
+  ServantManager_ptr proxy =
+    dynamic_cast<ServantManager_ptr> (_tao_objref);
+  
+  return ServantManager::_duplicate (proxy);
 }
 
 PortableServer::ServantManager_ptr
@@ -3132,39 +3308,37 @@ PortableServer::ServantManager::_duplicate (ServantManager_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
-void *PortableServer::ServantManager::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+PortableServer::ServantManager::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::PortableServer, ServantManager)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/PortableServer/ServantManager:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
+      return 1; // success using local knowledge
     }
-
-  if (retv != 0)
+  else
     {
-      this->_add_ref ();
+      return 0;
     }
-
-  return retv;
 }
 
 const char* PortableServer::ServantManager::_interface_repository_id (void) const
@@ -3185,22 +3359,22 @@ static const CORBA::Long _oc_PortableServer_ServantManager[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f53),
-  ACE_NTOHL (0x65727661),
-  ACE_NTOHL (0x6e744d61),
-  ACE_NTOHL (0x6e616765),
-  ACE_NTOHL (0x723a322e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f53), 
+  ACE_NTOHL (0x65727661), 
+  ACE_NTOHL (0x6e744d61), 
+  ACE_NTOHL (0x6e616765), 
+  ACE_NTOHL (0x723a322e), 
   ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/ServantManager:2.3
     15,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x616e744d),
-  ACE_NTOHL (0x616e6167),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x616e744d), 
+  ACE_NTOHL (0x616e6167), 
   ACE_NTOHL (0x65720000),  // name = ServantManager
   };
 
@@ -3212,46 +3386,53 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantManager (
     sizeof (PortableServer::ServantManager)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ServantManager,
-    &_tc_TAO_tc_PortableServer_ServantManager
-  )
-TAO_NAMESPACE_END
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_ServantManager =
+    &_tc_TAO_tc_PortableServer_ServantManager;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-int PortableServer::ServantActivator::_tao_class_id = 0;
+// Traits specializations for PortableServer::ServantActivator.
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        PortableServer::ServantActivator,
-        PortableServer::tao_ServantActivator_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        PortableServer::ServantActivator,
-        PortableServer::tao_ServantActivator_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableServer::ServantActivator, \
-        PortableServer::tao_ServantActivator_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableServer::ServantActivator, \
-        PortableServer::tao_ServantActivator_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+PortableServer::ServantActivator_ptr
+TAO::Objref_Traits<PortableServer::ServantActivator>::tao_duplicate (
+    PortableServer::ServantActivator_ptr p
+  )
+{
+  return PortableServer::ServantActivator::_duplicate (p);
+}
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+void
+TAO::Objref_Traits<PortableServer::ServantActivator>::tao_release (
+    PortableServer::ServantActivator_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+PortableServer::ServantActivator_ptr
+TAO::Objref_Traits<PortableServer::ServantActivator>::tao_nil (void)
+{
+  return PortableServer::ServantActivator::_nil ();
+}
+
+CORBA::Boolean
+TAO::Objref_Traits<PortableServer::ServantActivator>::tao_marshal (
+    PortableServer::ServantActivator_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker * 
+(*PortableServer__TAO_ServantActivator_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 PortableServer::ServantActivator::ServantActivator (void)
 {}
@@ -3259,43 +3440,29 @@ PortableServer::ServantActivator::ServantActivator (void)
 PortableServer::ServantActivator::~ServantActivator (void)
 {}
 
-void
+void 
 PortableServer::ServantActivator::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ServantActivator *tmp = ACE_static_cast (ServantActivator *, _tao_void_pointer);
-  CORBA::release (tmp);
+  ServantActivator *_tao_tmp_pointer =
+    ACE_static_cast (ServantActivator *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 PortableServer::ServantActivator_ptr
 PortableServer::ServantActivator::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ServantActivator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-PortableServer::ServantActivator_ptr
-PortableServer::ServantActivator::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
+  if (CORBA::is_nil (_tao_objref))
     {
       return ServantActivator::_nil ();
     }
-
-  return
-      ACE_reinterpret_cast (
-          ServantActivator_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &ServantActivator::_tao_class_id
-                )
-            )
-        );
+  
+  ServantActivator_ptr proxy =
+    dynamic_cast<ServantActivator_ptr> (_tao_objref);
+  
+  return ServantActivator::_duplicate (proxy);
 }
 
 PortableServer::ServantActivator_ptr
@@ -3305,53 +3472,41 @@ PortableServer::ServantActivator::_duplicate (ServantActivator_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
-void *PortableServer::ServantActivator::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+PortableServer::ServantActivator::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::PortableServer, ServantActivator)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::PortableServer, ServantManager)::_tao_class_id)
-            )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                PortableServer::ServantManager_ptr,
-                this
-              )
-          );
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/PortableServer/ServantManager:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/PortableServer/ServantActivator:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
+      return 1; // success using local knowledge
     }
-
-  if (retv != 0)
+  else
     {
-      this->_add_ref ();
+      return 0;
     }
-
-  return retv;
 }
 
 const char* PortableServer::ServantActivator::_interface_repository_id (void) const
@@ -3372,23 +3527,23 @@ static const CORBA::Long _oc_PortableServer_ServantActivator[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f53),
-  ACE_NTOHL (0x65727661),
-  ACE_NTOHL (0x6e744163),
-  ACE_NTOHL (0x74697661),
-  ACE_NTOHL (0x746f723a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f53), 
+  ACE_NTOHL (0x65727661), 
+  ACE_NTOHL (0x6e744163), 
+  ACE_NTOHL (0x74697661), 
+  ACE_NTOHL (0x746f723a), 
   ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/ServantActivator:2.3
     17,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x616e7441),
-  ACE_NTOHL (0x63746976),
-  ACE_NTOHL (0x61746f72),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x616e7441), 
+  ACE_NTOHL (0x63746976), 
+  ACE_NTOHL (0x61746f72), 
   ACE_NTOHL (0x0),  // name = ServantActivator
   };
 
@@ -3400,46 +3555,53 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantActivator (
     sizeof (PortableServer::ServantActivator)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ServantActivator,
-    &_tc_TAO_tc_PortableServer_ServantActivator
-  )
-TAO_NAMESPACE_END
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_ServantActivator =
+    &_tc_TAO_tc_PortableServer_ServantActivator;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-int PortableServer::ServantLocator::_tao_class_id = 0;
+// Traits specializations for PortableServer::ServantLocator.
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        PortableServer::ServantLocator,
-        PortableServer::tao_ServantLocator_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        PortableServer::ServantLocator,
-        PortableServer::tao_ServantLocator_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableServer::ServantLocator, \
-        PortableServer::tao_ServantLocator_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableServer::ServantLocator, \
-        PortableServer::tao_ServantLocator_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+PortableServer::ServantLocator_ptr
+TAO::Objref_Traits<PortableServer::ServantLocator>::tao_duplicate (
+    PortableServer::ServantLocator_ptr p
+  )
+{
+  return PortableServer::ServantLocator::_duplicate (p);
+}
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+void
+TAO::Objref_Traits<PortableServer::ServantLocator>::tao_release (
+    PortableServer::ServantLocator_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+PortableServer::ServantLocator_ptr
+TAO::Objref_Traits<PortableServer::ServantLocator>::tao_nil (void)
+{
+  return PortableServer::ServantLocator::_nil ();
+}
+
+CORBA::Boolean
+TAO::Objref_Traits<PortableServer::ServantLocator>::tao_marshal (
+    PortableServer::ServantLocator_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return p->marshal (cdr);
+}
+
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker * 
+(*PortableServer__TAO_ServantLocator_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
 
 PortableServer::ServantLocator::ServantLocator (void)
 {}
@@ -3447,43 +3609,29 @@ PortableServer::ServantLocator::ServantLocator (void)
 PortableServer::ServantLocator::~ServantLocator (void)
 {}
 
-void
+void 
 PortableServer::ServantLocator::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ServantLocator *tmp = ACE_static_cast (ServantLocator *, _tao_void_pointer);
-  CORBA::release (tmp);
+  ServantLocator *_tao_tmp_pointer =
+    ACE_static_cast (ServantLocator *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
 }
 
 PortableServer::ServantLocator_ptr
 PortableServer::ServantLocator::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
-  )
-{
-  return ServantLocator::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
-}
-
-PortableServer::ServantLocator_ptr
-PortableServer::ServantLocator::_unchecked_narrow (
-    CORBA::Object_ptr obj
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (CORBA::is_nil (obj))
+  if (CORBA::is_nil (_tao_objref))
     {
       return ServantLocator::_nil ();
     }
-
-  return
-      ACE_reinterpret_cast (
-          ServantLocator_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &ServantLocator::_tao_class_id
-                )
-            )
-        );
+  
+  ServantLocator_ptr proxy =
+    dynamic_cast<ServantLocator_ptr> (_tao_objref);
+  
+  return ServantLocator::_duplicate (proxy);
 }
 
 PortableServer::ServantLocator_ptr
@@ -3493,53 +3641,41 @@ PortableServer::ServantLocator::_duplicate (ServantLocator_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
-void *PortableServer::ServantLocator::_tao_QueryInterface (ptrdiff_t type)
+CORBA::Boolean
+PortableServer::ServantLocator::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
 {
-  void *retv = 0;
-
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::PortableServer, ServantLocator)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::PortableServer, ServantManager)::_tao_class_id)
-            )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                PortableServer::ServantManager_ptr,
-                this
-              )
-          );
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/PortableServer/ServantManager:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/PortableServer/ServantLocator:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
     {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
+      return 1; // success using local knowledge
     }
-
-  if (retv != 0)
+  else
     {
-      this->_add_ref ();
+      return 0;
     }
-
-  return retv;
 }
 
 const char* PortableServer::ServantLocator::_interface_repository_id (void) const
@@ -3560,22 +3696,22 @@ static const CORBA::Long _oc_PortableServer_ServantLocator[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   46,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f53),
-  ACE_NTOHL (0x65727661),
-  ACE_NTOHL (0x6e744c6f),
-  ACE_NTOHL (0x6361746f),
-  ACE_NTOHL (0x723a322e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f53), 
+  ACE_NTOHL (0x65727661), 
+  ACE_NTOHL (0x6e744c6f), 
+  ACE_NTOHL (0x6361746f), 
+  ACE_NTOHL (0x723a322e), 
   ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/ServantLocator:2.3
     15,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x616e744c),
-  ACE_NTOHL (0x6f636174),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x616e744c), 
+  ACE_NTOHL (0x6f636174), 
   ACE_NTOHL (0x6f720000),  // name = ServantLocator
   };
 
@@ -3587,148 +3723,57 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantLocator (
     sizeof (PortableServer::ServantLocator)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_ServantLocator,
-    &_tc_TAO_tc_PortableServer_ServantLocator
-  )
-TAO_NAMESPACE_END
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_ServantLocator =
+    &_tc_TAO_tc_PortableServer_ServantLocator;
+}
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-int PortableServer::POA::_tao_class_id = 0;
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        PortableServer::POA,
-        PortableServer::tao_POA_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        PortableServer::POA,
-        PortableServer::tao_POA_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableServer::POA, \
-        PortableServer::tao_POA_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableServer::POA, \
-        PortableServer::tao_POA_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
-
-PortableServer::POA::POA (void)
-{}
-
-PortableServer::POA::~POA (void)
-{}
-
-void
-PortableServer::POA::_tao_any_destructor (void *_tao_void_pointer)
-{
-  POA *tmp = ACE_static_cast (POA *, _tao_void_pointer);
-  CORBA::release (tmp);
-}
+// Traits specializations for PortableServer::POA.
 
 PortableServer::POA_ptr
-PortableServer::POA::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
+TAO::Objref_Traits<PortableServer::POA>::tao_duplicate (
+    PortableServer::POA_ptr p
   )
 {
-  return POA::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+  return PortableServer::POA::_duplicate (p);
 }
 
-PortableServer::POA_ptr
-PortableServer::POA::_unchecked_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL_NOT_USED
+void
+TAO::Objref_Traits<PortableServer::POA>::tao_release (
+    PortableServer::POA_ptr p
   )
 {
-  if (CORBA::is_nil (obj))
-    {
-      return POA::_nil ();
-    }
-
-  return
-      ACE_reinterpret_cast (
-          POA_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &POA::_tao_class_id
-                )
-            )
-        );
+  CORBA::release (p);
 }
 
 PortableServer::POA_ptr
-PortableServer::POA::_duplicate (POA_ptr obj)
+TAO::Objref_Traits<PortableServer::POA>::tao_nil (void)
 {
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-void *PortableServer::POA::_tao_QueryInterface (ptrdiff_t type)
-{
-  void *retv = 0;
-
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::PortableServer, POA)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-
-  if (retv != 0)
-    {
-      this->_add_ref ();
-    }
-
-  return retv;
-}
-
-const char* PortableServer::POA::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/POA:2.3";
+  return PortableServer::POA::_nil ();
 }
 
 CORBA::Boolean
-PortableServer::POA::marshal (TAO_OutputCDR &)
+TAO::Objref_Traits<PortableServer::POA>::tao_marshal (
+    PortableServer::POA_ptr p,
+    TAO_OutputCDR & cdr
+  )
 {
-  return 0;
+  return p->marshal (cdr);
 }
 
-// TAO_IDL - Generated from
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker * 
+(*PortableServer__TAO_POA_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
+// TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (void)
@@ -3760,8 +3805,9 @@ PortableServer::POA::AdapterAlreadyExists::operator= (const ::PortableServer::PO
 
 void PortableServer::POA::AdapterAlreadyExists::_tao_any_destructor (void *_tao_void_pointer)
 {
-  AdapterAlreadyExists *tmp = ACE_static_cast (AdapterAlreadyExists*, _tao_void_pointer);
-  delete tmp;
+  AdapterAlreadyExists *_tao_tmp_pointer =
+    ACE_static_cast (AdapterAlreadyExists*, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
 PortableServer::POA::AdapterAlreadyExists *
@@ -3830,26 +3876,26 @@ static const CORBA::Long _oc_PortableServer_POA_AdapterAlreadyExists[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   56,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f50),
-  ACE_NTOHL (0x4f412f41),
-  ACE_NTOHL (0x64617074),
-  ACE_NTOHL (0x6572416c),
-  ACE_NTOHL (0x72656164),
-  ACE_NTOHL (0x79457869),
-  ACE_NTOHL (0x7374733a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f50), 
+  ACE_NTOHL (0x4f412f41), 
+  ACE_NTOHL (0x64617074), 
+  ACE_NTOHL (0x6572416c), 
+  ACE_NTOHL (0x72656164), 
+  ACE_NTOHL (0x79457869), 
+  ACE_NTOHL (0x7374733a), 
   ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:2.3
     21,
-  ACE_NTOHL (0x41646170),
-  ACE_NTOHL (0x74657241),
-  ACE_NTOHL (0x6c726561),
-  ACE_NTOHL (0x64794578),
-  ACE_NTOHL (0x69737473),
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x74657241), 
+  ACE_NTOHL (0x6c726561), 
+  ACE_NTOHL (0x64794578), 
+  ACE_NTOHL (0x69737473), 
   ACE_NTOHL (0x0),  // name = AdapterAlreadyExists
   0, // member count
   };
@@ -3865,7 +3911,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterAlreadyExists (
 ::CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterAlreadyExists =
   &_tc_TAO_tc_PortableServer_POA_AdapterAlreadyExists;
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::AdapterNonExistent::AdapterNonExistent (void)
@@ -3897,8 +3943,9 @@ PortableServer::POA::AdapterNonExistent::operator= (const ::PortableServer::POA:
 
 void PortableServer::POA::AdapterNonExistent::_tao_any_destructor (void *_tao_void_pointer)
 {
-  AdapterNonExistent *tmp = ACE_static_cast (AdapterNonExistent*, _tao_void_pointer);
-  delete tmp;
+  AdapterNonExistent *_tao_tmp_pointer =
+    ACE_static_cast (AdapterNonExistent*, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
 PortableServer::POA::AdapterNonExistent *
@@ -3967,25 +4014,25 @@ static const CORBA::Long _oc_PortableServer_POA_AdapterNonExistent[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   54,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f50),
-  ACE_NTOHL (0x4f412f41),
-  ACE_NTOHL (0x64617074),
-  ACE_NTOHL (0x65724e6f),
-  ACE_NTOHL (0x6e457869),
-  ACE_NTOHL (0x7374656e),
-  ACE_NTOHL (0x743a322e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f50), 
+  ACE_NTOHL (0x4f412f41), 
+  ACE_NTOHL (0x64617074), 
+  ACE_NTOHL (0x65724e6f), 
+  ACE_NTOHL (0x6e457869), 
+  ACE_NTOHL (0x7374656e), 
+  ACE_NTOHL (0x743a322e), 
   ACE_NTOHL (0x33000000),  // repository ID = IDL:omg.org/PortableServer/POA/AdapterNonExistent:2.3
     19,
-  ACE_NTOHL (0x41646170),
-  ACE_NTOHL (0x7465724e),
-  ACE_NTOHL (0x6f6e4578),
-  ACE_NTOHL (0x69737465),
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x7465724e), 
+  ACE_NTOHL (0x6f6e4578), 
+  ACE_NTOHL (0x69737465), 
   ACE_NTOHL (0x6e740000),  // name = AdapterNonExistent
   0, // member count
   };
@@ -4001,7 +4048,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterNonExistent (
 ::CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterNonExistent =
   &_tc_TAO_tc_PortableServer_POA_AdapterNonExistent;
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::InvalidPolicy::InvalidPolicy (void)
@@ -4035,8 +4082,9 @@ PortableServer::POA::InvalidPolicy::operator= (const ::PortableServer::POA::Inva
 
 void PortableServer::POA::InvalidPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
-  InvalidPolicy *tmp = ACE_static_cast (InvalidPolicy*, _tao_void_pointer);
-  delete tmp;
+  InvalidPolicy *_tao_tmp_pointer =
+    ACE_static_cast (InvalidPolicy*, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
 PortableServer::POA::InvalidPolicy *
@@ -4099,7 +4147,8 @@ void PortableServer::POA::InvalidPolicy::_tao_decode (
 
 PortableServer::POA::InvalidPolicy::InvalidPolicy (
     CORBA::UShort _tao_index
-  )  : CORBA::UserException (
+  )
+  : CORBA::UserException (
         "IDL:omg.org/PortableServer/POA/InvalidPolicy:2.3",
         "InvalidPolicy"
       )
@@ -4120,27 +4169,27 @@ static const CORBA::Long _oc_PortableServer_POA_InvalidPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   49,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f50),
-  ACE_NTOHL (0x4f412f49),
-  ACE_NTOHL (0x6e76616c),
-  ACE_NTOHL (0x6964506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x3a322e33),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f50), 
+  ACE_NTOHL (0x4f412f49), 
+  ACE_NTOHL (0x6e76616c), 
+  ACE_NTOHL (0x6964506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x3a322e33), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/POA/InvalidPolicy:2.3
     14,
-  ACE_NTOHL (0x496e7661),
-  ACE_NTOHL (0x6c696450),
-  ACE_NTOHL (0x6f6c6963),
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c696450), 
+  ACE_NTOHL (0x6f6c6963), 
   ACE_NTOHL (0x79000000),  // name = InvalidPolicy
   1, // member count
     6,
-  ACE_NTOHL (0x696e6465),
+  ACE_NTOHL (0x696e6465), 
   ACE_NTOHL (0x78000000),  // name = index
     CORBA::tk_ushort,
 
@@ -4159,7 +4208,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_InvalidPolicy (
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::NoServant::NoServant (void)
@@ -4191,8 +4240,9 @@ PortableServer::POA::NoServant::operator= (const ::PortableServer::POA::NoServan
 
 void PortableServer::POA::NoServant::_tao_any_destructor (void *_tao_void_pointer)
 {
-  NoServant *tmp = ACE_static_cast (NoServant*, _tao_void_pointer);
-  delete tmp;
+  NoServant *_tao_tmp_pointer =
+    ACE_static_cast (NoServant*, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
 PortableServer::POA::NoServant *
@@ -4261,21 +4311,21 @@ static const CORBA::Long _oc_PortableServer_POA_NoServant[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   45,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f50),
-  ACE_NTOHL (0x4f412f4e),
-  ACE_NTOHL (0x6f536572),
-  ACE_NTOHL (0x76616e74),
-  ACE_NTOHL (0x3a322e33),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f50), 
+  ACE_NTOHL (0x4f412f4e), 
+  ACE_NTOHL (0x6f536572), 
+  ACE_NTOHL (0x76616e74), 
+  ACE_NTOHL (0x3a322e33), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/POA/NoServant:2.3
     10,
-  ACE_NTOHL (0x4e6f5365),
-  ACE_NTOHL (0x7276616e),
+  ACE_NTOHL (0x4e6f5365), 
+  ACE_NTOHL (0x7276616e), 
   ACE_NTOHL (0x74000000),  // name = NoServant
   0, // member count
   };
@@ -4293,7 +4343,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_NoServant (
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (void)
@@ -4325,8 +4375,9 @@ PortableServer::POA::ObjectAlreadyActive::operator= (const ::PortableServer::POA
 
 void PortableServer::POA::ObjectAlreadyActive::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ObjectAlreadyActive *tmp = ACE_static_cast (ObjectAlreadyActive*, _tao_void_pointer);
-  delete tmp;
+  ObjectAlreadyActive *_tao_tmp_pointer =
+    ACE_static_cast (ObjectAlreadyActive*, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
 PortableServer::POA::ObjectAlreadyActive *
@@ -4395,25 +4446,25 @@ static const CORBA::Long _oc_PortableServer_POA_ObjectAlreadyActive[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   55,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f50),
-  ACE_NTOHL (0x4f412f4f),
-  ACE_NTOHL (0x626a6563),
-  ACE_NTOHL (0x74416c72),
-  ACE_NTOHL (0x65616479),
-  ACE_NTOHL (0x41637469),
-  ACE_NTOHL (0x76653a32),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f50), 
+  ACE_NTOHL (0x4f412f4f), 
+  ACE_NTOHL (0x626a6563), 
+  ACE_NTOHL (0x74416c72), 
+  ACE_NTOHL (0x65616479), 
+  ACE_NTOHL (0x41637469), 
+  ACE_NTOHL (0x76653a32), 
   ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:2.3
     20,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x6374416c),
-  ACE_NTOHL (0x72656164),
-  ACE_NTOHL (0x79416374),
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x6374416c), 
+  ACE_NTOHL (0x72656164), 
+  ACE_NTOHL (0x79416374), 
   ACE_NTOHL (0x69766500),  // name = ObjectAlreadyActive
   0, // member count
   };
@@ -4429,7 +4480,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ObjectAlreadyActive (
 ::CORBA::TypeCode_ptr PortableServer::POA::_tc_ObjectAlreadyActive =
   &_tc_TAO_tc_PortableServer_POA_ObjectAlreadyActive;
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::ObjectNotActive::ObjectNotActive (void)
@@ -4461,8 +4512,9 @@ PortableServer::POA::ObjectNotActive::operator= (const ::PortableServer::POA::Ob
 
 void PortableServer::POA::ObjectNotActive::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ObjectNotActive *tmp = ACE_static_cast (ObjectNotActive*, _tao_void_pointer);
-  delete tmp;
+  ObjectNotActive *_tao_tmp_pointer =
+    ACE_static_cast (ObjectNotActive*, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
 PortableServer::POA::ObjectNotActive *
@@ -4531,23 +4583,23 @@ static const CORBA::Long _oc_PortableServer_POA_ObjectNotActive[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   51,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f50),
-  ACE_NTOHL (0x4f412f4f),
-  ACE_NTOHL (0x626a6563),
-  ACE_NTOHL (0x744e6f74),
-  ACE_NTOHL (0x41637469),
-  ACE_NTOHL (0x76653a32),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f50), 
+  ACE_NTOHL (0x4f412f4f), 
+  ACE_NTOHL (0x626a6563), 
+  ACE_NTOHL (0x744e6f74), 
+  ACE_NTOHL (0x41637469), 
+  ACE_NTOHL (0x76653a32), 
   ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA/ObjectNotActive:2.3
     16,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63744e6f),
-  ACE_NTOHL (0x74416374),
+  ACE_NTOHL (0x4f626a65), 
+  ACE_NTOHL (0x63744e6f), 
+  ACE_NTOHL (0x74416374), 
   ACE_NTOHL (0x69766500),  // name = ObjectNotActive
   0, // member count
   };
@@ -4563,7 +4615,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ObjectNotActive (
 ::CORBA::TypeCode_ptr PortableServer::POA::_tc_ObjectNotActive =
   &_tc_TAO_tc_PortableServer_POA_ObjectNotActive;
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (void)
@@ -4595,8 +4647,9 @@ PortableServer::POA::ServantAlreadyActive::operator= (const ::PortableServer::PO
 
 void PortableServer::POA::ServantAlreadyActive::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ServantAlreadyActive *tmp = ACE_static_cast (ServantAlreadyActive*, _tao_void_pointer);
-  delete tmp;
+  ServantAlreadyActive *_tao_tmp_pointer =
+    ACE_static_cast (ServantAlreadyActive*, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
 PortableServer::POA::ServantAlreadyActive *
@@ -4665,26 +4718,26 @@ static const CORBA::Long _oc_PortableServer_POA_ServantAlreadyActive[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   56,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f50),
-  ACE_NTOHL (0x4f412f53),
-  ACE_NTOHL (0x65727661),
-  ACE_NTOHL (0x6e74416c),
-  ACE_NTOHL (0x72656164),
-  ACE_NTOHL (0x79416374),
-  ACE_NTOHL (0x6976653a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f50), 
+  ACE_NTOHL (0x4f412f53), 
+  ACE_NTOHL (0x65727661), 
+  ACE_NTOHL (0x6e74416c), 
+  ACE_NTOHL (0x72656164), 
+  ACE_NTOHL (0x79416374), 
+  ACE_NTOHL (0x6976653a), 
   ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/POA/ServantAlreadyActive:2.3
     21,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x616e7441),
-  ACE_NTOHL (0x6c726561),
-  ACE_NTOHL (0x64794163),
-  ACE_NTOHL (0x74697665),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x616e7441), 
+  ACE_NTOHL (0x6c726561), 
+  ACE_NTOHL (0x64794163), 
+  ACE_NTOHL (0x74697665), 
   ACE_NTOHL (0x0),  // name = ServantAlreadyActive
   0, // member count
   };
@@ -4700,7 +4753,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ServantAlreadyActive (
 ::CORBA::TypeCode_ptr PortableServer::POA::_tc_ServantAlreadyActive =
   &_tc_TAO_tc_PortableServer_POA_ServantAlreadyActive;
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::ServantNotActive::ServantNotActive (void)
@@ -4732,8 +4785,9 @@ PortableServer::POA::ServantNotActive::operator= (const ::PortableServer::POA::S
 
 void PortableServer::POA::ServantNotActive::_tao_any_destructor (void *_tao_void_pointer)
 {
-  ServantNotActive *tmp = ACE_static_cast (ServantNotActive*, _tao_void_pointer);
-  delete tmp;
+  ServantNotActive *_tao_tmp_pointer =
+    ACE_static_cast (ServantNotActive*, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
 PortableServer::POA::ServantNotActive *
@@ -4802,24 +4856,24 @@ static const CORBA::Long _oc_PortableServer_POA_ServantNotActive[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   52,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f50),
-  ACE_NTOHL (0x4f412f53),
-  ACE_NTOHL (0x65727661),
-  ACE_NTOHL (0x6e744e6f),
-  ACE_NTOHL (0x74416374),
-  ACE_NTOHL (0x6976653a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f50), 
+  ACE_NTOHL (0x4f412f53), 
+  ACE_NTOHL (0x65727661), 
+  ACE_NTOHL (0x6e744e6f), 
+  ACE_NTOHL (0x74416374), 
+  ACE_NTOHL (0x6976653a), 
   ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/POA/ServantNotActive:2.3
     17,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x616e744e),
-  ACE_NTOHL (0x6f744163),
-  ACE_NTOHL (0x74697665),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x616e744e), 
+  ACE_NTOHL (0x6f744163), 
+  ACE_NTOHL (0x74697665), 
   ACE_NTOHL (0x0),  // name = ServantNotActive
   0, // member count
   };
@@ -4835,7 +4889,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ServantNotActive (
 ::CORBA::TypeCode_ptr PortableServer::POA::_tc_ServantNotActive =
   &_tc_TAO_tc_PortableServer_POA_ServantNotActive;
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::WrongAdapter::WrongAdapter (void)
@@ -4867,8 +4921,9 @@ PortableServer::POA::WrongAdapter::operator= (const ::PortableServer::POA::Wrong
 
 void PortableServer::POA::WrongAdapter::_tao_any_destructor (void *_tao_void_pointer)
 {
-  WrongAdapter *tmp = ACE_static_cast (WrongAdapter*, _tao_void_pointer);
-  delete tmp;
+  WrongAdapter *_tao_tmp_pointer =
+    ACE_static_cast (WrongAdapter*, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
 PortableServer::POA::WrongAdapter *
@@ -4937,22 +4992,22 @@ static const CORBA::Long _oc_PortableServer_POA_WrongAdapter[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   48,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f50),
-  ACE_NTOHL (0x4f412f57),
-  ACE_NTOHL (0x726f6e67),
-  ACE_NTOHL (0x41646170),
-  ACE_NTOHL (0x7465723a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f50), 
+  ACE_NTOHL (0x4f412f57), 
+  ACE_NTOHL (0x726f6e67), 
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x7465723a), 
   ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/POA/WrongAdapter:2.3
     13,
-  ACE_NTOHL (0x57726f6e),
-  ACE_NTOHL (0x67416461),
-  ACE_NTOHL (0x70746572),
+  ACE_NTOHL (0x57726f6e), 
+  ACE_NTOHL (0x67416461), 
+  ACE_NTOHL (0x70746572), 
   ACE_NTOHL (0x0),  // name = WrongAdapter
   0, // member count
   };
@@ -4968,7 +5023,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_WrongAdapter (
 ::CORBA::TypeCode_ptr PortableServer::POA::_tc_WrongAdapter =
   &_tc_TAO_tc_PortableServer_POA_WrongAdapter;
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::WrongPolicy::WrongPolicy (void)
@@ -5000,8 +5055,9 @@ PortableServer::POA::WrongPolicy::operator= (const ::PortableServer::POA::WrongP
 
 void PortableServer::POA::WrongPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
-  WrongPolicy *tmp = ACE_static_cast (WrongPolicy*, _tao_void_pointer);
-  delete tmp;
+  WrongPolicy *_tao_tmp_pointer =
+    ACE_static_cast (WrongPolicy*, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
 PortableServer::POA::WrongPolicy *
@@ -5070,21 +5126,21 @@ static const CORBA::Long _oc_PortableServer_POA_WrongPolicy[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   47,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f50),
-  ACE_NTOHL (0x4f412f57),
-  ACE_NTOHL (0x726f6e67),
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63793a32),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f50), 
+  ACE_NTOHL (0x4f412f57), 
+  ACE_NTOHL (0x726f6e67), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63793a32), 
   ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA/WrongPolicy:2.3
     12,
-  ACE_NTOHL (0x57726f6e),
-  ACE_NTOHL (0x67506f6c),
+  ACE_NTOHL (0x57726f6e), 
+  ACE_NTOHL (0x67506f6c), 
   ACE_NTOHL (0x69637900),  // name = WrongPolicy
   0, // member count
   };
@@ -5100,6 +5156,88 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_WrongPolicy (
 ::CORBA::TypeCode_ptr PortableServer::POA::_tc_WrongPolicy =
   &_tc_TAO_tc_PortableServer_POA_WrongPolicy;
 
+PortableServer::POA::POA (void)
+{}
+
+PortableServer::POA::~POA (void)
+{}
+
+void 
+PortableServer::POA::_tao_any_destructor (void *_tao_void_pointer)
+{
+  POA *_tao_tmp_pointer =
+    ACE_static_cast (POA *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
+}
+
+PortableServer::POA_ptr
+PortableServer::POA::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return POA::_nil ();
+    }
+  
+  POA_ptr proxy =
+    dynamic_cast<POA_ptr> (_tao_objref);
+  
+  return POA::_duplicate (proxy);
+}
+
+PortableServer::POA_ptr
+PortableServer::POA::_duplicate (POA_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+CORBA::Boolean
+PortableServer::POA::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/PortableServer/POA:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+const char* PortableServer::POA::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/PortableServer/POA:2.3";
+}
+
+CORBA::Boolean
+PortableServer::POA::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -5107,14 +5245,14 @@ static const CORBA::Long _oc_PortableServer_POA[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f50),
-  ACE_NTOHL (0x4f413a32),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f50), 
+  ACE_NTOHL (0x4f413a32), 
   ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA:2.3
     4,
   ACE_NTOHL (0x504f4100),  // name = POA
@@ -5128,160 +5266,55 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA (
     sizeof (PortableServer::POA)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_POA,
-    &_tc_TAO_tc_PortableServer_POA
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:61
-
-int PortableServer::Current::_tao_class_id = 0;
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-  template class
-    TAO_Objref_Var_T<
-        PortableServer::Current,
-        PortableServer::tao_Current_life
-      >;
-  template class
-    TAO_Objref_Out_T<
-        PortableServer::Current,
-        PortableServer::tao_Current_life
-      >;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableServer::Current, \
-        PortableServer::tao_Current_life \
-      >
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableServer::Current, \
-        PortableServer::tao_Current_life \
-      >
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_POA =
+    &_tc_TAO_tc_PortableServer_POA;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:232
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_cs.cpp:60
 
-PortableServer::Current::Current (void)
-{}
-
-PortableServer::Current::~Current (void)
-{}
-
-void
-PortableServer::Current::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Current *tmp = ACE_static_cast (Current *, _tao_void_pointer);
-  CORBA::release (tmp);
-}
+// Traits specializations for PortableServer::Current.
 
 PortableServer::Current_ptr
-PortableServer::Current::_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL
+TAO::Objref_Traits<PortableServer::Current>::tao_duplicate (
+    PortableServer::Current_ptr p
   )
 {
-  return Current::_unchecked_narrow (obj ACE_ENV_ARG_PARAMETER);
+  return PortableServer::Current::_duplicate (p);
 }
 
-PortableServer::Current_ptr
-PortableServer::Current::_unchecked_narrow (
-    CORBA::Object_ptr obj
-    ACE_ENV_ARG_DECL_NOT_USED
+void
+TAO::Objref_Traits<PortableServer::Current>::tao_release (
+    PortableServer::Current_ptr p
   )
 {
-  if (CORBA::is_nil (obj))
-    {
-      return Current::_nil ();
-    }
-
-  return
-      ACE_reinterpret_cast (
-          Current_ptr,
-          obj->_tao_QueryInterface (
-              ACE_reinterpret_cast (
-                  ptrdiff_t,
-                  &Current::_tao_class_id
-                )
-            )
-        );
+  CORBA::release (p);
 }
 
 PortableServer::Current_ptr
-PortableServer::Current::_duplicate (Current_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-void *PortableServer::Current::_tao_QueryInterface (ptrdiff_t type)
-{
-  void *retv = 0;
-
-  if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &ACE_NESTED_CLASS (::PortableServer, Current)::_tao_class_id)
-            )
-    {
-      retv = ACE_reinterpret_cast (void*, this);
-    }
-  else if (type == ACE_reinterpret_cast (
-              ptrdiff_t,
-              &::CORBA::Current::_tao_class_id)
-            )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (
-                CORBA::Current_ptr,
-                this
-              )
-          );
-    }
-  else if (type == ACE_reinterpret_cast (
-               ptrdiff_t,
-               &CORBA::Object::_tao_class_id)
-             )
-    {
-      retv =
-        ACE_reinterpret_cast (
-            void *,
-            ACE_static_cast (CORBA::Object_ptr, this)
-          );
-    }
-
-  if (retv != 0)
-    {
-      this->_add_ref ();
-    }
-
-  return retv;
-}
-
-const char* PortableServer::Current::_interface_repository_id (void) const
+TAO::Objref_Traits<PortableServer::Current>::tao_nil (void)
 {
-  return "IDL:omg.org/PortableServer/Current:2.3";
+  return PortableServer::Current::_nil ();
 }
 
 CORBA::Boolean
-PortableServer::Current::marshal (TAO_OutputCDR &)
+TAO::Objref_Traits<PortableServer::Current>::tao_marshal (
+    PortableServer::Current_ptr p,
+    TAO_OutputCDR & cdr
+  )
 {
-  return 0;
+  return p->marshal (cdr);
 }
 
-// TAO_IDL - Generated from
+// Function pointer for collocation factory initialization.
+TAO::Collocation_Proxy_Broker * 
+(*PortableServer__TAO_Current_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+  ) = 0;
+
+// TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::Current::NoContext::NoContext (void)
@@ -5313,8 +5346,9 @@ PortableServer::Current::NoContext::operator= (const ::PortableServer::Current::
 
 void PortableServer::Current::NoContext::_tao_any_destructor (void *_tao_void_pointer)
 {
-  NoContext *tmp = ACE_static_cast (NoContext*, _tao_void_pointer);
-  delete tmp;
+  NoContext *_tao_tmp_pointer =
+    ACE_static_cast (NoContext*, _tao_void_pointer);
+  delete _tao_tmp_pointer;
 }
 
 PortableServer::Current::NoContext *
@@ -5383,22 +5417,22 @@ static const CORBA::Long _oc_PortableServer_Current_NoContext[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   49,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f43),
-  ACE_NTOHL (0x75727265),
-  ACE_NTOHL (0x6e742f4e),
-  ACE_NTOHL (0x6f436f6e),
-  ACE_NTOHL (0x74657874),
-  ACE_NTOHL (0x3a322e33),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f43), 
+  ACE_NTOHL (0x75727265), 
+  ACE_NTOHL (0x6e742f4e), 
+  ACE_NTOHL (0x6f436f6e), 
+  ACE_NTOHL (0x74657874), 
+  ACE_NTOHL (0x3a322e33), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/PortableServer/Current/NoContext:2.3
     10,
-  ACE_NTOHL (0x4e6f436f),
-  ACE_NTOHL (0x6e746578),
+  ACE_NTOHL (0x4e6f436f), 
+  ACE_NTOHL (0x6e746578), 
   ACE_NTOHL (0x74000000),  // name = NoContext
   0, // member count
   };
@@ -5414,6 +5448,92 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_Current_NoContext (
 ::CORBA::TypeCode_ptr PortableServer::Current::_tc_NoContext =
   &_tc_TAO_tc_PortableServer_Current_NoContext;
 
+PortableServer::Current::Current (void)
+{}
+
+PortableServer::Current::~Current (void)
+{}
+
+void 
+PortableServer::Current::_tao_any_destructor (void *_tao_void_pointer)
+{
+  Current *_tao_tmp_pointer =
+    ACE_static_cast (Current *, _tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
+}
+
+PortableServer::Current_ptr
+PortableServer::Current::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return Current::_nil ();
+    }
+  
+  Current_ptr proxy =
+    dynamic_cast<Current_ptr> (_tao_objref);
+  
+  return Current::_duplicate (proxy);
+}
+
+PortableServer::Current_ptr
+PortableServer::Current::_duplicate (Current_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+CORBA::Boolean
+PortableServer::Current::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Current:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/PortableServer/Current:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          (char *)value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+     )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+const char* PortableServer::Current::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/PortableServer/Current:2.3";
+}
+
+CORBA::Boolean
+PortableServer::Current::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
@@ -5421,18 +5541,18 @@ static const CORBA::Long _oc_PortableServer_Current[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x506f7274),
-  ACE_NTOHL (0x61626c65),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x65722f43),
-  ACE_NTOHL (0x75727265),
-  ACE_NTOHL (0x6e743a32),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x506f7274), 
+  ACE_NTOHL (0x61626c65), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65722f43), 
+  ACE_NTOHL (0x75727265), 
+  ACE_NTOHL (0x6e743a32), 
   ACE_NTOHL (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/Current:2.3
     8,
-  ACE_NTOHL (0x43757272),
+  ACE_NTOHL (0x43757272), 
   ACE_NTOHL (0x656e7400),  // name = Current
   };
 
@@ -5444,16 +5564,13 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_Current (
     sizeof (PortableServer::Current)
   );
 
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (PortableServer)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_Current,
-    &_tc_TAO_tc_PortableServer_Current
-  )
-TAO_NAMESPACE_END
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_Current =
+    &_tc_TAO_tc_PortableServer_Current;
+}
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -5511,20 +5628,38 @@ CORBA::Boolean operator>>= (
       );
 }
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:50
 
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Dual_Impl_T<PortableServer::POAList>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<PortableServer::POAList>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest>::demarshal_value (
+    TAO_InputCDR & cdr
+  )
+{
+  CORBA::String_var id;
+  
+  if ((cdr >> id.out ()) == 0)
+    {
+      return 0;
+    }
+  
+  ACE_TRY_NEW_ENV
+    {
+      this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      return 0;
+    }
+  ACE_ENDTRY;
+  
+  return 1;
+}
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
-
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
@@ -5580,19 +5715,39 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest \>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:54
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<PortableServer::NotAGroupObject>::demarshal_value (
+    TAO_InputCDR & cdr
+  )
+{
+  CORBA::String_var id;
+  
+  if ((cdr >> id.out ()) == 0)
+    {
+      return 0;
+    }
+  
+  ACE_TRY_NEW_ENV
+    {
+      this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      return 0;
+    }
+  ACE_ENDTRY;
+  
+  return 1;
+}
 
 // Copying insertion.
 void operator<<= (
@@ -5649,14 +5804,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Dual_Impl_T<PortableServer::NotAGroupObject>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<PortableServer::NotAGroupObject \>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -5714,13 +5862,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Dual_Impl_T<PortableServer::IDs>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Dual_Impl_T<PortableServer::IDs>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52
 
@@ -5745,19 +5886,12 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<PortableServer::ThreadPolicyValue>::extract (
         _tao_any,
         PortableServer::_tc_ThreadPolicyValue,
-        _tao_elem
+        _tao_elem 
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Basic_Impl_T<PortableServer::ThreadPolicyValue>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Basic_Impl_T<PortableServer::ThreadPolicyValue \>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -5801,14 +5935,29 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<PortableServer::ThreadPolicy,PortableServer::ThreadPolicy_var,PortableServer::tao_ThreadPolicy_life>;
-  template class TAO::Any_Impl_T<PortableServer::ThreadPolicy>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<PortableServer::ThreadPolicy, PortableServer::ThreadPolicy_var,PortableServer::tao_ThreadPolicy_life>
-# pragma instantiate TAO::Any_Impl_T<PortableServer::ThreadPolicy>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ThreadPolicy>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ThreadPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ThreadPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
@@ -5836,19 +5985,12 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<PortableServer::LifespanPolicyValue>::extract (
         _tao_any,
         PortableServer::_tc_LifespanPolicyValue,
-        _tao_elem
+        _tao_elem 
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Basic_Impl_T<PortableServer::LifespanPolicyValue>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Basic_Impl_T<PortableServer::LifespanPolicyValue \>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -5892,12 +6034,29 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Impl_T<PortableServer::LifespanPolicy>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Impl_T<PortableServer::LifespanPolicy>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::LifespanPolicy>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::LifespanPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::LifespanPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52
@@ -5923,19 +6082,12 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<PortableServer::IdUniquenessPolicyValue>::extract (
         _tao_any,
         PortableServer::_tc_IdUniquenessPolicyValue,
-        _tao_elem
+        _tao_elem 
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Basic_Impl_T<PortableServer::IdUniquenessPolicyValue>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Basic_Impl_T<PortableServer::IdUniquenessPolicyValue \>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -5979,14 +6131,29 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<PortableServer::IdUniquenessPolicy,PortableServer::IdUniquenessPolicy_var,PortableServer::tao_IdUniquenessPolicy_life>;
-  template class TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<PortableServer::IdUniquenessPolicy, PortableServer::IdUniquenessPolicy_var,>
-# pragma instantiate TAO::Any_Impl_T<PortableServer::LifespanPolicy>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52
@@ -6012,19 +6179,12 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<PortableServer::IdAssignmentPolicyValue>::extract (
         _tao_any,
         PortableServer::_tc_IdAssignmentPolicyValue,
-        _tao_elem
+        _tao_elem 
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Basic_Impl_T<PortableServer::IdAssignmentPolicyValue>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Basic_Impl_T<PortableServer::IdAssignmentPolicyValue \>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -6068,20 +6228,29 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-template class TAO_Object_Manager<PortableServer::IdAssignmentPolicy,PortableServer::IdAssignmentPolicy_var,PortableServer::tao_IdAssignmentPolicy_life>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate TAO_Object_Manager<PortableServer::IdAssignmentPolicy,PortableServer::IdAssignmentPolicy_var,PortableServer::tao_IdAssignmentPolicy_life>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-template class TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Impl_T<PortableServer::LifespanPolicy>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
 
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
@@ -6109,19 +6278,12 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<PortableServer::ImplicitActivationPolicyValue>::extract (
         _tao_any,
         PortableServer::_tc_ImplicitActivationPolicyValue,
-        _tao_elem
+        _tao_elem 
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Basic_Impl_T<PortableServer::ImplicitActivationPolicyValue>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Basic_Impl_T<PortableServer::ImplicitActivationPolicyValue \>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -6165,14 +6327,29 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<PortableServer::ImplicitActivationPolicy,PortableServer::ImplicitActivationPolicy_var,PortableServer::tao_ImplicitActivationPolicy_life>;
-  template class TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<PortableServer::ImplicitActivationPolicy, PortableServer::ImplicitActivationPolicy_var,PortableServer::tao_ImplicitActivationPolicy_life>
-# pragma instantiate TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52
@@ -6198,19 +6375,12 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<PortableServer::ServantRetentionPolicyValue>::extract (
         _tao_any,
         PortableServer::_tc_ServantRetentionPolicyValue,
-        _tao_elem
+        _tao_elem 
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Basic_Impl_T<PortableServer::ServantRetentionPolicyValue>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Basic_Impl_T<PortableServer::ServantRetentionPolicyValue \>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -6254,12 +6424,29 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52
@@ -6285,19 +6472,12 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<PortableServer::RequestProcessingPolicyValue>::extract (
         _tao_any,
         PortableServer::_tc_RequestProcessingPolicyValue,
-        _tao_elem
+        _tao_elem 
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO::Any_Basic_Impl_T<PortableServer::RequestProcessingPolicyValue>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO::Any_Basic_Impl_T<PortableServer::RequestProcessingPolicyValue \>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -6341,19 +6521,34 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<PortableServer::RequestProcessingPolicy,PortableServer::RequestProcessingPolicy_var,PortableServer::tao_RequestProcessingPolicy_life>;
-  template class TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<PortableServer::RequestProcessingPolicy, PortableServer::RequestProcessingPolicy_var,PortableServer::tao_RequestProcessingPolicy_life>
-# pragma instantiate TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -6397,19 +6592,34 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<PortableServer::POAManager,PortableServer::POAManager_var,PortableServer::tao_POAManager_life>;
-  template class TAO::Any_Impl_T<PortableServer::POAManager>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<PortableServer::POAManager, PortableServer::POAManager_var>
-# pragma instantiate TAO::Any_Impl_T<PortableServer::POAManager>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::POAManager>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::POAManager>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::POAManager>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -6453,17 +6663,32 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<PortableServer::AdapterActivator,PortableServer::AdapterActivator_var,PortableServer::tao_AdapterActivator_life>;
-  template class TAO::Any_Impl_T<PortableServer::AdapterActivator>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<PortableServer::AdapterActivator, PortableServer::AdapterActivator_var,PortableServer::tao_AdapterActivator_life>
-# pragma instantiate TAO::Any_Impl_T<PortableServer::AdapterActivator>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::AdapterActivator>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::AdapterActivator>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::AdapterActivator>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -6507,17 +6732,32 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<PortableServer::ServantManager,PortableServer::ServantManager_var,PortableServer::tao_ServantManager_life>;
-  template class TAO::Any_Impl_T<PortableServer::ServantManager>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<PortableServer::ServantManager, PortableServer::ServantManager_var,PortableServer::tao_ServantManager_life>
-# pragma instantiate TAO::Any_Impl_T<PortableServer::ServantManager>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantManager>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantManager>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantManager>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -6561,17 +6801,32 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<PortableServer::ServantActivator,PortableServer::ServantActivator_var,PortableServer::tao_ServantActivator_life>;
-  template class TAO::Any_Impl_T<PortableServer::ServantActivator>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<PortableServer::ServantActivator, PortableServer::ServantActivator_var, PortableServer::tao_ServantActivator_life>
-# pragma instantiate TAO::Any_Impl_T<PortableServer::ServantActivator>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantActivator>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantActivator>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantActivator>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -6615,19 +6870,34 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-  template class TAO_Object_Manager<PortableServer::ServantLocator,PortableServer::ServantLocator_var,PortableServer::tao_ServantLocator_life>;
-  template class TAO::Any_Impl_T<PortableServer::ServantLocator>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<PortableServer::ServantLocator, PortableServer::ServantLocator_var,PortableServer::tao_ServantLocator_life>
-# pragma instantiate TAO::Any_Impl_T<PortableServer::ServantLocator>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantLocator>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantLocator>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantLocator>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -6671,17 +6941,32 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-template class TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var,PortableServer::tao_POA_life>;
-template class TAO::Any_Impl_T<PortableServer::POA>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<PortableServer::POA, PortableServer::POA_var,PortableServer::tao_POA_life>
-# pragma instantiate TAO::Any_Impl_T<PortableServer::POA>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::POA>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::POA>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::POA>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:52
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50
 
 // Copying insertion.
 void
@@ -6725,107 +7010,77 @@ operator>>= (
       );
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-    defined (ACE_HAS_GNU_REPO)
-template class TAO_Object_Manager<PortableServer::Current,PortableServer::Current_var, PortableServer::tao_Current_life>;
-template class TAO::Any_Impl_T<PortableServer::Current>;
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-# pragma instantiate TAO_Object_Manager<PortableServer::Current, PortableServer::Current_var,PortableServer::tao_Current_life>
-# pragma instantiate TAO::Any_Impl_T<PortableServer::Current>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::Current>::to_object (
+    CORBA::Object_ptr &_tao_elem
+  ) const
+{
+  _tao_elem = CORBA::Object::_duplicate (this->value_);
+  return 1;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::Current>::marshal_value (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::Current>::demarshal_value (TAO_InputCDR &)
+{
+  return 0;
+}
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
-#if 0
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:95
+
+#if !defined _TAO_CDR_OP_PortableServer_POAList_CPP_
+#define _TAO_CDR_OP_PortableServer_POAList_CPP_
+
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const PortableServer::ObjectId &_tao_sequence
+    const PortableServer::POAList &_tao_sequence
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-      {
-        TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-          ACE_static_cast (TAO_Unbounded_Sequence<CORBA::Octet>*, (PortableServer::ObjectId *)&_tao_sequence);
-        if (oseq->mb ())
-          return strm.write_octet_array_mb (oseq->mb ());
-        else
-          return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-      }
-
-#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-      return strm.write_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
+      CORBA::Boolean _tao_marshal_flag = 1;
+      
+      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
+        {
+          _tao_marshal_flag =
+            _tao_sequence[i].in ()->marshal (strm);
+        }
+      
+      return _tao_marshal_flag;
     }
-
+  
   return 0;
 }
 
 CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    PortableServer::ObjectId &_tao_sequence
+    TAO_InputCDR &,
+    PortableServer::POAList &
   )
 {
-  CORBA::ULong _tao_seq_len;
-
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return 0;
-        }
-
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
-        {
-          return 1;
-        }
-
-      // Retrieve all the elements.
-
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-      if (ACE_BIT_DISABLED (strm.start ()->flags (),
-      ACE_Message_Block::DONT_DELETE))
-      {
-        TAO_ORB_Core* orb_core = strm.orb_core ();
-        if (orb_core != 0 &&
-        strm.orb_core ()->resource_factory ()->
-        input_cdr_allocator_type_locked () == 1)
-        {
-          TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-            ACE_static_cast(TAO_Unbounded_Sequence<CORBA::Octet>*, &_tao_sequence);
-          oseq->replace (_tao_seq_len, strm.start ());
-          oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
-          strm.skip_bytes (_tao_seq_len);
-          return 1;
-        }
-      }
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_seq_len);
-#else /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-      return strm.read_octet_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
-
-#endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
-    }
-
   return 0;
 }
-#endif
+
+#endif /* _TAO_CDR_OP_PortableServer_POAList_CPP_ */
+
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:93
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:95
+
+#if !defined _TAO_CDR_OP_PortableServer_IDs_CPP_
+#define _TAO_CDR_OP_PortableServer_IDs_CPP_
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -6833,70 +7088,1747 @@ CORBA::Boolean operator<< (
   )
 {
   CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-
+  
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
     }
+  
+  return 0;
+}
 
-    return 0;
-  }
-
-    CORBA::Boolean operator>> (
-      TAO_InputCDR &strm,
-      PortableServer::IDs &_tao_sequence
-    )
-  {
-    CORBA::ULong _tao_seq_len;
-
-    if (strm >> _tao_seq_len)
-      {
-        // Add a check to the length of the sequence
-        // to make sure it does not exceed the length
-        // of the stream. (See bug 58.)
-        if (_tao_seq_len > strm.length ())
-          {
-            return 0;
-          }
-
-        // Set the length of the sequence.
-        _tao_sequence.length (_tao_seq_len);
-
-        // If length is 0 we return true.
-        if (0 >= _tao_seq_len)
-          {
-            return 1;
-          }
-
-        // Retrieve all the elements.
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    PortableServer::IDs &_tao_sequence
+  )
+{
+  CORBA::ULong _tao_seq_len;
+  
+  if (strm >> _tao_seq_len)
+    {
+      // Add a check to the length of the sequence
+      // to make sure it does not exceed the length
+      // of the stream. (See bug 58.)
+      if (_tao_seq_len > strm.length ())
+        {
+          return 0;
         }
-
+      
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-
+      
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len)
+      if (0 >= _tao_seq_len) 
         {
           return 1;
         }
-
+      
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = 1;
-
+      
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-
+      
       return _tao_marshal_flag;
+    
     }
+  
+  return 0;
+}
+
+#endif /* _TAO_CDR_OP_PortableServer_IDs_CPP_ */
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root.cpp:1703
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
+#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<CORBA::PolicyList>;
+
+  template class
+    TAO::Var_Size_Arg_Traits<
+        CORBA::PolicyList,
+        CORBA::PolicyList_var,
+        CORBA::PolicyList_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        CORBA::SetOverrideType
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        CORBA::PolicyError
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        CORBA::InvalidPolicies
+      >;
+
+#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
+#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<CORBA::OctetSeq>;
+
+  template class
+    TAO::Var_Size_Arg_Traits<
+        CORBA::OctetSeq,
+        CORBA::OctetSeq_var,
+        CORBA::OctetSeq_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        CORBA::TCKind
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        CORBA::exception_type
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        CORBA::ParameterMode
+      >;
+
+#if !defined (_PORTABLESERVER_POA__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_POA__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<PortableServer::POA>;
+
+  template class
+    TAO::Object_Arg_Traits_T<
+        PortableServer::POA_ptr,
+        PortableServer::POA_var,
+        PortableServer::POA_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::POA::AdapterAlreadyExists
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::POA::AdapterNonExistent
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::POA::InvalidPolicy
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::POA::NoServant
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::POA::ObjectAlreadyActive
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::POA::ObjectNotActive
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::POA::ServantAlreadyActive
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::POA::ServantNotActive
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::POA::WrongAdapter
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::POA::WrongPolicy
+      >;
+
+  template class
+    TAO::Ret_Object_Argument_T<
+        PortableServer::POA_ptr,
+        PortableServer::POA_var
+      >;
+
+  template class
+    TAO::In_Object_Argument_T<
+        PortableServer::POAManager_ptr
+      >;
+
+  template class
+    TAO::In_Var_Size_Argument_T<
+        CORBA::sequence
+      >;
+
+  template class
+    TAO::Ret_Object_Argument_T<
+        PortableServer::ThreadPolicy_ptr,
+        PortableServer::ThreadPolicy_var
+      >;
+
+  template class
+    TAO::In_Basic_Argument_T<
+        PortableServer::ThreadPolicyValue
+      >;
+
+  template class
+    TAO::Ret_Object_Argument_T<
+        PortableServer::LifespanPolicy_ptr,
+        PortableServer::LifespanPolicy_var
+      >;
+
+  template class
+    TAO::In_Basic_Argument_T<
+        PortableServer::LifespanPolicyValue
+      >;
+
+  template class
+    TAO::Ret_Object_Argument_T<
+        PortableServer::IdUniquenessPolicy_ptr,
+        PortableServer::IdUniquenessPolicy_var
+      >;
+
+  template class
+    TAO::In_Basic_Argument_T<
+        PortableServer::IdUniquenessPolicyValue
+      >;
+
+  template class
+    TAO::Ret_Object_Argument_T<
+        PortableServer::IdAssignmentPolicy_ptr,
+        PortableServer::IdAssignmentPolicy_var
+      >;
+
+  template class
+    TAO::In_Basic_Argument_T<
+        PortableServer::IdAssignmentPolicyValue
+      >;
+
+  template class
+    TAO::Ret_Object_Argument_T<
+        PortableServer::ImplicitActivationPolicy_ptr,
+        PortableServer::ImplicitActivationPolicy_var
+      >;
+
+  template class
+    TAO::In_Basic_Argument_T<
+        PortableServer::ImplicitActivationPolicyValue
+      >;
+
+  template class
+    TAO::Ret_Object_Argument_T<
+        PortableServer::ServantRetentionPolicy_ptr,
+        PortableServer::ServantRetentionPolicy_var
+      >;
+
+  template class
+    TAO::In_Basic_Argument_T<
+        PortableServer::ServantRetentionPolicyValue
+      >;
+
+  template class
+    TAO::Ret_Object_Argument_T<
+        PortableServer::RequestProcessingPolicy_ptr,
+        PortableServer::RequestProcessingPolicy_var
+      >;
+
+  template class
+    TAO::In_Basic_Argument_T<
+        PortableServer::RequestProcessingPolicyValue
+      >;
+
+  template class
+    TAO::Ret_Object_Argument_T<
+        PortableServer::ServantManager_ptr,
+        PortableServer::ServantManager_var
+      >;
+
+  template class
+    TAO::In_Object_Argument_T<
+        PortableServer::ServantManager_ptr
+      >;
+
+  template class
+    TAO::Ret_Var_Size_Argument_T<
+        CORBA::sequence,
+        CORBA::sequence_var
+      >;
+
+  template class
+    TAO::In_Var_Size_Argument_T<
+        CORBA::sequence
+      >;
+
+  template class
+    TAO::Ret_Var_Size_Argument_T<
+        PortableServer::IDs,
+        PortableServer::IDs_var
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::POA,
+        TAO::Objref_Traits<PortableServer::POA>
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::POA,
+        TAO::Objref_Traits<PortableServer::POA>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        PortableServer::POA
+      >;
+
+#if !defined (_PORTABLESERVER_POALIST__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_POALIST__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<PortableServer::POAList>;
+
+  template class
+    TAO::Var_Size_Arg_Traits<
+        PortableServer::POAList,
+        PortableServer::POAList_var,
+        PortableServer::POAList_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_Object_Manager<
+        PortableServer::POA,
+        PortableServer::POA_va,
+      >;
+
+  template class
+    TAO_MngSeq_Var_T<
+        PortableServer::POAList,
+        TAO_Object_Manager<
+            PortableServer::POA,
+            PortableServer::POA_var
+          >
+      >;
+
+  template class
+    TAO_Seq_Var_Base_T<
+        PortableServer::POAList,
+        TAO_Object_Manager<
+            PortableServer::POA,
+            PortableServer::POA_var
+          >
+      >;
+
+  template class
+    TAO_MngSeq_Out_T<
+        PortableServer::POAList,
+        PortableServer::POAList_var,
+        TAO_Object_Manager<
+            PortableServer::POA,
+            PortableServer::POA_var
+          >
+      >;
+
+#if !defined (_PORTABLESERVER_POALIST_CS_)
+#define _PORTABLESERVER_POALIST_CS_
+
+  template class
+    TAO_Unbounded_Object_Sequence<
+        PortableServer::POA,
+        PortableServer::POA_var
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::POAList
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::ForwardRequest
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::NotAGroupObject
+      >;
+
+#if !defined (_PORTABLESERVER_IDS__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_IDS__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<PortableServer::IDs>;
+
+  template class
+    TAO::Var_Size_Arg_Traits<
+        PortableServer::IDs,
+        PortableServer::IDs_var,
+        PortableServer::IDs_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_VarSeq_Var_T<
+        PortableServer::IDs,
+        PortableServer::ObjectId
+      >;
+
+  template class
+    TAO_Seq_Var_Base_T<
+        PortableServer::IDs,
+        PortableServer::ObjectId
+      >;
+
+  template class
+    TAO_Seq_Out_T<
+        PortableServer::IDs,
+        PortableServer::IDs_var,
+        PortableServer::ObjectId
+      >;
+
+#if !defined (_PORTABLESERVER_IDS_CS_)
+#define _PORTABLESERVER_IDS_CS_
+
+  template class
+    TAO_Unbounded_Sequence<
+        PortableServer::ObjectId
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::IDs
+      >;
+
+#if !defined (_PORTABLESERVER_THREADPOLICYVALUE__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_THREADPOLICYVALUE__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<PortableServer::ThreadPolicyValue>;
+
+  template class TAO::Basic_Arg_Traits_T<PortableServer::ThreadPolicyValue>;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        PortableServer::ThreadPolicyValue
+      >;
+
+#if !defined (_PORTABLESERVER_THREADPOLICY__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_THREADPOLICY__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<PortableServer::ThreadPolicy>;
+
+  template class
+    TAO::Object_Arg_Traits_T<
+        PortableServer::ThreadPolicy_ptr,
+        PortableServer::ThreadPolicy_var,
+        PortableServer::ThreadPolicy_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::ThreadPolicy,
+        TAO::Objref_Traits<PortableServer::ThreadPolicy>
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::ThreadPolicy,
+        TAO::Objref_Traits<PortableServer::ThreadPolicy>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        PortableServer::ThreadPolicy
+      >;
+
+#if !defined (_PORTABLESERVER_LIFESPANPOLICYVALUE__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_LIFESPANPOLICYVALUE__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<PortableServer::LifespanPolicyValue>;
+
+  template class TAO::Basic_Arg_Traits_T<PortableServer::LifespanPolicyValue>;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        PortableServer::LifespanPolicyValue
+      >;
+
+#if !defined (_PORTABLESERVER_LIFESPANPOLICY__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_LIFESPANPOLICY__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<PortableServer::LifespanPolicy>;
+
+  template class
+    TAO::Object_Arg_Traits_T<
+        PortableServer::LifespanPolicy_ptr,
+        PortableServer::LifespanPolicy_var,
+        PortableServer::LifespanPolicy_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::LifespanPolicy,
+        TAO::Objref_Traits<PortableServer::LifespanPolicy>
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::LifespanPolicy,
+        TAO::Objref_Traits<PortableServer::LifespanPolicy>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        PortableServer::LifespanPolicy
+      >;
+
+#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICYVALUE__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_IDUNIQUENESSPOLICYVALUE__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<PortableServer::IdUniquenessPolicyValue>;
+
+  template class TAO::Basic_Arg_Traits_T<PortableServer::IdUniquenessPolicyValue>;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        PortableServer::IdUniquenessPolicyValue
+      >;
+
+#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_IDUNIQUENESSPOLICY__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<PortableServer::IdUniquenessPolicy>;
+
+  template class
+    TAO::Object_Arg_Traits_T<
+        PortableServer::IdUniquenessPolicy_ptr,
+        PortableServer::IdUniquenessPolicy_var,
+        PortableServer::IdUniquenessPolicy_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::IdUniquenessPolicy,
+        TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::IdUniquenessPolicy,
+        TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        PortableServer::IdUniquenessPolicy
+      >;
+
+#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICYVALUE__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_IDASSIGNMENTPOLICYVALUE__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<PortableServer::IdAssignmentPolicyValue>;
+
+  template class TAO::Basic_Arg_Traits_T<PortableServer::IdAssignmentPolicyValue>;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        PortableServer::IdAssignmentPolicyValue
+      >;
+
+#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_IDASSIGNMENTPOLICY__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<PortableServer::IdAssignmentPolicy>;
+
+  template class
+    TAO::Object_Arg_Traits_T<
+        PortableServer::IdAssignmentPolicy_ptr,
+        PortableServer::IdAssignmentPolicy_var,
+        PortableServer::IdAssignmentPolicy_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::IdAssignmentPolicy,
+        TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::IdAssignmentPolicy,
+        TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        PortableServer::IdAssignmentPolicy
+      >;
+
+#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICYVALUE__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICYVALUE__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<PortableServer::ImplicitActivationPolicyValue>;
+
+  template class TAO::Basic_Arg_Traits_T<PortableServer::ImplicitActivationPolicyValue>;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        PortableServer::ImplicitActivationPolicyValue
+      >;
+
+#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<PortableServer::ImplicitActivationPolicy>;
+
+  template class
+    TAO::Object_Arg_Traits_T<
+        PortableServer::ImplicitActivationPolicy_ptr,
+        PortableServer::ImplicitActivationPolicy_var,
+        PortableServer::ImplicitActivationPolicy_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::ImplicitActivationPolicy,
+        TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::ImplicitActivationPolicy,
+        TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        PortableServer::ImplicitActivationPolicy
+      >;
+
+#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICYVALUE__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_SERVANTRETENTIONPOLICYVALUE__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<PortableServer::ServantRetentionPolicyValue>;
+
+  template class TAO::Basic_Arg_Traits_T<PortableServer::ServantRetentionPolicyValue>;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        PortableServer::ServantRetentionPolicyValue
+      >;
+
+#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_SERVANTRETENTIONPOLICY__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<PortableServer::ServantRetentionPolicy>;
+
+  template class
+    TAO::Object_Arg_Traits_T<
+        PortableServer::ServantRetentionPolicy_ptr,
+        PortableServer::ServantRetentionPolicy_var,
+        PortableServer::ServantRetentionPolicy_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::ServantRetentionPolicy,
+        TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::ServantRetentionPolicy,
+        TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        PortableServer::ServantRetentionPolicy
+      >;
+
+#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICYVALUE__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_REQUESTPROCESSINGPOLICYVALUE__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<PortableServer::RequestProcessingPolicyValue>;
+
+  template class TAO::Basic_Arg_Traits_T<PortableServer::RequestProcessingPolicyValue>;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        PortableServer::RequestProcessingPolicyValue
+      >;
+
+#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<PortableServer::RequestProcessingPolicy>;
+
+  template class
+    TAO::Object_Arg_Traits_T<
+        PortableServer::RequestProcessingPolicy_ptr,
+        PortableServer::RequestProcessingPolicy_var,
+        PortableServer::RequestProcessingPolicy_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::RequestProcessingPolicy,
+        TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::RequestProcessingPolicy,
+        TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        PortableServer::RequestProcessingPolicy
+      >;
+
+#if !defined (_PORTABLESERVER_POAMANAGER__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_POAMANAGER__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<PortableServer::POAManager>;
+
+  template class
+    TAO::Object_Arg_Traits_T<
+        PortableServer::POAManager_ptr,
+        PortableServer::POAManager_var,
+        PortableServer::POAManager_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::POAManager::AdapterInactive
+      >;
+
+#if !defined (_PORTABLESERVER_POAMANAGER_STATE__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_POAMANAGER_STATE__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<PortableServer::POAManager::State>;
+
+  template class TAO::Basic_Arg_Traits_T<PortableServer::POAManager::State>;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        PortableServer::POAManager::State
+      >;
+
+  template class
+    TAO::Ret_Basic_Argument_T<
+        PortableServer::POAManager::State
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::POAManager,
+        TAO::Objref_Traits<PortableServer::POAManager>
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::POAManager,
+        TAO::Objref_Traits<PortableServer::POAManager>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        PortableServer::POAManager
+      >;
+
+#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<PortableServer::AdapterActivator>;
+
+  template class
+    TAO::Object_Arg_Traits_T<
+        PortableServer::AdapterActivator_ptr,
+        PortableServer::AdapterActivator_var,
+        PortableServer::AdapterActivator_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO::In_Object_Argument_T<
+        PortableServer::POA_ptr
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::AdapterActivator,
+        TAO::Objref_Traits<PortableServer::AdapterActivator>
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::AdapterActivator,
+        TAO::Objref_Traits<PortableServer::AdapterActivator>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        PortableServer::AdapterActivator
+      >;
+
+#if !defined (_PORTABLESERVER_SERVANTMANAGER__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_SERVANTMANAGER__ARG_TRAITS_TMPLINST_CS_
+
+  template class TAO::Arg_Traits<PortableServer::ServantManager>;
+
+  template class
+    TAO::Object_Arg_Traits_T<
+        PortableServer::ServantManager_ptr,
+        PortableServer::ServantManager_var,
+        PortableServer::ServantManager_out
+      >;
+
+#endif /* end #if !defined */
+
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::ServantManager,
+        TAO::Objref_Traits<PortableServer::ServantManager>
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::ServantManager,
+        TAO::Objref_Traits<PortableServer::ServantManager>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        PortableServer::ServantManager
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::ServantActivator,
+        TAO::Objref_Traits<PortableServer::ServantActivator>
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::ServantActivator,
+        TAO::Objref_Traits<PortableServer::ServantActivator>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        PortableServer::ServantActivator
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::ServantLocator,
+        TAO::Objref_Traits<PortableServer::ServantLocator>
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::ServantLocator,
+        TAO::Objref_Traits<PortableServer::ServantLocator>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        PortableServer::ServantLocator
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::Current::NoContext
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::Current,
+        TAO::Objref_Traits<PortableServer::Current>
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::Current,
+        TAO::Objref_Traits<PortableServer::Current>
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        PortableServer::Current
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
+#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<CORBA::PolicyList>
+
+# pragma instantiate \
+    TAO::Var_Size_Arg_Traits< \
+        CORBA::PolicyList, \
+        CORBA::PolicyList_var, \
+        CORBA::PolicyList_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        CORBA::SetOverrideType \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        CORBA::PolicyError \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        CORBA::InvalidPolicies \
+      >
+
+#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
+#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<CORBA::OctetSeq>
+
+# pragma instantiate \
+    TAO::Var_Size_Arg_Traits< \
+        CORBA::OctetSeq, \
+        CORBA::OctetSeq_var, \
+        CORBA::OctetSeq_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        CORBA::TCKind \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        CORBA::exception_type \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        CORBA::ParameterMode \
+      >
+
+#if !defined (_PORTABLESERVER_POA__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_POA__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<PortableServer::POA>
+
+# pragma instantiate \
+    TAO::Object_Arg_Traits_T< \
+        PortableServer::POA_ptr, \
+        PortableServer::POA_var, \
+        PortableServer::POA_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::POA::AdapterAlreadyExists \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::POA::AdapterNonExistent \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::POA::InvalidPolicy \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::POA::NoServant \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::POA::ObjectAlreadyActive \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::POA::ObjectNotActive \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::POA::ServantAlreadyActive \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::POA::ServantNotActive \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::POA::WrongAdapter \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::POA::WrongPolicy \
+      >
+
+# pragma instantiate \
+    TAO::In_Object_Argument_T< \
+        PortableServer::POAManager_ptr \
+      >
+
+# pragma instantiate \
+    TAO::In_Var_Size_Argument_T< \
+        CORBA::sequence \
+      >
+
+# pragma instantiate \
+    TAO::In_Basic_Argument_T< \
+        PortableServer::ThreadPolicyValue \
+      >
+
+# pragma instantiate \
+    TAO::In_Basic_Argument_T< \
+        PortableServer::LifespanPolicyValue \
+      >
+
+# pragma instantiate \
+    TAO::In_Basic_Argument_T< \
+        PortableServer::IdUniquenessPolicyValue \
+      >
+
+# pragma instantiate \
+    TAO::In_Basic_Argument_T< \
+        PortableServer::IdAssignmentPolicyValue \
+      >
+
+# pragma instantiate \
+    TAO::In_Basic_Argument_T< \
+        PortableServer::ImplicitActivationPolicyValue \
+      >
+
+# pragma instantiate \
+    TAO::In_Basic_Argument_T< \
+        PortableServer::ServantRetentionPolicyValue \
+      >
+
+# pragma instantiate \
+    TAO::In_Basic_Argument_T< \
+        PortableServer::RequestProcessingPolicyValue \
+      >
+
+# pragma instantiate \
+    TAO::In_Object_Argument_T< \
+        PortableServer::ServantManager_ptr \
+      >
+
+# pragma instantiate \
+    TAO::In_Var_Size_Argument_T< \
+        CORBA::sequence \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::POA, \
+        TAO::Objref_Traits<PortableServer::POA> \
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::POA, \
+        TAO::Objref_Traits<PortableServer::POA> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        PortableServer::POA \
+      >
+
+#if !defined (_PORTABLESERVER_POALIST__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_POALIST__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<PortableServer::POAList>
+
+# pragma instantiate \
+    TAO::Var_Size_Arg_Traits< \
+        PortableServer::POAList, \
+        PortableServer::POAList_var, \
+        PortableServer::POAList_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_MngSeq_Var_T< \
+        PortableServer::POAList, \
+        TAO_Object_Manager< \
+            PortableServer::POA, \
+            PortableServer::POA_var \
+          > \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Var_Base_T< \
+        PortableServer::POAList, \
+        TAO_Object_Manager< \
+            PortableServer::POA, \
+            PortableServer::POA_var \
+          > \
+      >
+
+# pragma instantiate \
+    TAO_MngSeq_Out_T< \
+        PortableServer::POAList, \
+        PortableServer::POAList_var, \
+        TAO_Object_Manager< \
+            PortableServer::POA, \
+            PortableServer::POA_var \
+          > \
+      >
+
+#if !defined (_PORTABLESERVER_POALIST_CS_)
+#define _PORTABLESERVER_POALIST_CS_
+
+# pragma instantiate \
+    TAO_Unbounded_Object_Sequence< \
+        PortableServer::POA, \
+        PortableServer::POA_var \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::POAList \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::ForwardRequest \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::NotAGroupObject \
+      >
+
+#if !defined (_PORTABLESERVER_IDS__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_IDS__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<PortableServer::IDs>
+
+# pragma instantiate \
+    TAO::Var_Size_Arg_Traits< \
+        PortableServer::IDs, \
+        PortableServer::IDs_var, \
+        PortableServer::IDs_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_VarSeq_Var_T< \
+        PortableServer::IDs, \
+        PortableServer::ObjectId \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Var_Base_T< \
+        PortableServer::IDs, \
+        PortableServer::ObjectId \
+      >
+
+# pragma instantiate \
+    TAO_Seq_Out_T< \
+        PortableServer::IDs, \
+        PortableServer::IDs_var, \
+        PortableServer::ObjectId \
+      >
+
+#if !defined (_PORTABLESERVER_IDS_CS_)
+#define _PORTABLESERVER_IDS_CS_
+
+# pragma instantiate \
+    TAO_Unbounded_Sequence< \
+        PortableServer::ObjectId \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::IDs \
+      >
+
+#if !defined (_PORTABLESERVER_THREADPOLICYVALUE__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_THREADPOLICYVALUE__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<PortableServer::ThreadPolicyValue>
+
+# pragma instantiate TAO::Basic_Arg_Traits_T<PortableServer::ThreadPolicyValue>
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        PortableServer::ThreadPolicyValue \
+      >
+
+#if !defined (_PORTABLESERVER_THREADPOLICY__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_THREADPOLICY__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<PortableServer::ThreadPolicy>
+
+# pragma instantiate \
+    TAO::Object_Arg_Traits_T< \
+        PortableServer::ThreadPolicy_ptr, \
+        PortableServer::ThreadPolicy_var, \
+        PortableServer::ThreadPolicy_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::ThreadPolicy, \
+        TAO::Objref_Traits<PortableServer::ThreadPolicy> \
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::ThreadPolicy, \
+        TAO::Objref_Traits<PortableServer::ThreadPolicy> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        PortableServer::ThreadPolicy \
+      >
+
+#if !defined (_PORTABLESERVER_LIFESPANPOLICYVALUE__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_LIFESPANPOLICYVALUE__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<PortableServer::LifespanPolicyValue>
+
+# pragma instantiate TAO::Basic_Arg_Traits_T<PortableServer::LifespanPolicyValue>
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        PortableServer::LifespanPolicyValue \
+      >
+
+#if !defined (_PORTABLESERVER_LIFESPANPOLICY__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_LIFESPANPOLICY__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<PortableServer::LifespanPolicy>
+
+# pragma instantiate \
+    TAO::Object_Arg_Traits_T< \
+        PortableServer::LifespanPolicy_ptr, \
+        PortableServer::LifespanPolicy_var, \
+        PortableServer::LifespanPolicy_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::LifespanPolicy, \
+        TAO::Objref_Traits<PortableServer::LifespanPolicy> \
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::LifespanPolicy, \
+        TAO::Objref_Traits<PortableServer::LifespanPolicy> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        PortableServer::LifespanPolicy \
+      >
+
+#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICYVALUE__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_IDUNIQUENESSPOLICYVALUE__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<PortableServer::IdUniquenessPolicyValue>
+
+# pragma instantiate TAO::Basic_Arg_Traits_T<PortableServer::IdUniquenessPolicyValue>
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        PortableServer::IdUniquenessPolicyValue \
+      >
+
+#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_IDUNIQUENESSPOLICY__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<PortableServer::IdUniquenessPolicy>
+
+# pragma instantiate \
+    TAO::Object_Arg_Traits_T< \
+        PortableServer::IdUniquenessPolicy_ptr, \
+        PortableServer::IdUniquenessPolicy_var, \
+        PortableServer::IdUniquenessPolicy_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::IdUniquenessPolicy, \
+        TAO::Objref_Traits<PortableServer::IdUniquenessPolicy> \
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::IdUniquenessPolicy, \
+        TAO::Objref_Traits<PortableServer::IdUniquenessPolicy> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        PortableServer::IdUniquenessPolicy \
+      >
+
+#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICYVALUE__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_IDASSIGNMENTPOLICYVALUE__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<PortableServer::IdAssignmentPolicyValue>
+
+# pragma instantiate TAO::Basic_Arg_Traits_T<PortableServer::IdAssignmentPolicyValue>
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        PortableServer::IdAssignmentPolicyValue \
+      >
+
+#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_IDASSIGNMENTPOLICY__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<PortableServer::IdAssignmentPolicy>
+
+# pragma instantiate \
+    TAO::Object_Arg_Traits_T< \
+        PortableServer::IdAssignmentPolicy_ptr, \
+        PortableServer::IdAssignmentPolicy_var, \
+        PortableServer::IdAssignmentPolicy_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::IdAssignmentPolicy, \
+        TAO::Objref_Traits<PortableServer::IdAssignmentPolicy> \
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::IdAssignmentPolicy, \
+        TAO::Objref_Traits<PortableServer::IdAssignmentPolicy> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        PortableServer::IdAssignmentPolicy \
+      >
+
+#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICYVALUE__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICYVALUE__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<PortableServer::ImplicitActivationPolicyValue>
+
+# pragma instantiate TAO::Basic_Arg_Traits_T<PortableServer::ImplicitActivationPolicyValue>
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        PortableServer::ImplicitActivationPolicyValue \
+      >
+
+#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<PortableServer::ImplicitActivationPolicy>
+
+# pragma instantiate \
+    TAO::Object_Arg_Traits_T< \
+        PortableServer::ImplicitActivationPolicy_ptr, \
+        PortableServer::ImplicitActivationPolicy_var, \
+        PortableServer::ImplicitActivationPolicy_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::ImplicitActivationPolicy, \
+        TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy> \
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::ImplicitActivationPolicy, \
+        TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        PortableServer::ImplicitActivationPolicy \
+      >
+
+#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICYVALUE__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_SERVANTRETENTIONPOLICYVALUE__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<PortableServer::ServantRetentionPolicyValue>
+
+# pragma instantiate TAO::Basic_Arg_Traits_T<PortableServer::ServantRetentionPolicyValue>
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        PortableServer::ServantRetentionPolicyValue \
+      >
+
+#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_SERVANTRETENTIONPOLICY__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<PortableServer::ServantRetentionPolicy>
+
+# pragma instantiate \
+    TAO::Object_Arg_Traits_T< \
+        PortableServer::ServantRetentionPolicy_ptr, \
+        PortableServer::ServantRetentionPolicy_var, \
+        PortableServer::ServantRetentionPolicy_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::ServantRetentionPolicy, \
+        TAO::Objref_Traits<PortableServer::ServantRetentionPolicy> \
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::ServantRetentionPolicy, \
+        TAO::Objref_Traits<PortableServer::ServantRetentionPolicy> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        PortableServer::ServantRetentionPolicy \
+      >
+
+#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICYVALUE__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_REQUESTPROCESSINGPOLICYVALUE__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<PortableServer::RequestProcessingPolicyValue>
+
+# pragma instantiate TAO::Basic_Arg_Traits_T<PortableServer::RequestProcessingPolicyValue>
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        PortableServer::RequestProcessingPolicyValue \
+      >
+
+#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<PortableServer::RequestProcessingPolicy>
+
+# pragma instantiate \
+    TAO::Object_Arg_Traits_T< \
+        PortableServer::RequestProcessingPolicy_ptr, \
+        PortableServer::RequestProcessingPolicy_var, \
+        PortableServer::RequestProcessingPolicy_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::RequestProcessingPolicy, \
+        TAO::Objref_Traits<PortableServer::RequestProcessingPolicy> \
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::RequestProcessingPolicy, \
+        TAO::Objref_Traits<PortableServer::RequestProcessingPolicy> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        PortableServer::RequestProcessingPolicy \
+      >
+
+#if !defined (_PORTABLESERVER_POAMANAGER__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_POAMANAGER__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<PortableServer::POAManager>
+
+# pragma instantiate \
+    TAO::Object_Arg_Traits_T< \
+        PortableServer::POAManager_ptr, \
+        PortableServer::POAManager_var, \
+        PortableServer::POAManager_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::POAManager::AdapterInactive \
+      >
+
+#if !defined (_PORTABLESERVER_POAMANAGER_STATE__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_POAMANAGER_STATE__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<PortableServer::POAManager::State>
+
+# pragma instantiate TAO::Basic_Arg_Traits_T<PortableServer::POAManager::State>
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        PortableServer::POAManager::State \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::POAManager, \
+        TAO::Objref_Traits<PortableServer::POAManager> \
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::POAManager, \
+        TAO::Objref_Traits<PortableServer::POAManager> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        PortableServer::POAManager \
+      >
+
+#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<PortableServer::AdapterActivator>
+
+# pragma instantiate \
+    TAO::Object_Arg_Traits_T< \
+        PortableServer::AdapterActivator_ptr, \
+        PortableServer::AdapterActivator_var, \
+        PortableServer::AdapterActivator_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO::In_Object_Argument_T< \
+        PortableServer::POA_ptr \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::AdapterActivator, \
+        TAO::Objref_Traits<PortableServer::AdapterActivator> \
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::AdapterActivator, \
+        TAO::Objref_Traits<PortableServer::AdapterActivator> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        PortableServer::AdapterActivator \
+      >
+
+#if !defined (_PORTABLESERVER_SERVANTMANAGER__ARG_TRAITS_TMPLINST_CS_)
+#define _PORTABLESERVER_SERVANTMANAGER__ARG_TRAITS_TMPLINST_CS_
+
+# pragma instantiate TAO::Arg_Traits<PortableServer::ServantManager>
+
+# pragma instantiate \
+    TAO::Object_Arg_Traits_T< \
+        PortableServer::ServantManager_ptr, \
+        PortableServer::ServantManager_var, \
+        PortableServer::ServantManager_out \
+      >
+
+#endif /* end #if !defined */
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::ServantManager, \
+        TAO::Objref_Traits<PortableServer::ServantManager> \
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::ServantManager, \
+        TAO::Objref_Traits<PortableServer::ServantManager> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        PortableServer::ServantManager \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::ServantActivator, \
+        TAO::Objref_Traits<PortableServer::ServantActivator> \
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::ServantActivator, \
+        TAO::Objref_Traits<PortableServer::ServantActivator> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        PortableServer::ServantActivator \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::ServantLocator, \
+        TAO::Objref_Traits<PortableServer::ServantLocator> \
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::ServantLocator, \
+        TAO::Objref_Traits<PortableServer::ServantLocator> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        PortableServer::ServantLocator \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::Current::NoContext \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::Current, \
+        TAO::Objref_Traits<PortableServer::Current> \
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::Current, \
+        TAO::Objref_Traits<PortableServer::Current> \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        PortableServer::Current \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h
index 74802739d20..2cfbaf910c1 100644
--- a/TAO/tao/PortableServer/PortableServerC.h
+++ b/TAO/tao/PortableServer/PortableServerC.h
@@ -15,6 +15,12 @@
 //       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
@@ -26,19 +32,17 @@
 #define _TAO_IDL_ORIG_PORTABLESERVERC_H_
 
 #include /**/ "ace/pre.h"
-#include "tao/CurrentC.h"
+
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "portableserver_export.h"
 #include "tao/Exception.h"
 #include "tao/PolicyC.h"
 #include "tao/OctetSeqC.h"
-#include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/CurrentC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -70,10 +74,20 @@ class TAO_Local_ServantBase;
 class TAO_DynamicImplementation;
 class TAO_POA;
 
+// TAO_IDL - Generated from 
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/root_ch.cpp:63
+
+namespace TAO
+{
+  class Collocation_Proxy_Broker;
+  
+  template<typename T> class Narrow_Utils;
+}
+
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:48
 
-TAO_NAMESPACE  PortableServer
+namespace PortableServer
 {
   typedef TAO_ServantBase ServantBase;
   typedef TAO_ServantBase_var ServantBase_var;
@@ -82,51 +96,64 @@ TAO_NAMESPACE  PortableServer
 
   typedef TAO_Local_ServantBase LocalServantBase;
   typedef TAO_DynamicImplementation DynamicImplementation;
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
-
-#if !defined (_PORTABLESERVER_POA__ODDS_N_ENDS_CH_)
-#define _PORTABLESERVER_POA__ODDS_N_ENDS_CH_
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601
 
+#if !defined (_PORTABLESERVER_POA__VAR_OUT_CH_)
+#define _PORTABLESERVER_POA__VAR_OUT_CH_
+  
   class POA;
   typedef POA *POA_ptr;
-  typedef TAO_Objref_Var_T<POA> POA_var;
-  typedef TAO_Objref_Out_T<POA> POA_out;
+  
+  typedef
+    TAO_Objref_Var_T<
+        POA
+      >
+    POA_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        POA
+      >
+    POA_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101
 
+#if !defined (_PORTABLESERVER_POALIST_CH_)
+#define _PORTABLESERVER_POALIST_CH_
+  
   class POAList;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         POAList,
         TAO_Object_Manager<
-            PortableServer::POA,
-            PortableServer::POA_var
+            POA,
+            POA_var
           >
       >
     POAList_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         POAList,
         POAList_var,
         TAO_Object_Manager<
-            PortableServer::POA,
-            PortableServer::POA_var
+            POA,
+            POA_var
           >
       >
     POAList_out;
-
+  
   class TAO_PortableServer_Export POAList
     : public
         TAO_Unbounded_Object_Sequence<
-            PortableServer::POA,
-            PortableServer::POA_var
+            POA,
+            POA_var
           >
   {
   public:
@@ -135,34 +162,36 @@ TAO_NAMESPACE  PortableServer
     POAList (
         CORBA::ULong max,
         CORBA::ULong length,
-        POA_ptr* buffer,
+        POA_ptr* buffer, 
         CORBA::Boolean release = 0
       );
     POAList (const POAList &);
     ~POAList (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef POAList_var _var_type;
   };
 
+#endif /* end #if !defined */
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_POAList;
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typedef/typedef_ch.cpp:426
-
+  
   typedef CORBA::OctetSeq ObjectId;
   typedef CORBA::OctetSeq_var ObjectId_var;
   typedef CORBA::OctetSeq_out ObjectId_out;
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectId;
-
+  
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
   // TAO_IDL - Generated from
@@ -170,20 +199,20 @@ TAO_NAMESPACE  PortableServer
 
 #if !defined (_PORTABLESERVER_FORWARDREQUEST_CH_)
 #define _PORTABLESERVER_FORWARDREQUEST_CH_
-
+  
   class TAO_PortableServer_Export ForwardRequest : public CORBA::UserException
   {
   public:
-
+    
     CORBA::Object_var forward_reference;
     ForwardRequest (void);
     ForwardRequest (const ForwardRequest &);
     ~ForwardRequest (void);
 
     ForwardRequest &operator= (const ForwardRequest &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static ForwardRequest *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -193,34 +222,34 @@ TAO_NAMESPACE  PortableServer
 
     virtual void _tao_encode (
         TAO_OutputCDR &
-        ACE_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
-        ACE_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
-
+    
     ForwardRequest (
         const CORBA::Object_ptr  _tao_forward_reference
       );
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest;
 
 #endif /* end #if !defined */
-
+  
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 #if (TAO_HAS_MINIMUM_POA == 0)
@@ -230,19 +259,19 @@ TAO_NAMESPACE  PortableServer
 
 #if !defined (_PORTABLESERVER_NOTAGROUPOBJECT_CH_)
 #define _PORTABLESERVER_NOTAGROUPOBJECT_CH_
-
+  
   class TAO_PortableServer_Export NotAGroupObject : public CORBA::UserException
   {
   public:
-
+    
     NotAGroupObject (void);
     NotAGroupObject (const NotAGroupObject &);
     ~NotAGroupObject (void);
 
     NotAGroupObject &operator= (const NotAGroupObject &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static NotAGroupObject *_downcast (CORBA::Exception *);
     static CORBA::Exception *_alloc (void);
 
@@ -252,51 +281,54 @@ TAO_NAMESPACE  PortableServer
 
     virtual void _tao_encode (
         TAO_OutputCDR &
-        ACE_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
-        ACE_ENV_ARG_DECL_NOT_USED
+        ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:75
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/sequence_ch.cpp:101
 
+#if !defined (_PORTABLESERVER_IDS_CH_)
+#define _PORTABLESERVER_IDS_CH_
+  
   class IDs;
-
+  
   typedef
     TAO_VarSeq_Var_T<
         IDs,
-        PortableServer::ObjectId
+        ObjectId
       >
     IDs_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         IDs,
         IDs_var,
-        PortableServer::ObjectId
+        ObjectId
       >
     IDs_out;
-
+  
   class TAO_PortableServer_Export IDs
     : public
         TAO_Unbounded_Sequence<
-            PortableServer::ObjectId
+            ObjectId
           >
   {
   public:
@@ -305,820 +337,875 @@ TAO_NAMESPACE  PortableServer
     IDs (
         CORBA::ULong max,
         CORBA::ULong length,
-        ObjectId* buffer,
+        ObjectId* buffer, 
         CORBA::Boolean release = 0
       );
     IDs (const IDs &);
     ~IDs (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef IDs_var _var_type;
   };
 
+#endif /* end #if !defined */
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IDs;
-
+  
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::PolicyType THREAD_POLICY_ID = 16U;
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::PolicyType LIFESPAN_POLICY_ID = 17U;
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::PolicyType ID_UNIQUENESS_POLICY_ID = 18U;
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::PolicyType ID_ASSIGNMENT_POLICY_ID = 19U;
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::PolicyType IMPLICIT_ACTIVATION_POLICY_ID = 20U;
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::PolicyType SERVANT_RETENTION_POLICY_ID = 21U;
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const CORBA::PolicyType REQUEST_PROCESSING_POLICY_ID = 22U;
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
-
+  
   enum ThreadPolicyValue
   {
     ORB_CTRL_MODEL,
     SINGLE_THREAD_MODEL
   };
-
+  
 #if (TAO_HAS_MINIMUM_POA == 0)
 
   typedef ThreadPolicyValue &ThreadPolicyValue_out;
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadPolicyValue;
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
-
-#if !defined (_PORTABLESERVER_THREADPOLICY__ODDS_N_ENDS_CH_)
-#define _PORTABLESERVER_THREADPOLICY__ODDS_N_ENDS_CH_
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601
 
+#if !defined (_PORTABLESERVER_THREADPOLICY__VAR_OUT_CH_)
+#define _PORTABLESERVER_THREADPOLICY__VAR_OUT_CH_
+  
   class ThreadPolicy;
   typedef ThreadPolicy *ThreadPolicy_ptr;
-  typedef TAO_Objref_Var_T<ThreadPolicy> ThreadPolicy_var;
-  typedef TAO_Objref_Out_T<ThreadPolicy> ThreadPolicy_out;
+  
+  typedef
+    TAO_Objref_Var_T<
+        ThreadPolicy
+      >
+    ThreadPolicy_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        ThreadPolicy
+      >
+    ThreadPolicy_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_PORTABLESERVER_THREADPOLICY_CH_)
 #define _PORTABLESERVER_THREADPOLICY_CH_
-
+  
   class TAO_PortableServer_Export ThreadPolicy
     : public virtual CORBA::Policy
   {
   public:
     typedef ThreadPolicy_ptr _ptr_type;
     typedef ThreadPolicy_var _var_type;
-    static int _tao_class_id;
-
+    
     // The static operations.
     static ThreadPolicy_ptr _duplicate (ThreadPolicy_ptr obj);
-
+    
     static ThreadPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
-    static ThreadPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
+    
     static ThreadPolicy_ptr _nil (void)
       {
         return (ThreadPolicy_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::ThreadPolicyValue value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
-
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185
+    
+    virtual CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     ThreadPolicy (void);
     virtual ~ThreadPolicy (void);
-
+  
   private:
     ThreadPolicy (const ThreadPolicy &);
     void operator= (const ThreadPolicy &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadPolicy;
-
+  
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
-
+  
   enum LifespanPolicyValue
   {
     TRANSIENT,
     PERSISTENT
   };
-
+  
   typedef LifespanPolicyValue &LifespanPolicyValue_out;
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_LifespanPolicyValue;
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
-
-#if !defined (_PORTABLESERVER_LIFESPANPOLICY__ODDS_N_ENDS_CH_)
-#define _PORTABLESERVER_LIFESPANPOLICY__ODDS_N_ENDS_CH_
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601
 
+#if !defined (_PORTABLESERVER_LIFESPANPOLICY__VAR_OUT_CH_)
+#define _PORTABLESERVER_LIFESPANPOLICY__VAR_OUT_CH_
+  
   class LifespanPolicy;
   typedef LifespanPolicy *LifespanPolicy_ptr;
-  typedef TAO_Objref_Var_T<LifespanPolicy> LifespanPolicy_var;
-  typedef TAO_Objref_Out_T<LifespanPolicy> LifespanPolicy_out;
+  
+  typedef
+    TAO_Objref_Var_T<
+        LifespanPolicy
+      >
+    LifespanPolicy_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        LifespanPolicy
+      >
+    LifespanPolicy_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_PORTABLESERVER_LIFESPANPOLICY_CH_)
 #define _PORTABLESERVER_LIFESPANPOLICY_CH_
-
+  
   class TAO_PortableServer_Export LifespanPolicy
     : public virtual CORBA::Policy
   {
   public:
     typedef LifespanPolicy_ptr _ptr_type;
     typedef LifespanPolicy_var _var_type;
-    static int _tao_class_id;
-
+    
     // The static operations.
     static LifespanPolicy_ptr _duplicate (LifespanPolicy_ptr obj);
-
+    
     static LifespanPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
-    static LifespanPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
+    
     static LifespanPolicy_ptr _nil (void)
       {
         return (LifespanPolicy_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::LifespanPolicyValue value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
-
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185
+    
+    virtual CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     LifespanPolicy (void);
     virtual ~LifespanPolicy (void);
-
+  
   private:
     LifespanPolicy (const LifespanPolicy &);
     void operator= (const LifespanPolicy &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_LifespanPolicy;
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
-
+  
   enum IdUniquenessPolicyValue
   {
     UNIQUE_ID,
     MULTIPLE_ID
   };
-
+  
   typedef IdUniquenessPolicyValue &IdUniquenessPolicyValue_out;
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IdUniquenessPolicyValue;
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
-
-#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY__ODDS_N_ENDS_CH_)
-#define _PORTABLESERVER_IDUNIQUENESSPOLICY__ODDS_N_ENDS_CH_
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601
 
+#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY__VAR_OUT_CH_)
+#define _PORTABLESERVER_IDUNIQUENESSPOLICY__VAR_OUT_CH_
+  
   class IdUniquenessPolicy;
   typedef IdUniquenessPolicy *IdUniquenessPolicy_ptr;
-  typedef TAO_Objref_Var_T<IdUniquenessPolicy> IdUniquenessPolicy_var;
-  typedef TAO_Objref_Out_T<IdUniquenessPolicy> IdUniquenessPolicy_out;
+  
+  typedef
+    TAO_Objref_Var_T<
+        IdUniquenessPolicy
+      >
+    IdUniquenessPolicy_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        IdUniquenessPolicy
+      >
+    IdUniquenessPolicy_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY_CH_)
 #define _PORTABLESERVER_IDUNIQUENESSPOLICY_CH_
-
+  
   class TAO_PortableServer_Export IdUniquenessPolicy
     : public virtual CORBA::Policy
   {
   public:
     typedef IdUniquenessPolicy_ptr _ptr_type;
     typedef IdUniquenessPolicy_var _var_type;
-    static int _tao_class_id;
-
+    
     // The static operations.
     static IdUniquenessPolicy_ptr _duplicate (IdUniquenessPolicy_ptr obj);
-
+    
     static IdUniquenessPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
-    static IdUniquenessPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
+    
     static IdUniquenessPolicy_ptr _nil (void)
       {
         return (IdUniquenessPolicy_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::IdUniquenessPolicyValue value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
-
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185
+    
+    virtual CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     IdUniquenessPolicy (void);
     virtual ~IdUniquenessPolicy (void);
-
+  
   private:
     IdUniquenessPolicy (const IdUniquenessPolicy &);
     void operator= (const IdUniquenessPolicy &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IdUniquenessPolicy;
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
-
+  
   enum IdAssignmentPolicyValue
   {
     USER_ID,
     SYSTEM_ID
   };
-
+  
   typedef IdAssignmentPolicyValue &IdAssignmentPolicyValue_out;
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IdAssignmentPolicyValue;
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
-
-#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY__ODDS_N_ENDS_CH_)
-#define _PORTABLESERVER_IDASSIGNMENTPOLICY__ODDS_N_ENDS_CH_
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601
 
+#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY__VAR_OUT_CH_)
+#define _PORTABLESERVER_IDASSIGNMENTPOLICY__VAR_OUT_CH_
+  
   class IdAssignmentPolicy;
   typedef IdAssignmentPolicy *IdAssignmentPolicy_ptr;
-  typedef TAO_Objref_Var_T<IdAssignmentPolicy> IdAssignmentPolicy_var;
-  typedef TAO_Objref_Out_T<IdAssignmentPolicy> IdAssignmentPolicy_out;
+  
+  typedef
+    TAO_Objref_Var_T<
+        IdAssignmentPolicy
+      >
+    IdAssignmentPolicy_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        IdAssignmentPolicy
+      >
+    IdAssignmentPolicy_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY_CH_)
 #define _PORTABLESERVER_IDASSIGNMENTPOLICY_CH_
-
+  
   class TAO_PortableServer_Export IdAssignmentPolicy
     : public virtual CORBA::Policy
   {
   public:
     typedef IdAssignmentPolicy_ptr _ptr_type;
     typedef IdAssignmentPolicy_var _var_type;
-    static int _tao_class_id;
-
+    
     // The static operations.
     static IdAssignmentPolicy_ptr _duplicate (IdAssignmentPolicy_ptr obj);
-
+    
     static IdAssignmentPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
-    static IdAssignmentPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
+    
     static IdAssignmentPolicy_ptr _nil (void)
       {
         return (IdAssignmentPolicy_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::IdAssignmentPolicyValue value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
-
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185
+    
+    virtual CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     IdAssignmentPolicy (void);
     virtual ~IdAssignmentPolicy (void);
-
+  
   private:
     IdAssignmentPolicy (const IdAssignmentPolicy &);
     void operator= (const IdAssignmentPolicy &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IdAssignmentPolicy;
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
-
+  
   enum ImplicitActivationPolicyValue
   {
     IMPLICIT_ACTIVATION,
     NO_IMPLICIT_ACTIVATION
   };
-
+  
 #if (TAO_HAS_MINIMUM_POA == 0)
 
   typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out;
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ImplicitActivationPolicyValue;
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
-
-#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY__ODDS_N_ENDS_CH_)
-#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY__ODDS_N_ENDS_CH_
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601
 
+#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY__VAR_OUT_CH_)
+#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY__VAR_OUT_CH_
+  
   class ImplicitActivationPolicy;
   typedef ImplicitActivationPolicy *ImplicitActivationPolicy_ptr;
-  typedef TAO_Objref_Var_T<ImplicitActivationPolicy> ImplicitActivationPolicy_var;
-  typedef TAO_Objref_Out_T<ImplicitActivationPolicy> ImplicitActivationPolicy_out;
+  
+  typedef
+    TAO_Objref_Var_T<
+        ImplicitActivationPolicy
+      >
+    ImplicitActivationPolicy_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        ImplicitActivationPolicy
+      >
+    ImplicitActivationPolicy_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_)
 #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_CH_
-
+  
   class TAO_PortableServer_Export ImplicitActivationPolicy
     : public virtual CORBA::Policy
   {
   public:
     typedef ImplicitActivationPolicy_ptr _ptr_type;
     typedef ImplicitActivationPolicy_var _var_type;
-    static int _tao_class_id;
-
+    
     // The static operations.
     static ImplicitActivationPolicy_ptr _duplicate (ImplicitActivationPolicy_ptr obj);
-
+    
     static ImplicitActivationPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
-    static ImplicitActivationPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
+    
     static ImplicitActivationPolicy_ptr _nil (void)
       {
         return (ImplicitActivationPolicy_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::ImplicitActivationPolicyValue value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
-
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185
+    
+    virtual CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     ImplicitActivationPolicy (void);
     virtual ~ImplicitActivationPolicy (void);
-
+  
   private:
     ImplicitActivationPolicy (const ImplicitActivationPolicy &);
     void operator= (const ImplicitActivationPolicy &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ImplicitActivationPolicy;
-
+  
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
-
+  
   enum ServantRetentionPolicyValue
   {
     RETAIN,
     NON_RETAIN
   };
-
+  
 #if (TAO_HAS_MINIMUM_POA == 0)
 
   typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out;
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServantRetentionPolicyValue;
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
-
-#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY__ODDS_N_ENDS_CH_)
-#define _PORTABLESERVER_SERVANTRETENTIONPOLICY__ODDS_N_ENDS_CH_
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601
 
+#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY__VAR_OUT_CH_)
+#define _PORTABLESERVER_SERVANTRETENTIONPOLICY__VAR_OUT_CH_
+  
   class ServantRetentionPolicy;
   typedef ServantRetentionPolicy *ServantRetentionPolicy_ptr;
-  typedef TAO_Objref_Var_T<ServantRetentionPolicy> ServantRetentionPolicy_var;
-  typedef TAO_Objref_Out_T<ServantRetentionPolicy> ServantRetentionPolicy_out;
+  
+  typedef
+    TAO_Objref_Var_T<
+        ServantRetentionPolicy
+      >
+    ServantRetentionPolicy_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        ServantRetentionPolicy
+      >
+    ServantRetentionPolicy_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_)
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_
-
+  
   class TAO_PortableServer_Export ServantRetentionPolicy
     : public virtual CORBA::Policy
   {
   public:
     typedef ServantRetentionPolicy_ptr _ptr_type;
     typedef ServantRetentionPolicy_var _var_type;
-    static int _tao_class_id;
-
+    
     // The static operations.
     static ServantRetentionPolicy_ptr _duplicate (ServantRetentionPolicy_ptr obj);
-
+    
     static ServantRetentionPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
-    static ServantRetentionPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
+    
     static ServantRetentionPolicy_ptr _nil (void)
       {
         return (ServantRetentionPolicy_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::ServantRetentionPolicyValue value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
-
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185
+    
+    virtual CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     ServantRetentionPolicy (void);
     virtual ~ServantRetentionPolicy (void);
-
+  
   private:
     ServantRetentionPolicy (const ServantRetentionPolicy &);
     void operator= (const ServantRetentionPolicy &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServantRetentionPolicy;
-
+  
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
-
+  
   enum RequestProcessingPolicyValue
   {
     USE_ACTIVE_OBJECT_MAP_ONLY,
     USE_DEFAULT_SERVANT,
     USE_SERVANT_MANAGER
   };
-
+  
 #if (TAO_HAS_MINIMUM_POA == 0)
 
   typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_out;
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestProcessingPolicyValue;
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
-
-#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY__ODDS_N_ENDS_CH_)
-#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY__ODDS_N_ENDS_CH_
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601
 
+#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY__VAR_OUT_CH_)
+#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY__VAR_OUT_CH_
+  
   class RequestProcessingPolicy;
   typedef RequestProcessingPolicy *RequestProcessingPolicy_ptr;
-  typedef TAO_Objref_Var_T<RequestProcessingPolicy> RequestProcessingPolicy_var;
-  typedef TAO_Objref_Out_T<RequestProcessingPolicy> RequestProcessingPolicy_out;
+  
+  typedef
+    TAO_Objref_Var_T<
+        RequestProcessingPolicy
+      >
+    RequestProcessingPolicy_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        RequestProcessingPolicy
+      >
+    RequestProcessingPolicy_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_)
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_
-
+  
   class TAO_PortableServer_Export RequestProcessingPolicy
     : public virtual CORBA::Policy
   {
   public:
     typedef RequestProcessingPolicy_ptr _ptr_type;
     typedef RequestProcessingPolicy_var _var_type;
-    static int _tao_class_id;
-
+    
     // The static operations.
     static RequestProcessingPolicy_ptr _duplicate (RequestProcessingPolicy_ptr obj);
-
+    
     static RequestProcessingPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
-    static RequestProcessingPolicy_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
+    
     static RequestProcessingPolicy_ptr _nil (void)
       {
         return (RequestProcessingPolicy_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::RequestProcessingPolicyValue value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
-
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185
+    
+    virtual CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     RequestProcessingPolicy (void);
     virtual ~RequestProcessingPolicy (void);
-
+  
   private:
     RequestProcessingPolicy (const RequestProcessingPolicy &);
     void operator= (const RequestProcessingPolicy &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestProcessingPolicy;
-
+  
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
-
-#if !defined (_PORTABLESERVER_POAMANAGER__ODDS_N_ENDS_CH_)
-#define _PORTABLESERVER_POAMANAGER__ODDS_N_ENDS_CH_
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601
 
+#if !defined (_PORTABLESERVER_POAMANAGER__VAR_OUT_CH_)
+#define _PORTABLESERVER_POAMANAGER__VAR_OUT_CH_
+  
   class POAManager;
   typedef POAManager *POAManager_ptr;
-  typedef TAO_Objref_Var_T<POAManager> POAManager_var;
-  typedef TAO_Objref_Out_T<POAManager> POAManager_out;
+  
+  typedef
+    TAO_Objref_Var_T<
+        POAManager
+      >
+    POAManager_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        POAManager
+      >
+    POAManager_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_PORTABLESERVER_POAMANAGER_CH_)
 #define _PORTABLESERVER_POAMANAGER_CH_
-
+  
   class TAO_PortableServer_Export POAManager
     : public virtual CORBA::Object
   {
   public:
     typedef POAManager_ptr _ptr_type;
     typedef POAManager_var _var_type;
-    static int _tao_class_id;
-
+    
     // The static operations.
     static POAManager_ptr _duplicate (POAManager_ptr obj);
-
+    
     static POAManager_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
-    static POAManager_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
+    
     static POAManager_ptr _nil (void)
       {
         return (POAManager_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_)
 #define _PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_
-
+    
     class TAO_PortableServer_Export AdapterInactive : public CORBA::UserException
     {
     public:
-
+      
       AdapterInactive (void);
       AdapterInactive (const AdapterInactive &);
       ~AdapterInactive (void);
 
       AdapterInactive &operator= (const AdapterInactive &);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       static AdapterInactive *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -1128,30 +1215,30 @@ TAO_NAMESPACE  PortableServer
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-
+      
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_AdapterInactive;
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/enum_ch.cpp:57
-
+    
     enum State
     {
       HOLDING,
@@ -1159,17 +1246,17 @@ TAO_NAMESPACE  PortableServer
       DISCARDING,
       INACTIVE
     };
-
+    
     typedef State &State_out;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_State;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void activate (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -1177,12 +1264,12 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::POAManager::AdapterInactive
       )) = 0;
-
+    
 #if (TAO_HAS_MINIMUM_POA == 0)
 
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void hold_requests (
         CORBA::Boolean wait_for_completion
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1191,10 +1278,10 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::POAManager::AdapterInactive
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void discard_requests (
         CORBA::Boolean wait_for_completion
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1203,10 +1290,10 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::POAManager::AdapterInactive
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void deactivate (
         CORBA::Boolean etherealize_objects,
         CORBA::Boolean wait_for_completion
@@ -1216,95 +1303,102 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::POAManager::AdapterInactive
       )) = 0;
-
+    
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::POAManager::State get_state (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
-
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185
+    
+    virtual CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     POAManager (void);
     virtual ~POAManager (void);
-
+  
   private:
     POAManager (const POAManager &);
     void operator= (const POAManager &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_POAManager;
-
+  
 #if (TAO_HAS_MINIMUM_POA == 0)
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
-
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__ODDS_N_ENDS_CH_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR__ODDS_N_ENDS_CH_
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601
 
+#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__VAR_OUT_CH_)
+#define _PORTABLESERVER_ADAPTERACTIVATOR__VAR_OUT_CH_
+  
   class AdapterActivator;
   typedef AdapterActivator *AdapterActivator_ptr;
-  typedef TAO_Objref_Var_T<AdapterActivator> AdapterActivator_var;
-  typedef TAO_Objref_Out_T<AdapterActivator> AdapterActivator_out;
+  
+  typedef
+    TAO_Objref_Var_T<
+        AdapterActivator
+      >
+    AdapterActivator_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        AdapterActivator
+      >
+    AdapterActivator_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR_CH_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR_CH_
-
+  
   class TAO_PortableServer_Export AdapterActivator
     : public virtual CORBA::Object
   {
   public:
     typedef AdapterActivator_ptr _ptr_type;
     typedef AdapterActivator_var _var_type;
-    static int _tao_class_id;
-
+    
     // The static operations.
     static AdapterActivator_ptr _duplicate (AdapterActivator_ptr obj);
-
+    
     static AdapterActivator_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
-    static AdapterActivator_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
+    
     static AdapterActivator_ptr _nil (void)
       {
         return (AdapterActivator_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean unknown_adapter (
         PortableServer::POA_ptr parent,
         const char * name
@@ -1313,152 +1407,166 @@ TAO_NAMESPACE  PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
-
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185
+    
+    virtual CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     AdapterActivator (void);
     virtual ~AdapterActivator (void);
-
+  
   private:
     AdapterActivator (const AdapterActivator &);
     void operator= (const AdapterActivator &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterActivator;
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
-
-#if !defined (_PORTABLESERVER_SERVANTMANAGER__ODDS_N_ENDS_CH_)
-#define _PORTABLESERVER_SERVANTMANAGER__ODDS_N_ENDS_CH_
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601
 
+#if !defined (_PORTABLESERVER_SERVANTMANAGER__VAR_OUT_CH_)
+#define _PORTABLESERVER_SERVANTMANAGER__VAR_OUT_CH_
+  
   class ServantManager;
   typedef ServantManager *ServantManager_ptr;
-  typedef TAO_Objref_Var_T<ServantManager> ServantManager_var;
-  typedef TAO_Objref_Out_T<ServantManager> ServantManager_out;
+  
+  typedef
+    TAO_Objref_Var_T<
+        ServantManager
+      >
+    ServantManager_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        ServantManager
+      >
+    ServantManager_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_PORTABLESERVER_SERVANTMANAGER_CH_)
 #define _PORTABLESERVER_SERVANTMANAGER_CH_
-
+  
   class TAO_PortableServer_Export ServantManager
     : public virtual CORBA::Object
   {
   public:
     typedef ServantManager_ptr _ptr_type;
     typedef ServantManager_var _var_type;
-    static int _tao_class_id;
-
+    
     // The static operations.
     static ServantManager_ptr _duplicate (ServantManager_ptr obj);
-
+    
     static ServantManager_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
-    static ServantManager_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
+    
     static ServantManager_ptr _nil (void)
       {
         return (ServantManager_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
-
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185
+    
+    virtual CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     ServantManager (void);
     virtual ~ServantManager (void);
-
+  
   private:
     ServantManager (const ServantManager &);
     void operator= (const ServantManager &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServantManager;
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
-
-#if !defined (_PORTABLESERVER_SERVANTACTIVATOR__ODDS_N_ENDS_CH_)
-#define _PORTABLESERVER_SERVANTACTIVATOR__ODDS_N_ENDS_CH_
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601
 
+#if !defined (_PORTABLESERVER_SERVANTACTIVATOR__VAR_OUT_CH_)
+#define _PORTABLESERVER_SERVANTACTIVATOR__VAR_OUT_CH_
+  
   class ServantActivator;
   typedef ServantActivator *ServantActivator_ptr;
-  typedef TAO_Objref_Var_T<ServantActivator> ServantActivator_var;
-  typedef TAO_Objref_Out_T<ServantActivator> ServantActivator_out;
+  
+  typedef
+    TAO_Objref_Var_T<
+        ServantActivator
+      >
+    ServantActivator_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        ServantActivator
+      >
+    ServantActivator_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_PORTABLESERVER_SERVANTACTIVATOR_CH_)
 #define _PORTABLESERVER_SERVANTACTIVATOR_CH_
-
+  
   class TAO_PortableServer_Export ServantActivator
     : public virtual PortableServer::ServantManager
   {
   public:
     typedef ServantActivator_ptr _ptr_type;
     typedef ServantActivator_var _var_type;
-    static int _tao_class_id;
-
+    
     // The static operations.
     static ServantActivator_ptr _duplicate (ServantActivator_ptr obj);
-
+    
     static ServantActivator_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
-    static ServantActivator_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
+    
     static ServantActivator_ptr _nil (void)
       {
         return (ServantActivator_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::Servant incarnate (
         const PortableServer::ObjectId & oid,
         PortableServer::POA_ptr adapter
@@ -1474,10 +1582,10 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
       )) = 0;
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void etherealize (
         const PortableServer::ObjectId & oid,
         PortableServer::POA_ptr adapter,
@@ -1489,50 +1597,63 @@ TAO_NAMESPACE  PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
-
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185
+    
+    virtual CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     ServantActivator (void);
     virtual ~ServantActivator (void);
-
+  
   private:
     ServantActivator (const ServantActivator &);
     void operator= (const ServantActivator &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServantActivator;
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
-
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR__ODDS_N_ENDS_CH_)
-#define _PORTABLESERVER_SERVANTLOCATOR__ODDS_N_ENDS_CH_
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601
 
+#if !defined (_PORTABLESERVER_SERVANTLOCATOR__VAR_OUT_CH_)
+#define _PORTABLESERVER_SERVANTLOCATOR__VAR_OUT_CH_
+  
   class ServantLocator;
   typedef ServantLocator *ServantLocator_ptr;
-  typedef TAO_Objref_Var_T<ServantLocator> ServantLocator_var;
-  typedef TAO_Objref_Out_T<ServantLocator> ServantLocator_out;
+  
+  typedef
+    TAO_Objref_Var_T<
+        ServantLocator
+      >
+    ServantLocator_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        ServantLocator
+      >
+    ServantLocator_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_PORTABLESERVER_SERVANTLOCATOR_CH_)
 #define _PORTABLESERVER_SERVANTLOCATOR_CH_
-
+  
   class TAO_PortableServer_Export ServantLocator
     : public virtual PortableServer::ServantManager
   {
@@ -1541,31 +1662,25 @@ TAO_NAMESPACE  PortableServer
 
     typedef ServantLocator_ptr _ptr_type;
     typedef ServantLocator_var _var_type;
-    static int _tao_class_id;
-
+    
     // The static operations.
     static ServantLocator_ptr _duplicate (ServantLocator_ptr obj);
-
+    
     static ServantLocator_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
-    static ServantLocator_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
+    
     static ServantLocator_ptr _nil (void)
       {
         return (ServantLocator_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::Servant preinvoke (
         const PortableServer::ObjectId & oid,
         PortableServer::POA_ptr adapter,
@@ -1583,10 +1698,10 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
       )) = 0;
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void postinvoke (
         const PortableServer::ObjectId & oid,
         PortableServer::POA_ptr adapter,
@@ -1598,90 +1713,88 @@ TAO_NAMESPACE  PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
-
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185
+    
+    virtual CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     ServantLocator (void);
     virtual ~ServantLocator (void);
-
+  
   private:
     ServantLocator (const ServantLocator &);
     void operator= (const ServantLocator &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServantLocator;
-
+  
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_PORTABLESERVER_POA_CH_)
 #define _PORTABLESERVER_POA_CH_
-
+  
   class TAO_PortableServer_Export POA
     : public virtual CORBA::Object
   {
   public:
     typedef POA_ptr _ptr_type;
     typedef POA_var _var_type;
-    static int _tao_class_id;
-
+    
     // The static operations.
     static POA_ptr _duplicate (POA_ptr obj);
-
+    
     static POA_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
-    static POA_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static POA_ptr _nil (void)
-      {
-        return (POA_ptr)0;
-      }
-
+    
+    // Hand crafted.
     virtual TAO_POA* _tao_poa_downcast (void)
       {
         return 0;
       }
 
+    static POA_ptr _nil (void)
+      {
+        return (POA_ptr)0;
+      }
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_)
 #define _PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_
-
+    
     class TAO_PortableServer_Export AdapterAlreadyExists : public CORBA::UserException
     {
     public:
-
+      
       AdapterAlreadyExists (void);
       AdapterAlreadyExists (const AdapterAlreadyExists &);
       ~AdapterAlreadyExists (void);
 
       AdapterAlreadyExists &operator= (const AdapterAlreadyExists &);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       static AdapterAlreadyExists *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -1691,45 +1804,45 @@ TAO_NAMESPACE  PortableServer
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-
+      
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_AdapterAlreadyExists;
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_)
 #define _PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_
-
+    
     class TAO_PortableServer_Export AdapterNonExistent : public CORBA::UserException
     {
     public:
-
+      
       AdapterNonExistent (void);
       AdapterNonExistent (const AdapterNonExistent &);
       ~AdapterNonExistent (void);
 
       AdapterNonExistent &operator= (const AdapterNonExistent &);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       static AdapterNonExistent *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -1739,46 +1852,46 @@ TAO_NAMESPACE  PortableServer
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-
+      
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_AdapterNonExistent;
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_POA_INVALIDPOLICY_CH_)
 #define _PORTABLESERVER_POA_INVALIDPOLICY_CH_
-
+    
     class TAO_PortableServer_Export InvalidPolicy : public CORBA::UserException
     {
     public:
-
+      
       CORBA::UShort index;
       InvalidPolicy (void);
       InvalidPolicy (const InvalidPolicy &);
       ~InvalidPolicy (void);
 
       InvalidPolicy &operator= (const InvalidPolicy &);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       static InvalidPolicy *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -1788,34 +1901,34 @@ TAO_NAMESPACE  PortableServer
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ctor.cpp:66
-
+      
       InvalidPolicy (
           CORBA::UShort _tao_index
         );
-
+      
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-
+      
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_InvalidPolicy;
 
 #endif /* end #if !defined */
-
+    
 #if (TAO_HAS_MINIMUM_POA == 0)
 
     // TAO_IDL - Generated from
@@ -1823,19 +1936,19 @@ TAO_NAMESPACE  PortableServer
 
 #if !defined (_PORTABLESERVER_POA_NOSERVANT_CH_)
 #define _PORTABLESERVER_POA_NOSERVANT_CH_
-
+    
     class TAO_PortableServer_Export NoServant : public CORBA::UserException
     {
     public:
-
+      
       NoServant (void);
       NoServant (const NoServant &);
       ~NoServant (void);
 
       NoServant &operator= (const NoServant &);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       static NoServant *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -1845,27 +1958,27 @@ TAO_NAMESPACE  PortableServer
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-
+      
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_NoServant;
 
 #endif /* end #if !defined */
-
+    
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
     // TAO_IDL - Generated from
@@ -1873,19 +1986,19 @@ TAO_NAMESPACE  PortableServer
 
 #if !defined (_PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_)
 #define _PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_
-
+    
     class TAO_PortableServer_Export ObjectAlreadyActive : public CORBA::UserException
     {
     public:
-
+      
       ObjectAlreadyActive (void);
       ObjectAlreadyActive (const ObjectAlreadyActive &);
       ~ObjectAlreadyActive (void);
 
       ObjectAlreadyActive &operator= (const ObjectAlreadyActive &);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       static ObjectAlreadyActive *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -1895,45 +2008,45 @@ TAO_NAMESPACE  PortableServer
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-
+      
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_ObjectAlreadyActive;
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_)
 #define _PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_
-
+    
     class TAO_PortableServer_Export ObjectNotActive : public CORBA::UserException
     {
     public:
-
+      
       ObjectNotActive (void);
       ObjectNotActive (const ObjectNotActive &);
       ~ObjectNotActive (void);
 
       ObjectNotActive &operator= (const ObjectNotActive &);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       static ObjectNotActive *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -1943,45 +2056,45 @@ TAO_NAMESPACE  PortableServer
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-
+      
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_ObjectNotActive;
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_)
 #define _PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_
-
+    
     class TAO_PortableServer_Export ServantAlreadyActive : public CORBA::UserException
     {
     public:
-
+      
       ServantAlreadyActive (void);
       ServantAlreadyActive (const ServantAlreadyActive &);
       ~ServantAlreadyActive (void);
 
       ServantAlreadyActive &operator= (const ServantAlreadyActive &);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       static ServantAlreadyActive *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -1991,45 +2104,45 @@ TAO_NAMESPACE  PortableServer
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-
+      
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_ServantAlreadyActive;
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_)
 #define _PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_
-
+    
     class TAO_PortableServer_Export ServantNotActive : public CORBA::UserException
     {
     public:
-
+      
       ServantNotActive (void);
       ServantNotActive (const ServantNotActive &);
       ~ServantNotActive (void);
 
       ServantNotActive &operator= (const ServantNotActive &);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       static ServantNotActive *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -2039,45 +2152,45 @@ TAO_NAMESPACE  PortableServer
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-
+      
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_ServantNotActive;
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_POA_WRONGADAPTER_CH_)
 #define _PORTABLESERVER_POA_WRONGADAPTER_CH_
-
+    
     class TAO_PortableServer_Export WrongAdapter : public CORBA::UserException
     {
     public:
-
+      
       WrongAdapter (void);
       WrongAdapter (const WrongAdapter &);
       ~WrongAdapter (void);
 
       WrongAdapter &operator= (const WrongAdapter &);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       static WrongAdapter *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -2087,45 +2200,45 @@ TAO_NAMESPACE  PortableServer
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-
+      
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_WrongAdapter;
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_POA_WRONGPOLICY_CH_)
 #define _PORTABLESERVER_POA_WRONGPOLICY_CH_
-
+    
     class TAO_PortableServer_Export WrongPolicy : public CORBA::UserException
     {
     public:
-
+      
       WrongPolicy (void);
       WrongPolicy (const WrongPolicy &);
       ~WrongPolicy (void);
 
       WrongPolicy &operator= (const WrongPolicy &);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       static WrongPolicy *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -2135,30 +2248,30 @@ TAO_NAMESPACE  PortableServer
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-
+      
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_WrongPolicy;
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::POA_ptr create_POA (
         const char * adapter_name,
         PortableServer::POAManager_ptr a_POAManager,
@@ -2170,10 +2283,10 @@ TAO_NAMESPACE  PortableServer
         , PortableServer::POA::AdapterAlreadyExists
         , PortableServer::POA::InvalidPolicy
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::POA_ptr find_POA (
         const char * adapter_name,
         CORBA::Boolean activate_it
@@ -2183,10 +2296,10 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::POA::AdapterNonExistent
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void destroy (
         CORBA::Boolean etherealize_objects,
         CORBA::Boolean wait_for_completion
@@ -2195,12 +2308,12 @@ TAO_NAMESPACE  PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
 #if (TAO_HAS_MINIMUM_POA == 0)
 
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::ThreadPolicy_ptr create_thread_policy (
         PortableServer::ThreadPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2208,12 +2321,12 @@ TAO_NAMESPACE  PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::LifespanPolicy_ptr create_lifespan_policy (
         PortableServer::LifespanPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2221,10 +2334,10 @@ TAO_NAMESPACE  PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (
         PortableServer::IdUniquenessPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2232,10 +2345,10 @@ TAO_NAMESPACE  PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (
         PortableServer::IdAssignmentPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2243,12 +2356,12 @@ TAO_NAMESPACE  PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
 #if (TAO_HAS_MINIMUM_POA == 0)
 
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (
         PortableServer::ImplicitActivationPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2256,10 +2369,10 @@ TAO_NAMESPACE  PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (
         PortableServer::ServantRetentionPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2267,10 +2380,10 @@ TAO_NAMESPACE  PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (
         PortableServer::RequestProcessingPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2278,64 +2391,64 @@ TAO_NAMESPACE  PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * the_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::POA_ptr the_parent (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::POAList * the_children (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::POAManager_ptr the_POAManager (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
 #if (TAO_HAS_MINIMUM_POA == 0)
 
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::AdapterActivator_ptr the_activator (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void the_activator (
         PortableServer::AdapterActivator_ptr the_activator
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2343,10 +2456,10 @@ TAO_NAMESPACE  PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::ServantManager_ptr get_servant_manager (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -2354,10 +2467,10 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void set_servant_manager (
         PortableServer::ServantManager_ptr imgr
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2366,10 +2479,10 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::Servant get_servant (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -2378,10 +2491,10 @@ TAO_NAMESPACE  PortableServer
         , PortableServer::POA::NoServant
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void set_servant (
         PortableServer::Servant p_servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2390,12 +2503,12 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::ObjectId * activate_object (
         PortableServer::Servant p_servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2405,10 +2518,10 @@ TAO_NAMESPACE  PortableServer
         , PortableServer::POA::ServantAlreadyActive
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void activate_object_with_id (
         const PortableServer::ObjectId & id,
         PortableServer::Servant p_servant
@@ -2420,10 +2533,10 @@ TAO_NAMESPACE  PortableServer
         , PortableServer::POA::ObjectAlreadyActive
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void deactivate_object (
         const PortableServer::ObjectId & oid
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2433,10 +2546,10 @@ TAO_NAMESPACE  PortableServer
         , PortableServer::POA::ObjectNotActive
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Object_ptr create_reference (
         const char * intf
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2445,10 +2558,10 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Object_ptr create_reference_with_id (
         const PortableServer::ObjectId & oid,
         const char * intf
@@ -2458,10 +2571,10 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::ObjectId * servant_to_id (
         PortableServer::Servant p_servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2471,10 +2584,10 @@ TAO_NAMESPACE  PortableServer
         , PortableServer::POA::ServantNotActive
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Object_ptr servant_to_reference (
         PortableServer::Servant p_servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2484,10 +2597,10 @@ TAO_NAMESPACE  PortableServer
         , PortableServer::POA::ServantNotActive
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::Servant reference_to_servant (
         CORBA::Object_ptr reference
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2498,10 +2611,10 @@ TAO_NAMESPACE  PortableServer
         , PortableServer::POA::WrongAdapter
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::ObjectId * reference_to_id (
         CORBA::Object_ptr reference
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2511,10 +2624,10 @@ TAO_NAMESPACE  PortableServer
         , PortableServer::POA::WrongAdapter
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::Servant id_to_servant (
         const PortableServer::ObjectId & oid
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2524,10 +2637,10 @@ TAO_NAMESPACE  PortableServer
         , PortableServer::POA::ObjectNotActive
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Object_ptr id_to_reference (
         const PortableServer::ObjectId & oid
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2537,22 +2650,22 @@ TAO_NAMESPACE  PortableServer
         , PortableServer::POA::ObjectNotActive
         , PortableServer::POA::WrongPolicy
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::OctetSeq * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
 #if (TAO_HAS_MINIMUM_POA == 0)
 
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::ObjectId * create_id_for_reference (
         CORBA::Object_ptr the_ref
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2561,10 +2674,10 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::NotAGroupObject
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::IDs * reference_to_ids (
         CORBA::Object_ptr the_ref
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2573,10 +2686,10 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::NotAGroupObject
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void associate_reference_with_id (
         CORBA::Object_ptr ref,
         const PortableServer::ObjectId & oid
@@ -2586,10 +2699,10 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::NotAGroupObject
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void disassociate_reference_with_id (
         CORBA::Object_ptr ref,
         const PortableServer::ObjectId & oid
@@ -2599,98 +2712,105 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::NotAGroupObject
       )) = 0;
-
+    
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
-
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185
+    
+    virtual CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     POA (void);
     virtual ~POA (void);
-
+  
   private:
     POA (const POA &);
     void operator= (const POA &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_POA;
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:567
-
-#if !defined (_PORTABLESERVER_CURRENT__ODDS_N_ENDS_CH_)
-#define _PORTABLESERVER_CURRENT__ODDS_N_ENDS_CH_
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_interface.cpp:601
 
+#if !defined (_PORTABLESERVER_CURRENT__VAR_OUT_CH_)
+#define _PORTABLESERVER_CURRENT__VAR_OUT_CH_
+  
   class Current;
   typedef Current *Current_ptr;
-  typedef TAO_Objref_Var_T<Current> Current_var;
-  typedef TAO_Objref_Out_T<Current> Current_out;
+  
+  typedef
+    TAO_Objref_Var_T<
+        Current
+      >
+    Current_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        Current
+      >
+    Current_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:54
+  // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:53
 
 #if !defined (_PORTABLESERVER_CURRENT_CH_)
 #define _PORTABLESERVER_CURRENT_CH_
-
+  
   class TAO_PortableServer_Export Current
     : public virtual CORBA::Current
   {
   public:
     typedef Current_ptr _ptr_type;
     typedef Current_var _var_type;
-    static int _tao_class_id;
-
+    
     // The static operations.
     static Current_ptr _duplicate (Current_ptr obj);
-
+    
     static Current_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
-    static Current_ptr _unchecked_narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
+    
     static Current_ptr _nil (void)
       {
         return (Current_ptr)0;
       }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLESERVER_CURRENT_NOCONTEXT_CH_)
 #define _PORTABLESERVER_CURRENT_NOCONTEXT_CH_
-
+    
     class TAO_PortableServer_Export NoContext : public CORBA::UserException
     {
     public:
-
+      
       NoContext (void);
       NoContext (const NoContext &);
       ~NoContext (void);
 
       NoContext &operator= (const NoContext &);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       static NoContext *_downcast (CORBA::Exception *);
       static CORBA::Exception *_alloc (void);
 
@@ -2700,30 +2820,30 @@ TAO_NAMESPACE  PortableServer
 
       virtual void _tao_encode (
           TAO_OutputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
-          ACE_ENV_ARG_DECL_NOT_USED
+          ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
       // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/exception_ch.cpp:125
-
+      
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_NoContext;
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::POA_ptr get_POA (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -2731,10 +2851,10 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::Current::NoContext
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableServer::ObjectId * get_object_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -2742,50 +2862,56 @@ TAO_NAMESPACE  PortableServer
         CORBA::SystemException
         , PortableServer::Current::NoContext
       )) = 0;
-
+    
     // TAO_IDL - Generated from
-    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:211
-
-    virtual void *_tao_QueryInterface (ptrdiff_t type);
-
+    // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ch.cpp:185
+    
+    virtual CORBA::Boolean _is_a (
+        const char *type_id
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      );
+    
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-
+  
   protected:
     Current (void);
     virtual ~Current (void);
-
+  
   private:
     Current (const Current &);
     void operator= (const Current &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
 
+  // Hand crafted.
   TAO_NAMESPACE_STORAGE_CLASS char *ObjectId_to_string (const PortableServer::ObjectId &id);
   TAO_NAMESPACE_STORAGE_CLASS CORBA::WChar *ObjectId_to_wstring (const PortableServer::ObjectId &id);
   TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *string_to_ObjectId (const char *id);
   TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *wstring_to_ObjectId (const CORBA::WChar *id);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:67
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_ch.cpp:66
 
-}
-TAO_NAMESPACE_CLOSE // module PortableServer
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:48
+
+// Traits specializations.
+namespace TAO
+{
+};
 
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_ch.cpp:52
-/*
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::ObjectId &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ObjectId*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ObjectId *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ObjectId *&);
-*/
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POAList &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAList*); // noncopying version
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POAList *&); // deprecated
@@ -3086,6 +3212,23 @@ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const
 
 #ifndef __ACE_INLINE__
 
+// TAO_IDL - Generated from
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:70
+
+#if !defined _TAO_CDR_OP_PortableServer_POAList_H_
+#define _TAO_CDR_OP_PortableServer_POAList_H_
+
+TAO_PortableServer_Export CORBA::Boolean operator<< (
+    TAO_OutputCDR &,
+    const PortableServer::POAList &
+  );
+TAO_PortableServer_Export CORBA::Boolean operator>> (
+    TAO_InputCDR &,
+    PortableServer::POAList &
+  );
+
+#endif /* _TAO_CDR_OP_PortableServer_POAList_H_ */
+
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
 // TAO_IDL - Generated from
@@ -3105,7 +3248,7 @@ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Port
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::NotAGroupObject &);
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:57
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ch.cpp:70
 
 #if !defined _TAO_CDR_OP_PortableServer_IDs_H_
 #define _TAO_CDR_OP_PortableServer_IDs_H_
@@ -3175,7 +3318,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 #endif /* __ACE_INLINE__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1018
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:926
 
 #if defined (__ACE_INLINE__)
 #include "PortableServerC.i"
@@ -3191,3 +3334,4 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/PortableServer/PortableServerC.i b/TAO/tao/PortableServer/PortableServerC.i
index 79b311c9d9e..31c5513f574 100644
--- a/TAO/tao/PortableServer/PortableServerC.i
+++ b/TAO/tao/PortableServer/PortableServerC.i
@@ -15,516 +15,34 @@
 //       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_visitor_interface/interface_ci.cpp:68
-
-#if !defined (_PORTABLESERVER_THREADPOLICY___CI_)
-#define _PORTABLESERVER_THREADPOLICY___CI_
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::ThreadPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::ThreadPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::ThreadPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-#endif /*TAO_HAS_MINIMUM_POA*/
-
-#endif /* end #if !defined */
-
-template<>
-ACE_INLINE CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableServer::POAList>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableServer::POAList>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
-
-#if !defined (_PORTABLESERVER_LIFESPANPOLICY___CI_)
-#define _PORTABLESERVER_LIFESPANPOLICY___CI_
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::LifespanPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::LifespanPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::LifespanPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
-
-#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY___CI_)
-#define _PORTABLESERVER_IDUNIQUENESSPOLICY___CI_
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
-
-#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY___CI_)
-#define _PORTABLESERVER_IDASSIGNMENTPOLICY___CI_
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-#endif /* end #if !defined */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
-#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___CI_)
-#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___CI_
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
-
-#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY___CI_)
-#define _PORTABLESERVER_SERVANTRETENTIONPOLICY___CI_
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
+#if !defined _TAO_CDR_OP_PortableServer_POAList_I_
+#define _TAO_CDR_OP_PortableServer_POAList_I_
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-
-#endif /* end #if !defined */
-
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
-
-#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY___CI_)
-#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY___CI_
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-#endif /* end #if !defined */
-
-#endif /*TAO_HAS_MINIMUM_POA == 0 */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
-
-#if !defined (_PORTABLESERVER_POAMANAGER___CI_)
-#define _PORTABLESERVER_POAMANAGER___CI_
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::POAManager>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::POAManager>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::POAManager>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-#endif /* end #if !defined */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
-
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___CI_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR___CI_
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::AdapterActivator>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::AdapterActivator>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::AdapterActivator>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
-
-#if !defined (_PORTABLESERVER_SERVANTMANAGER___CI_)
-#define _PORTABLESERVER_SERVANTMANAGER___CI_
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::ServantManager>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::ServantManager>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::ServantManager>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
-
-#if !defined (_PORTABLESERVER_SERVANTACTIVATOR___CI_)
-#define _PORTABLESERVER_SERVANTACTIVATOR___CI_
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::ServantActivator>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::ServantActivator>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::ServantActivator>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
-
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR___CI_)
-#define _PORTABLESERVER_SERVANTLOCATOR___CI_
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::ServantLocator>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::ServantLocator>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::ServantLocator>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-#endif /* end #if !defined */
-
-#endif /*TAO_HAS_MINIMUM_POA == 0*/
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
-
-#if !defined (_PORTABLESERVER_POA___CI_)
-#define _PORTABLESERVER_POA___CI_
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::POA>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::POA>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::POA>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/interface_ci.cpp:68
-
-#if !defined (_PORTABLESERVER_CURRENT___CI_)
-#define _PORTABLESERVER_CURRENT___CI_
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::Current>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::Current>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
+CORBA::Boolean TAO_PortableServer_Export operator<< (
+    TAO_OutputCDR &,
+    const PortableServer::POAList &
+  );
 
-template<>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Impl_T<PortableServer::Current>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
+CORBA::Boolean TAO_PortableServer_Export operator>> (
+    TAO_InputCDR &,
+    PortableServer::POAList &
+  );
 
-#endif /* end #if !defined */
+#endif /* _TAO_CDR_OP_PortableServer_POAList_I_ */
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
 
@@ -611,7 +129,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:84
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_ci.cpp:81
 
 #if !defined _TAO_CDR_OP_PortableServer_IDs_I_
 #define _TAO_CDR_OP_PortableServer_IDs_I_
@@ -643,12 +161,12 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ThreadPolicyValue
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+  
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (PortableServer::ThreadPolicyValue, _tao_temp);
     }
-
+  
   return _tao_result;
 }
 
@@ -669,12 +187,12 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::LifespanPolicyVal
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+  
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (PortableServer::LifespanPolicyValue, _tao_temp);
     }
-
+  
   return _tao_result;
 }
 
@@ -693,12 +211,12 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdUniquenessPolic
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+  
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (PortableServer::IdUniquenessPolicyValue, _tao_temp);
     }
-
+  
   return _tao_result;
 }
 
@@ -717,12 +235,12 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdAssignmentPolic
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+  
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (PortableServer::IdAssignmentPolicyValue, _tao_temp);
     }
-
+  
   return _tao_result;
 }
 
@@ -743,12 +261,12 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ImplicitActivatio
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+  
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (PortableServer::ImplicitActivationPolicyValue, _tao_temp);
     }
-
+  
   return _tao_result;
 }
 
@@ -767,12 +285,12 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ServantRetentionP
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+  
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (PortableServer::ServantRetentionPolicyValue, _tao_temp);
     }
-
+  
   return _tao_result;
 }
 
@@ -791,12 +309,12 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::RequestProcessing
 {
   CORBA::ULong _tao_temp = 0;
   CORBA::Boolean _tao_result = strm >> _tao_temp;
-
+  
   if (_tao_result == 1)
     {
       _tao_enumval = ACE_static_cast (PortableServer::RequestProcessingPolicyValue, _tao_temp);
     }
-
+  
   return _tao_result;
 }
author	parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2003-09-03 01:44:03 +0000
committer	parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>	2003-09-03 01:44:03 +0000
commit	708df687d05c5898b9b787691066406fd6b8a614 (patch)
tree	479e70c6b0df8ba1947cc509d9d8d0740d288b2e
parent	5d077fe8070848525c36a5b52e24ff133a9ec5e1 (diff)
download	ATCD-708df687d05c5898b9b787691066406fd6b8a614.tar.gz