ChangeLogTag: Fri Feb 18 17:04:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

918 files changed, 48714 insertions, 36923 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 309bd4f49f4..0dad6eaa2f2 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,13 +1,3228 @@
+Fri Feb 18 08:57:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Merged the POArefactor3 branch to main. This branch is a refactoring
+        of the PortableServer library. The POA is now using strategies to
+        implement its functionality.
+
+        A short overview of the changes, see below for details:
+        - The POA is rewritten so that it uses strategies for its
+        implementation
+        - The ImR handling is moved to the new ImR_Client library.
+        - The MIOP part of the POA is moved to the GOA. See the latest version
+        of the MIOP specification. You have to link now with the PortableGroup
+        library and retrieve a GOA instead of the RootPOA.
+        - Implemented several missing parts of POA functionality as described
+        by the latest corba specification. Missing functionality, incorrect
+        exceptions, incorrect minor codes and much more
+        - Splitted the huge PortableServer.pidl file in several smaller files
+        and regenerated all the generated files in the repository
+        - Move TAO_ORB_Manager from
+        PortableServer to Utils library, this is a helper class.
+        - The POA has
+        been split in Root_POA and Regular_POA, on this we will more in the
+        future so that the Root_POA just pulls in the minimal set of things
+        needed.
+
+        Almost all test work without problems, a few are failing at which I
+        will look soon, we will work on this the next days. This checkin is
+        done now so that Ossama can merge his refactoring based on this.
+
+        Thu Feb 17 12:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Root_POA.{h,cpp}:
+        * tao/PortableServer/ServantRetentionStrategy*.{h,cpp}:
+        * tao/PortableServer/RequestProcessingStrategy*.{h,cpp}:
+          Reimplemented id_to_servant (). Previously this called the servant
+          retention strategy which looked if there was a default servant. Now
+          the POA calls the request processing strategy, the AOM version calls
+          the servant retention where the retain looks in the AOM and the non
+          retain throws a wrong policy. The default servant version just looks
+          if there is a default servant, the servant manager version also
+          calls the servant retention version. This way the get_servant_i on
+          the POA can be protected again.
+
+        Thu Feb 17 08:57:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * release.pl:
+          Removed.
+
+        * tao/mwc.pl:
+          We have to list all cpp/h files by hand, when we let MPC pickup just
+          all files it also get all resource factory files that shouldn't be
+          in the tao lib
+
+        Wed Feb 16 14:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/LifespanStrategyPersistent.cpp:
+          Only try to load the ImR_Client library in the startup, in the
+          shutdown, when it is not there, then don't try to load it again
+
+        * tao/PortableServer/PolicyFactory*.*:
+          Removed the usage of svc conf for the policies again, it costs much
+          more then it delivers.
+
+          Also fixed some compile warnings with vc6.
+
+        Tue Feb 15 13:51:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Root_POA.cpp:
+          Fixed handling of ort_adapter, made some errors when merging the
+          changes Ossama made last month
+
+        Tue Feb 15 09:08:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/PortableServerC.{h,cpp}:
+        * tao/PortableServer/PortableServer_Functions.{h,cpp}:
+        * tao/PortableServer/PortableServer_WFunctions.{h,cpp}:
+          Move the PortableServer functions out of the generated files and to
+          the new files, one for the string version, one for the wstring
+          versions. Reduces the number of patchin and when these methods are
+          not used there are not linked into the application
+
+        * tao/PortableServer/PortableServer.h:
+          Include the new PortableServer_Functions files
+
+        Mon Feb 14 12:41:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * all files:
+          Resynced with main archive in new POArefactor3 branch
+
+        * tao/Visibility.pid:
+        * tao/ValueModifier.pid:
+        * tao/VisibilityC.{h,cpp,inl}:
+        * tao/ValueModifier.{h,cpp,inl}:
+          New files with enums that come from orb.idl. Makes it possible to
+          not include orb.idl in the sublibraries.
+
+        Tue Feb  8 19:44:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/LifespanStrategy*.{h,cpp}:
+        * tao/PortableServer/Root_POA.cpp:
+          In the old POA there was a flag called use_imr_ that was set to
+          false before the imr was notified and set to the old value again
+          after the notify. Besided this flag it was checked whether
+          persistent was set or not. Reimplemented this in another way, added
+          use_imr() to the lifespan strategy, this returns always false for
+          transient and a member for persistent. This member is set to false
+          before we notify the imr and set back again after the notify.
+
+        Fri Feb  4 12:20:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp:
+          Fixed factory name.
+
+        Thu Feb  3 14:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Lifespan*.*:
+          Added last factories for creating this strategy
+
+        Wed Feb  2 12:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.{h,cpp}:
+          New factory to create instances of the unique iduniqueness strategy
+
+        * tao/PortableServer/IdUniqueness*.*:
+          Updated for new strategy
+
+        Mon Jan 31 11:25:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/*:
+          Added destroy method to all strategy factories, this will call
+          strategy_cleanup on the strategy. When requiring a service object
+          just get it using ACE_Dynamic_Service and when it return 0 we output
+          an error. We assume that all strategies are put in the service
+          repository in portableserver.cpp. This make all the code much
+          easier.
+
+        Fri Jan 28 13:12:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h:
+        * orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp:
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp:
+        * orbsvcs/orbsvcs/IFRService/Repository_i.h:
+        * orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp:
+        * orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp:
+        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp:
+        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp:
+        * orbsvcs/ImplRepo_Service/tao_imr_i.cpp:
+        * orbsvcs/tests/FtRtEvent/PushConsumer.cpp:
+        * orbsvcs/tests/FtRtEvent/PushSupplier.cpp:
+        * orbsvcs/tests/ImplRepo/scale/server_i.cpp:
+        * orbsvcs/examples/ORT/Gateway_i.h:
+        * examples/POA/DSI/Database_i.h:
+        * examples/POA/Default_Servant/File_i.cpp:
+        * examples/POA/Forwarding/Servant_Activator.h:
+        * examples/POA/Adapter_Activator/server.cpp:
+        * examples/POA/Loader/Servant_Activator.h:
+        * examples/POA/Loader/Servant_Locator.h:
+        * examples/POA/On_Demand_Activation/Servant_Activator.h:
+        * examples/POA/On_Demand_Activation/Servant_Locator.h:
+        * examples/POA/On_Demand_Loading/Servant_Activator.h:
+        * examples/POA/On_Demand_Loading/Servant_Locator.h:
+        * docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h:
+
+        Thu Jan 27 17:14:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/File_IO/File_i.cpp:
+        * tests/MProfile_Forwarding/Servant_Locator.h:
+        * tests/POA/Current/Current.cpp:
+        * tests/POA/Default_Servant/Default_Servant.cpp:
+        * tests/POA/Etherealization/Etherealization.cpp:
+        * tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp:
+        * tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp:
+        * tests/POA/Persistent_ID/server.cpp:
+          Added missing includes
+
+        Thu Jan 27 13:16:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+          Generate an include of ForwardRequestC.h to get
+          PortableServer::ForwardRequest because we don't give this for free
+          anymore when including portableserver
+
+        * tao/PortableServer/diffs/ForwardRequest.diff:
+          New diff file
+
+        * tao/PortableServer/ForwardRequest.pidl:
+        * tao/PortableServer/ForwardRequestC.{h,cpp,inl}:
+          Moved ForwardRequest to its own file
+
+        * tao/PortableServer/*Policy*.*:
+        * tao/PortableServer/PortableServer.cpp:
+          Removed the classes for policy values, just store the enum
+          The svc conf usage is too expensive
+
+         * tao/PortableServer/PortableServer.h:
+         Removed a lot of *C.h includes, only PortableServerC.h is now there.
+         Do you need other specific interfaces from the PortableServer library
+         you have to include the specific *C.h file.
+
+         * tao/PortableServer/ServantLocator*.*:
+         * tao/PortableServer/ServantManager*.*:
+         Update because of ForwardRequest moval and regenerated
+
+        Wed Jan 26 19:22:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Adapter_Activator.cpp:
+          Reverted the change below, when the_activator() fails, we just call
+          destroy and the _var will make sure the refcount goes to zero and
+          the child poa gets deleted
+
+        Wed Jan 26 19:15:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Adapter_Activator.cpp:
+          When the_activator() call fails after calling destroy on the just
+          created child POA, delete it to prevent a memory leak
+
+        Wed Jan 26 18:22:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/IdAssignmentPolicyFactory.h
+        * tao/PortableServer/IdAssignmentPolicyFactoryImpl.cpp
+        * tao/PortableServer/IdAssignmentPolicyFactoryImpl.h
+        * tao/PortableServer/IdUniquenessPolicyFactory.h
+        * tao/PortableServer/IdUniquenessPolicyFactoryImpl.cpp
+        * tao/PortableServer/IdUniquenessPolicyFactoryImpl.h
+        * tao/PortableServer/ImplicitActivationPolicyFactory.h
+        * tao/PortableServer/ImplicitActivationPolicyFactoryImpl.cpp
+        * tao/PortableServer/ImplicitActivationPolicyFactoryImpl.h
+        * tao/PortableServer/LifespanPolicy.cpp
+        * tao/PortableServer/LifespanPolicy.h
+        * tao/PortableServer/LifespanPolicyFactory.h
+        * tao/PortableServer/LifespanPolicyFactoryImpl.cpp
+        * tao/PortableServer/LifespanPolicyFactoryImpl.h
+        * tao/PortableServer/RequestProcessingPolicyFactory.h
+        * tao/PortableServer/RequestProcessingPolicyFactoryImpl.cpp
+        * tao/PortableServer/RequestProcessingPolicyFactoryImpl.h
+        * tao/PortableServer/ServantRetentionPolicyFactory.h
+        * tao/PortableServer/ServantRetentionPolicyFactoryImpl.cpp
+        * tao/PortableServer/ServantRetentionPolicyFactoryImpl.h
+        * tao/PortableServer/ThreadPolicy.cpp
+        * tao/PortableServer/ThreadPolicy.h
+        * tao/PortableServer/ThreadPolicyFactory.h
+        * tao/PortableServer/ThreadPolicyFactoryImpl.cpp
+        * tao/PortableServer/ThreadPolicyFactoryImpl.h
+          Use ACE_NEW_THROW_EX instead of ACE_RETURN to allocate the policies
+          and updated exception variables and specification for this.
+
+        * tao/PortableServer/Root_POA.cpp:
+        * tao/PortableServer/Policy_Creator_T.h:
+        * tao/PortableServer/Object_Adapter.cpp:
+          Updated to pass environment argument for change above
+
+        Mon Jan 24 17:30:06 2005  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+        * tao/PortableServer/Active_Policy_Strategies.cpp:
+        * tao/PortableServer/IdUniquenessPolicyValue.cpp:
+        * tao/PortableServer/IdUniquenessPolicyValueMultiple.cpp:
+        * tao/PortableServer/IdUniquenessPolicyValueUnique.cpp:
+        * tao/PortableServer/IdUniquenessStrategy.h:
+        * tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp:
+        * tao/PortableServer/IdUniquenessStrategyMultiple.cpp:
+        * tao/PortableServer/IdUniquenessStrategyMultiple.h:
+        * tao/PortableServer/IdUniquenessStrategyUnique.cpp:
+        * tao/PortableServer/IdUniquenessStrategyUnique.h:
+        * tao/PortableServer/ImplicitActivationPolicyFactory.h:
+        * tao/PortableServer/ImplicitActivationPolicyFactoryImpl.cpp:
+        * tao/PortableServer/ImplicitActivationPolicyValue.cpp:
+        * tao/PortableServer/ImplicitActivationPolicyValueExplicit.cpp:
+        * tao/PortableServer/ImplicitActivationPolicyValueImplicit.cpp:
+
+          Cosmetic fixes and @@ comments for Johnny. Looks like there is a
+          race condition that Johnny may have to address.
+
+        Mon Jan 24 11:29:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/IdAssignmentPolicyValueSystem.h:
+          Fixed include
+
+        Sun Jan 23 01:22:45 2005  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+        * tao/PortableServer/Adapter_Activator.cpp:
+        * tao/PortableServer/Default_Policy_Validator.cpp:
+        * tao/PortableServer/Default_Servant_Dispatcher.cpp:
+        * tao/PortableServer/IdAssignmentPolicyValue.cpp:
+        * tao/PortableServer/IdAssignmentPolicyValueSystem.cpp:
+        * tao/PortableServer/IdAssignmentPolicyValueSystem.h:
+        * tao/PortableServer/IdAssignmentPolicyValueUser.h:
+        * tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp:
+
+          Cosmetic fixes.
+
+        Sat Jan 22 23:08:08 2005  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+        * tao/PortableServer/PortableServer.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantActivator.cpp:
+        * tao/PortableServer/Root_POA.cpp:
+        * tao/PortableServer/Root_POA.h:
+        * tao/PortableServer/Servant_Upcall.cpp:
+        * tao/PortableServer/ThreadPolicy.h:
+        * tao/PortableServer/ThreadPolicyFactoryImpl.cpp:
+        * tao/PortableServer/ThreadPolicyValue.cpp:
+        * tao/PortableServer/ThreadPolicyValueORBControl.cpp:
+
+          Mostly cosmetic fixes and changes.
+
+        * tao/PortableServer/ThreadPolicy.pidl:
+
+          Added a enum which is missing from the spec.
+
+        Wed Jan 19 12:49:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Active_Policy_Strategies.cpp:
+          Fixed stupid copy/paste errors
+
+        * tao/PortableServer/PortableServer.cpp:
+          Added new Servant Retention factorys
+
+        Mon Jan 17 11:04:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/RTPortableServer/RT_POA.{h,cpp}:
+        * orbsvcs/orbsvcs/PortableGroup/GOA.{h,cpp}:
+          Updated method specification of create_reference_with_id to match
+          base class
+
+        Mon Jan 10 12:11:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/RequestProcessing*.*:
+          Added factories for Default Servant and AOMOnly so that we can
+          create instances per POA.
+
+        * tao/Active_Policy_Strategies.{h,cpp}:
+          Store request processing strategy factory
+
+        Mon Jan 10 10:12:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/PortableServer.pidl:
+          Removed raises (WrongPolicy) from create_reference_with_id, this
+          exception specification is not there anymore in the latest corba
+          spec. Addresses part of bugzilla bug [1917]
+
+        * tao/PortableServer/PortableServerA.cpp:
+        * tao/PortableServer/PortableServerC.{h,cpp,inl}:
+          Regenerated because of change above
+
+        * tao/PortableServer/Root_POA.{h,cpp}:
+        * tao/PortableServer/ServantRetentionStrategy*.{h,cpp}:
+          Updated method signature of create_reference_with_id because of
+          change above
+
+        Thu Dec 16 10:27:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ImR_Client/*:
+          New client library for the implementation repository
+
+        * tao/PortableServer/Impl*.*:
+          Moved several files to the ImR_Client library and added new adapter
+          for the ImR_Client
+
+        * tao/ImR_Client.mpc:
+          New mpc file for the new lib
+
+        * tao/PortableServer/LifespanStrategyPersistent.{h,cpp}:
+          Use the ImR Client adapter
+
+        * tao/orbsvcs/ImplRepo_Service/Forwarder.cpp:
+        * tao/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc:
+        * tao/orbsvcs/ImplRepo_Service/ImR_Activator.idl:
+        * tao/orbsvcs/ImplRepo_Service/Iterator.h:
+        * tao/orbsvcs/ImplRepo_Service/Server_Info.h:
+        * tao/orbsvcs/ImplRepo_Service/tao_imr_i.h:
+        * tao/orbsvcs/ImplRepo_Service/utils.h:
+          Updated for the move of the ImplRepo stuff
+
+        Wed Dec 15 15:45:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/ImplRepo_Service/Adapter_Activator.h:
+        * orbsvcs/ImplRepo_Service/Forwarder.h:
+        * orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp:
+          Include PortableServer.h instead of PortableServerC.h
+
+        Wed Dec 15 12:09:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/Attic/imr_client.mpb:
+          New file for the new ImR_Client library
+
+        Tue Dec 14 12:00:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/ServantRetention*.{h,cpp}:
+          Added factories for retain and non retain so that each poa gets its
+          own copy of this strategy. Also make sure that we cleanup things
+          again at closure
+
+        Fri Dec 10 15:20:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Profile.cpp:
+        * tao/PortableServer/ServantRetentionStrategy.{h.cpp}:
+        * tao/PortableServer/RequestProcessingStrategy.h:
+        * tao/PortableServer/RequestProcessingStrategyAOMOnly.{h,cpp}:
+        * tao/PortableServer/Root_POA.h:
+        * tao/PortableServer/PortableServer.cpp:
+        * tao/PortableServer/ThreadStrategy*.{h,cpp}:
+        * tao/PortableServer/Adapter_Activator.h:
+        * tao/PortableServer/ImplRepo_i.{h,cpp}:
+        * tao/Environment.h:
+        * tao/TypeCodeFactory_Adapter.h:
+          Fixed compile problems for emulated exceptions and minimum corba.
+
+        Fri Dec 10 13:27:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Root_POA.{h,cpp}:
+          Added post_invoke_servant_cleanup that calls request processing
+
+        * tao/PortableServer/Servant_Upcall.{h,cpp,inl}:
+          Use RootPOA::post_invoke_servant_cleanup() to call the servant
+          locator postinvoke. The servant locator has been removed as member,
+          the Cookie is now a void*, this way we can reduce the number of
+          includes needed for the servant upcall.
+
+        * tao/PortableServer/RequestProcessingStrategy*.{h,cpp}:
+          Added post_invoke_servant_cleanup. For servant locator it has an
+          implementation to call postinvoke on the servant locator, for the
+          other strategies it is a noop.
+
+        Fri Dec 10 05:02:27 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+        * tao/LF_CH_Event.h:
+        * tao/PortableServer/PortableServer_Functions.h:
+        * tao/PortableServer/ServerRequestInfo.h:
+
+          Fixed some subtle compile errors.
+
+        Thu Dec  9 14:24:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Active_Object_Map.{cpp,h,i}:
+        * tao/PortableServer/Active_Object_Map_Entry.{cpp,h}:
+          Moved Active_Object_Map_Entry to its own file
+
+        * tao/PortableServer/Servant_Upcall.cpp:
+          Include Active_Object_Map_Entry, more is not needed.
+
+        Wed Dec  8 13:57:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/ThreadStrategy*.{h,cpp}:
+          Added a type method to retrieve the type of strategy (single or orb
+          control). This is then used in the destroy method, for orb control
+          we just do nothing, for single threaded we delete the unique
+          instance per poa. When Bala agrees with this setup, I have to update
+          the other strategies with the same structure.
+
+        Wed Dec  8 12:30:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/*Policy.{h,cpp}:
+          Removed environment argument and exception specification from the
+          policy_type method, it doesn't throw an exception, just returns a
+          value, so no need to throw an exception.
+
+        Wed Dec  8 10:51:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/PortableServer_Functions.{h,cpp}:
+          Remove the string_to_objectid with string and length argument. It is
+          not in the spec, it can't be used by any user, so zapped it.
+
+        Wed Dec  8 10:36:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/PortableServer_Functions.{h,cpp}:
+          Moved the string_to_objectid and objectid_to_string methods to this
+          file and into the TAO::Portable_Server namespace. They stand on
+          their own and don't need to be in the RootPOA itself.
+
+        * tao/PortableServer/Root_POA.{h,cpp}:
+          Removed the methods that moved to the new file
+
+        * tao/PortableServer/PortableServerC.cpp:
+          No need to include RootPOA anymore, just include
+          PortableServer_Functions.h
+
+        Wed Dec  8 09:58:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Regular_POA.cpp:
+        * tao/PortableServer/Root_POA.{h,cpp}:
+          Fixed construction and parsing of object keys, the id of the poa is
+          set in a helper method which is called from the constructor and then
+          virtual functions don't work.
+
+        Tue Dec  7 14:45:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Root_POA.{h,cpp,inl}:
+        * tao/PortableServer/Regular_POA.{h,cpp,inl}:
+          Removed the parent_ member from the Root POA, a root POA has no
+          parent. Added parent_ as member to RegularPOA. Added root(),
+          root_key_type() and remove_from_parent_i() as virtual to RootPOA and
+          override them in RegularPOA. One thing to remember is that the RTPOA
+          is derived from RegularPOA and then the RegularPOA is created in the
+          role of RootPOA, so, in the new methods above, check if parent_ !=
+          0, if it is 0, we are Regular POA in the role of root poa.
+
+        Tue Dec  7 14:12:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/orbconf.h:
+          Changed TAO_DEFAULT_ROOTPOA_NAME to "RootPOA", according to the
+          corba spec, the RootPOA must be named this way to be able to use
+          portable interceptors.
+
+        Tue Dec  7 11:14:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/ThreadStrategySingleFactoryImpl.{h,cpp}:
+          New factory for creating instances of the single thread strategy.
+          Each POA must have a unique instance because of the data stored
+
+        * tao/PortableServer/ThreadStrategyFactoryImpl.cpp:
+          For single thread strategy, get the single factory and call there
+          create, for the orb control we just get the singleton instance and
+          return that.
+
+        * tao/PortableServer/PortableServer.cpp:
+          Added single thread strategy factory for static case
+
+          Also added a destroy() method that must be implemented, but the
+          problem is now that I get a ThreadStrategy pointer and don't know
+          which factory to use for the destroy.
+
+        Tue Dec  7 11:12:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/ImplRepo_Service/tao_imr_i.cpp:
+        * orbsvcs/examples/ORT/Object_Factory_i.cpp:
+        * examples/POA/FindPOA/FindPOA.cpp:
+        * examples/POA/On_Demand_Loading/Servant_Manager.h:
+        * examples/Quoter/Quoter_i.cpp:
+        * tests/UNKNOWN_Exception/server.cpp:
+        * orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp:
+          Fixed compile errors now TAO_POA is gone
+
+        Mon Dec  6 16:13:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,cpp,i}:
+        * tao/PortableServer/Regular_POA.{h,cpp,inl}:
+          Renamed TAO_POA to TAO_Regular_POA. This will cause now compile
+          errors but this way wrong cast are found by the compiler
+
+        * tao/PortableServer/*.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/GOA.{h,cpp}:
+        * orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp:
+        * orbsvcs/orbsvcs/IFRService/IRObject_i.cpp:
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
+          Updated for TAO_Regular_POA
+
+        * orbsvcs/Trading_Service/Trading_Service.mpc:
+          Add utils as base project because TAO_ORB_Manager is now there
+
+        Mon Dec  6 14:54:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp:
+          The RootPOA is now not a TAO_POA, so a dynamic cast of the root
+          poa to TAO_POA will fail. This fixes the IORinterceptor test. As a
+          result of this, it seems the safest to rename TAO_POA to
+          TAO_Regular_POA, that way we know for sure that code that does a
+          dynamic cast is identified by the compiler instead of having obscure
+          runtime crashes
+
+        Mon Dec  6 11:03:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.{h,cpp}:
+          Updated for RootPOA change
+
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h:
+        * orbsvcs/LoadBalancer/Signal_Handler.h:
+        * orbsvcs/IFR_Service/IFR_Service.h:
+          Include PortableServer.h instead of PortableServerC.h
+
+        Fri Dec  3 14:56:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Root_POA.cpp
+        * tao/PortableServer/Root_POA.h
+        * tao/PortableServer/Root_POA.inl
+        * tao/PortableServer/POA.cpp
+        * tao/PortableServer/POA.h
+        * tao/PortableServer/POA.i
+          The TAO_POA has been changed to TAO_Root_POA. TAO_POA is now derived
+          from TAO_Root_POA. The RootPOA will be stripped the next week and
+          the TAO_POA will be extended. The RootPOA doesn't have the ability
+          to set user defined policies, so doesn't need the policy set, that
+          is only needed in the TAO_POA. An application using only the RootPOA
+          will use much less than a full blown POA.
+
+        * tao/PortableServer/Active_Policy_Strategies.cpp
+        * tao/PortableServer/Active_Policy_Strategies.h
+        * tao/PortableServer/Default_Servant_Dispatcher.cpp
+        * tao/PortableServer/Default_Servant_Dispatcher.h
+        * tao/PortableServer/IdAssignmentStrategy.cpp
+        * tao/PortableServer/IdAssignmentStrategy.h
+        * tao/PortableServer/IdUniquenessStrategyMultiple.cpp
+        * tao/PortableServer/IdUniquenessStrategyMultiple.h
+        * tao/PortableServer/IdUniquenessStrategyUnique.cpp
+        * tao/PortableServer/IdUniquenessStrategyUnique.h
+        * tao/PortableServer/ImplicitActivationStrategy.cpp
+        * tao/PortableServer/ImplicitActivationStrategy.h
+        * tao/PortableServer/LifespanStrategy.cpp
+        * tao/PortableServer/LifespanStrategy.h
+        * tao/PortableServer/LifespanStrategyPersistent.cpp
+        * tao/PortableServer/Non_Servant_Upcall.cpp
+        * tao/PortableServer/Non_Servant_Upcall.h
+        * tao/PortableServer/Non_Servant_Upcall.inl
+        * tao/PortableServer/Object_Adapter.cpp
+        * tao/PortableServer/Object_Adapter.h
+        * tao/PortableServer/Object_Adapter.i
+        * tao/PortableServer/POA_Current_Impl.cpp
+        * tao/PortableServer/POA_Current_Impl.h
+        * tao/PortableServer/POA_Current_Impl.inl
+        * tao/PortableServer/POA_Guard.cpp
+        * tao/PortableServer/POA_Guard.h
+        * tao/PortableServer/POAManager.cpp
+        * tao/PortableServer/POAManager.h
+        * tao/PortableServer/POAManager.i
+        * tao/PortableServer/Policy_Strategy.h
+        * tao/PortableServer/PS_ForwardC.h
+        * tao/PortableServer/RequestProcessingStrategy.cpp
+        * tao/PortableServer/RequestProcessingStrategy.h
+        * tao/PortableServer/RequestProcessingStrategyDefaultServant.h
+        * tao/PortableServer/Servant_Dispatcher.h
+        * tao/PortableServer/Servant_Upcall.cpp
+        * tao/PortableServer/Servant_Upcall.h
+        * tao/PortableServer/Servant_Upcall.inl
+        * tao/PortableServer/ServantRetentionStrategy.h
+        * tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
+        * tao/PortableServer/ServantRetentionStrategyNonRetain.h
+        * tao/PortableServer/ServantRetentionStrategyRetain.cpp
+        * tao/PortableServer/ServantRetentionStrategyRetain.h
+        * tao/PortableServer/ThreadStrategy.cpp
+        * tao/PortableServer/ThreadStrategy.h
+        * tao/IIOP_Acceptor.cpp
+        * tao/IORInterceptor_Adapter.h
+        * tao/Profile.cpp
+        * tao/IORInterceptor/IORInfo.cpp
+        * tao/IORInterceptor/IORInfo.h
+        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
+        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
+        * tao/RTPortableServer/RT_Collocation_Resolver.cpp
+        * tao/RTPortableServer/RT_POA.cpp
+        * tao/RTPortableServer/RT_POA.h
+        * tao/RTPortableServer/RT_Policy_Validator.cpp
+        * tao/RTPortableServer/RT_Servant_Dispatcher.cpp
+        * tao/RTPortableServer/RT_Servant_Dispatcher.h
+          Use TAO_Root_POA instead of TAO_POA
+
+        Fri Dec  3 14:11:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h:
+          Include PortableServer.h instead of PortableServerC.h
+
+        Fri Dec  3 10:48:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h:
+          Include PortableServer.h
+
+        * tao/PortableServer/POAManager.h:
+        * tao/PortableServer/LifespanStrategyTransient.cpp:
+          Made get_state_i public, need it for the lifespan strategy. I used
+          the get_state previously, but this tries to acquire a lock and this
+          doesn't work on Linux where the locks are non-recursive
+
+        Thu Dec  2 14:28:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h:
+        * orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h:
+          Don't include PortableServerC.h, just use a forward declaration
+
+        * orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h:
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h:
+        * /tests/ORT/ServerRequestInterceptor.h:
+          Include PortableServer.h instead of PortableServerC.h
+
+        Thu Dec  2 12:11:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/PortableGroup.idl:
+          Include PortableServer_include.pidl
+
+        * orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h:
+          Include PortableServer.h instead of PortableServerC.h
+
+        * tao/PortableServer/Servant_Dispatcher.h:
+        * tao/PortableServer/Object_Adapter.cpp:
+        * tao/PortableServer/Default_Servant_Dispatcher.{h,cpp}:
+        * tao/RTPortableServer/RT_Object_Adapter_Factory.cpp:
+        * tao/RTPortableServer/RT_Servant_Dispatcher.{h,cpp}:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.{h,cpp}:
+          Renamed create_POA to create_Root_POA, this method is just used to
+          create the RootPOA. Also removed the parent argument, a Root POA has
+          no parent, so no need to pass it.
+
+        Thu Dec  2 11:31:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/LifespanStrategy.h:
+        * tao/PortableServer/LifespanStrategyPersistent.{h,cpp}:
+        * tao/PortableServer/LifespanStrategyTransient.{h,cpp}:
+        * tao/PortableServer/POA.{h,cpp}:
+        * tao/PortableServer/Servant_Upcall.cpp:
+          Implemented section 11.3.8.2 of the corba spec, when the transient
+          lifespan policy is set, and the POAManager is inactive, a
+          object_not_exist with minor code 4 must be thrown. The
+          Servant_Upcall just calls now check_state on the POA, this calls the
+          lifespan strategy, which uses the POAManager. The Servant_Upcall now
+          just doesn't use the POAManager anymore, just the POA.
+
+        Thu Dec  2 10:38:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/ServantRetentionStrategyRetain.cpp (find_servant):
+          Fixed bug I introduced yesterday. poa_current must be always updated
+          with the user id
+
+        Thu Dec  2 09:14:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Prevent that users can include PortableServerC.h, they must include
+        PortableServer.h, thanks to Bala for giving the hint how to do this.
+
+        * tao/PortableServer/PortableServer_include.pidl:
+          New file, this file should be included by people using
+          PortableServer.pidl
+
+        * tao/PortableServer/PortableServer_includeC.h:
+        * tao/PortableServer/PortableServer_includeS.h:
+          New generated files
+
+        * tao/PortableServer/PortableServerC.h:
+          Added check that users can't include this file, they must include
+          PortableServer.h.
+
+        * orbsvcs/orbsvcs/RTCosScheduling.idl:
+          Include PortableServer_include.pidl
+
+        Wed Dec  1 14:35:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/RequestProcessingStrategyServantActivator.cpp:
+          Changed locate_servant, etherealize is called much less than
+          previously. See 11.3.6.1 of the corba spec
+
+        Wed Dec  1 12:33:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Servant_Base.{h,cpp}:
+          Renamed _ref_count to _refcount_value and made it return a
+          CORBA::ULong. The method is now in the corba spec. This fixes
+          bugzilla bug [1951].
+
+        Wed Dec  1 12:17:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/SystemException.cpp:
+          Fixed typo and added some missing messages
+
+        * tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp:
+          Throw object not exist with the minor code described in the spec
+
+        * orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp:
+          Removed obsolete code
+
+        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp:
+          Changed some formatting of debug messages.
+
+        Wed Dec  1 09:18:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Fixed a few bugs introduced yesterday, not all strategies where added
+        to the service repository. Furthermore made serveral ObjectId
+        arguments const& so that we don't make a copy of it.
+
+        Tue Nov 30 15:43:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.cpp (create_POA_i(:
+          Fixed possible leak of POAManager when create_POA_i fails.
+
+        * tao/PortableServer/*.{h,cpp}:
+          Updated all classnames for policy values so that things are
+          consistent. Made the strategy implementations that don't contain
+          data loadable with svc.conf in such a way that we only have one
+          instance for all POA's.
+
+        Mon Nov 29 18:58:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/PortableServer.cpp:
+        * tao/PortableServer/ThreadStrategy*.{h,cpp}:
+          Made the different thread strategy implementations loadable with
+          service config.
+
+        Mon Nov 29 15:16:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/ImplRepo.pidl:
+        * tao/PortableServer/ServerObject.pidl:
+          Moved the ServerObject interface to its own pidl file, we deliver a
+          servant for this interface, the remaining of ImplRepo we just use as
+          client. This way we only link ServerObjectS, not ImplRepoS
+
+        * tao/PortableServer/ImplRepo{A,S,C}.{h,cpp,inl}:
+          Regenerated
+
+        * tao/PortableServer/ServerObject{A,S,C}.{h,cpp,inl}
+          New files
+
+        Mon Nov 29 11:08:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.cpp:
+        * tao/PortableServer/RequestProcessingStrategy*.{h,cpp}:
+          Renames reference_to_servant to system_id_to_servant, the reference
+          argument was not used anywhere.
+
+        Mon Nov 29 10:45:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.h:
+          Made some methods public that are needed by the persistent lifespan
+          strategy.
+
+        * tao/PortableServer/LifespanStrategyPersistent.cpp:
+          Enabled ImR code
+
+        Mon Nov 29 09:34:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/AVStreams/Full_Profile/server.h:
+        * performance-tests/Cubit/TAO/MT_Cubit/server.h:
+        * orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp:
+        * orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp:
+        * orbsvcs/Trading_Service/Trading_Service.h:
+        * performance-tests/POA/Demux/demux_test_server.h:
+        * orbsvcs/Naming_Service/Naming_Service.h:
+        * orbsvcs/tests/Redundant_Naming/client.cpp:
+        * examples/Callback_Quoter/Consumer_Handler.h:
+        * examples/Callback_Quoter/Notifier_i.h:
+        * orbsvcs/tests/FT_App/StubFaultNotifier.cpp:
+        * orbsvcs/tests/FT_App/StubFaultConsumer.cpp:
+        * orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp:
+        * orbsvcs/tests/FT_App/StubBatchConsumer.cpp:
+        * orbsvcs/tests/FT_App/FT_TestReplica_i.cpp:
+        * orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp:
+          Removed include of ORB_Manager, was not used at all
+
+        * orbsvcs/Time_Service/Clerk_i.h:
+        * orbsvcs/Time_Service/Server_i.h:
+        * orbsvcs/LifeCycle_Service/LifeCycle_Service.h:
+        * orbsvcs/Concurrency_Service/Concurrency_Service.h:
+        * orbsvcs/tests/Property/client.h:
+        * orbsvcs/tests/Property/server.h:
+        * orbsvcs/tests/Simple_Naming/client.h:
+        * orbsvcs/tests/Trading/colocated_test.cpp:
+        * orbsvcs/tests/Trading/export_test.cpp:
+        * orbsvcs/tests/Trading/import_test.cpp:
+        * examples/Callback_Quoter/Notifier_Input_Handler.h:
+        * examples/Event_Comm/Notifier_Server.h:
+        * examples/Load_Balancing/Identity_Server.h:
+        * examples/Load_Balancing/Identity_Client.h:
+        * examples/Load_Balancing/Load_Balancing_Service.h:
+        * examples/Load_Balancing_persistent/Identity_Server.h:
+        * examples/Load_Balancing_persistent/Identity_Client.h:
+        * examples/Load_Balancing_persistent/Load_Balancing_Service.h:
+        * examples/Logging/Logging_Service_i.h:
+        * examples/Quoter/Generic_Factory.h:
+        * examples/Simple/chat/Client_i.h:
+        * examples/OBV/Simple_util.h:
+        * examples/Persistent_Grid/Simple_util.h:
+        * examples/Quoter/Factory_Finder.h:
+        * performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h:
+        * examples/Simple/Simple_util.h:
+        * examples/Simple/chat/Server_i.h:
+        * orbsvcs/tests/Security/ssliop_corbaloc/client.h:
+        * performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h:
+        * examples/Simple/chat/Broadcaster_i.h:
+        * examples/Simple/bank/AccountManager_i.{h,cpp}:
+        * examples/Simulator/Event_Supplier/Event_Sup.cpp:
+        * examples/Simulator/Event_Supplier/DualEC_Sup.cpp:
+        * examples/Simulator/Event_Supplier/Logging_Sup.cpp:
+        * tests/NestedUpcall/Triangle_Test/server_A.h:
+        * tests/NestedUpcall/Triangle_Test/server_B.h:
+        * tests/NestedUpcall/Triangle_Test/initiator.h:
+        * tests/NestedUpcall/MT_Client_Test/local_server.{h,cpp}:
+        * tests/NestedUpcall/MT_Client_Test/server.h:
+        * tests/InterOp-Naming/Server_i.h:
+        * performance-tests/Pluggable/PP_Test_Server.h:
+        * tests/Multiple_Inheritance/server.cpp:
+          Use TAO_ORB_Manager from tao/Utils now.
+
+        * performance-tests/Pluggable/Pluggable.mpc:
+        * tests/Multiple_Inheritance/Multiple_Inheritance.mpc:
+        * tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc:
+        * tests/InterOp-Naming/InterOp-Naming.mpc:
+        * tests/NestedUpcall/Triangle_Test/TT.mpc:
+        * orbsvcs/Time_Service/Time_Service.mpc:
+        * orbsvcs/tests/Security/ssliop_corbaloc/corbaloc_ssliop.mpc:
+        * orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc:
+        * orbsvcs/Concurrency_Service/Concurrency_Service.mpc:
+        * orbsvcs/tests/Property/Property.mpc:
+        * orbsvcs/tests/Simple_Naming/Simple_Naming.mpc:
+        * orbsvcs/tests/Trading/Trading.mpc:
+        * examples/Callback_Quoter/Callback_Quoter.mpc:
+        * examples/Event_Comm/Event_Comm.mpc:
+        * performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc:
+        * performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc:s
+        * examples/Load_Balancing/Load_Balancing.mpc:
+        * examples/OBV/Typed_Events/Typed_Events.mpc:
+        * examples/Load_Balancing_persistent/Load_Balancing.mpc:
+        * examples/Logging/Logging.mpc:
+        * examples/Quoter/Quoter.mpc:
+        * examples/Persistent_Grid/Persistent_Grid.mpc:
+        * examples/Simple/bank/bank.mpc:
+        * examples/Simple/chat/chat.mpc:
+        * examples/Simple/echo/echo.mpc:
+        * examples/Simulator/Event_Supplier/Event_Supplier.mpc:
+        * examples/Simple/grid/grid.mpc:
+        * examples/Simple/time/time.mpc:
+          Add utils as base project because TAO_ORB_Manager is now there
+
+        * orbsvcs/tests/AVStreams/Multicast/ftp.h:
+          Removed TAO_ORB_Manager* members, they are not used at all
+
+        Sun Nov 28 19:00:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/AV/AVStreams_i.h:
+        * orbsvcs/orbsvcs/AV/Endpoint_Strategy.h:
+        * orbsvcs/orbsvcs/AV/Policy.h:
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp:
+        * orbsvcs/orbsvcs/Time/TAO_TIO.h:
+          Removed include of ORB_Manager, was not used at all
+
+        * orbsvcs/orbsvcs/CosTrading.mpc:
+        * orbsvcs/Scheduling_Service/Scheduling_Service.mpc
+          Add utils as base project because TAO_ORB_Manager is now there
+
+        * orbsvcs/orbsvcs/Trader/Trading_Loader.h:
+        * orbsvcs/Scheduling_Service/Scheduling_Service.h:
+          Use TAO_ORB_Manager from tao/Utils now.
+
+        Sun Nov 28 11:27:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/ORB_Manager.{h,cpp}:
+        * tao/Utils/ORB_Manager.{h,cpp}:
+          Moved from PortableServer to Utils library, just a helper class that
+          doesn't need to be in PortableServer
+
+        * tao/PortableServer/Object_Adapter.{h,i}:
+          Added enabled_locking accessor method and made the member protected
+          again.
+
+        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
+          Use the enabled_locking method
+
+        Fri Nov 26 08:47:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/POA/On_Demand_Loading/Servant_Manager.h:
+          Added include of Servant_Base.h
+
+        * tests/POA/Default_Servant/Default_Servant.cpp:
+          Fixed unused variable warning
+
+        * tests/UNKNOWN_Exception/server.cpp:
+          Replaced _tao_poa_downcast with a dynamic cast
+
+        Thu Nov 25 18:02:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/RequestProcessingStrategyAOMOnly.h:
+          Removed TAO_POA pointer, left by accident here, it is now in the
+          base, but this caused all tests to crash in my branch.
+
+        Thu Nov 25 17:52:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/RTCORBA/RTCORBA.pidl:
+          Added include of Policy.pidl
+
+        Thu Nov 25 15:53:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,cpp}:
+        * tao/PortableServer/POA_Policy_Set.{h,i}:
+          Added get_policy, to retrieve the policy for a given type
+
+        * tao/PortableServer/ServerRequestInfo.cpp:
+        * tao/IORInterceptor/IORInfo.cpp:
+          Instead of getting the complete policy set, call get_policy on the
+          POA
+
+        Thu Nov 25 12:32:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/*Strategy*.{h,cpp}:
+          Added environment variable to strategy_init and added a
+          strategy_cleanup that will be called to let all the strategies
+          cleanup their stuff. Removed TAO::Portable_Server:: before
+          Non_Servant_Upcall, this is not needed.
+
+        * tao/PortableServer/Active_Policy_Strategies.{h,cpp}:
+          Initialize and cleanup all strategies
+
+        * tao/PortableServer/POA.cpp:
+          Call cleanup on strategies
+
+        Thu Nov 25 11:04:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Sequence.h:
+        * tao/TypeCodeFactory_Adapter.h:
+          Removed include of default_environment
+
+        * tao/ORB.cpp:
+          Added include of default_environment
+
+        Wed Nov 24 19:47:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/RequestProcessingStrategyServantLocator.cpp:
+          Fixed bug in locate_servant, first call find_servant on the POA,
+          this will update the poa_current_impl with the needed info
+
+        Wed Nov 24 15:10:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Environment.{h,i,cpp}:
+          Removed default_environment, which was deprecated, with this gone,
+          we can move the include of default_environment.h to the cpp file.
+
+        * tao/default_environment.h:
+          Fixed typo in comment
+
+        * tao/Pseudo_VarOut_T.h:
+          Removed commented out include
+
+        Wed Nov 24 13:12:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Typecode_typesC.h:
+        * tao/Typecode.h:
+          Use the correct template for the template for TypeCode_var and
+          TypeCode_out, and move it from the generated file to the normal
+          file. This fixes the runtime problems with typecodes.
+
+        Wed Nov 24 10:14:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/*C.*:
+        * tao/diffs/*.diff:
+          Regenerated several files, it is not easy work, but we have to do it
+          sometimes. Also updated the diffs.
+
+        Wed Nov 24 07:38:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp:
+        * tao/IORInterceptor/IORInterceptorC.cpp:
+          Added includes of the factory impl, so that in a static build these
+          factories are linked within the executable, so that service
+          configurator registry is correctly filled. This is also a problem in
+          the main branch, after review of Bala, maybe this goes into the
+          main, or I have to change the solution here.
+
+        Wed Nov 24 07:38:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ORB_Core.cpp:
+          Moved the error about the missing IORInterceptor Adapter Factory
+          to the add_interceptor method, on the ior_interceptor_adapter() the
+          error was given also when we don't use IORInterceptor
+
+        Tue Nov 23 14:51:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ObjRefTemplate/*C.{h,cpp,inl}:
+          Regenerated
+
+        Tue Nov 23 12:52:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ORB_Core.cpp:
+          Print an error if the IORInterceptor Adapter Factory can't be
+          retrieved. Someway some tests can't get the IORInterceptor factory,
+          no idea why yet, but now it is more clear what is the problem
+
+        * tao/IORInterceptor/*C.{h,cpp,inl}:
+          Regenerated
+
+        Tue Nov 23 11:04:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/*FactoryImpl.cpp:
+          Corrected static service name
+
+        * tao/PortableServer/PortableServer.cpp:
+          Added process directives to fill service repository in a static
+          build
+
+        Tue Nov 23 10:09:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,i}:
+          Added priority_model, to get the priority model of this POA
+
+        * tao/RTPortableServer/RT_Collocation_Resolver.cpp:
+        * tao/RTPortableServer/RT_POA.cpp:
+        * tao/RTPortableServer/RT_Servant_Dispatcher.cpp:
+          Use priority_model, cached policies are not retrievable anymore
+
+        Tue Nov 23 08:53:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,i}:
+          Removed cached_policies(), not needed anymore
+
+        Tue Nov 23 08:45:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.h:
+          Removed active_policy_strategies(), only the POA can use the
+          strategies. Added validate_lifespan that can be used by the object
+          adapter.
+
+        * tao/PortableServer/Object_Adapter.cpp:
+          Use validate_lifespan.
+
+        * tao/PortableServer/POA.{h,cpp}:
+        * tao/PortableServer/ServantRetentionStrategy*.{h,cpp}:
+        * tao/PortableServer/RequestProcessingStrategy*.{h,cpp}:
+          Changed servant_to_id on the servant retention policy to
+          servant_to_user_id, added servant_to_id on the request processing
+          policy, call this from the POA, the servant_to_id will then call
+          servant_to_user_id again. This reduce the coupling.
+
+        Mon Nov 22 16:55:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,cpp}:
+        * tao/PortableServer/Servant_Upcall.cpp:
+          Added enter/exit to the POA, which calls the thread strategy. The
+          Servant upcall now doesn't to get the thread strategy directly
+
+        Mon Nov 22 15:56:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,cpp}:
+        * tao/PortableServer/ServantRetentionStrategy*.{h,cpp}:
+        * tao/PortableServer/RequestProcessingStrategy*.{h,cpp}:
+          Instead of passing the etherealize_objects with the
+          deactivate_all_objects call, call etherealize_objects on the request
+          processing strategy, and then just call deactivate_all_objects on
+          the servant_retention strategy. In case servants than need to be
+          deactivated, this will be done by the request processing strategy
+          which will have the correct value at that moment
+
+        Mon Nov 22 14:27:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,cpp}:
+        * tao/PortableServer/ServantRetentionStrategy*.{h,cpp}:
+        * tao/PortableServer/RequestProcessingStrategy*.{h,cpp}:
+        * tao/PortableServer/Active_Policy_Strategies.cpp:
+        * tao/PortableServer/Servant_Upcall.cpp:
+          Changed the cleanup_servant, this is now called on the request
+          processing policy, which uses then unbind_using_user_id on the
+          servant retention strategy. Now the servant retention strategy is
+          not using the request processing strategy directly anymore. The only
+          thing is that we only have to move the etherealize_objects_ member
+          our of the retain servant retention strategy, it doesn't belong
+          there.
+
+        Mon Nov 22 13:39:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,cpp}:
+        * tao/PortableServer/ServantRetentionStrategy*.{h,cpp}:
+          Added unbind_using_user_id, needed for cleanup
+
+        Mon Nov 22 13:11:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,cpp}:
+        * tao/PortableServer/ServantRetentionStrategy*.{h,cpp}:
+        * tao/PortableServer/RequestProcessingStrategy*.{h,cpp}:
+          Changed how the locate_servant is implemented that really uses the
+          servant. The POA calls now request processing, which can call
+          find_servant on the servant retention strategy.
+
+        Mon Nov 22 12:33:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,cpp}:
+        * tao/PortableServer/ServantRetentionStrategy*.{h,cpp}:
+        * tao/PortableServer/RequestProcessingStrategy*.{h,cpp}:
+          Changed how locate_servant is implemented. Now the POA calls the
+          request processing strategy, which can call servant_present on the
+          servant retention strategy. This makes the implementation much
+          clearer.
+
+        Fri Nov 19 14:39:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/ServantRetentionStrategyRetain.cpp (locate_servant):
+          Just pass user_id with find_servant_using_system_id_and_user_id
+          instead of calling poa_current_impl again
+
+        Fri Nov 19 14:04:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,cpp}:
+        * tao/PortableServer/ServantRetentionStrategy*.{h,cpp}:
+        * tao/PortableServer/RequestProcessingStrategy*.{h,cpp}:
+          Changed the implementation of reference_to_servant. Previously the
+          POA called the servant retention, which called request processing.
+          This has been turned around. POA calls now reference_to_servant on
+          the request processing, which can call find_servant on the servant
+          retention strategy. This make the splitting of behaviour much
+          easier and cleaner. This will be done for another few methods, so
+          that servant retention and request processing are not coupled so
+          hard.
+
+        Fri Nov 19 09:23:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/ThreadStrategy.{h,cpp}:
+        * tao/PortableServer/Active_Policy_Strategies.cpp:
+        * tao/PortableServer/IdUniquenessStrategy.h:
+        * tao/PortableServer/LifespanStrategy.h:
+        * tao/PortableServer/Policy_Strategy.h:
+        * tao/PortableServer/RequestProcessingStrategy.h:
+        * tao/PortableServer/ServantRetentionStrategy.h:
+        * tao/PortableServer/RequestProcessingStrategyServantActivator.{h,cpp}:
+          Added strategy_init again to the policy_strategy, the strategies are
+          getting independent of each other, making it only needed to pass the
+          POA to this method, so we can declare it again pure virtual in the
+          base.
+
+        Wed Nov 17 11:50:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/IdAssignmentStrategySystem.cpp:
+          Return true in has_system_id(), not false, stupid copy/paste error
+
+        Wed Nov 17 11:01:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/ServantRetentionStrategyNonRetain.cpp:
+          Call the get_servant_i() on the POA instead of on the request
+          processing strategy. Also corrected some exceptions that we throw
+          based on the latest corba spec
+
+        Wed Nov 17 10:51:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,cpp}:
+          Added get_servant_i()
+
+        Wed Nov 17 07:42:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_traits.cpp:
+        * TAO_IDL/be/be_visitor_exception/ctor_assign.cpp:
+        * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp:
+          Moved the POArefactor2 branch to the latest version of these files.
+          Jeff fixes some issues
+
+        * tao/*C.{h,cpp,inl}:
+        * tao/PortableServer/*C.{h,cpp,inl}:
+          Regenerated all files with the fixes above
+
+        Tue Nov 16 14:23:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{cpp,h}:
+        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
+        * tao/PortableServer/IdAssignmentStrategy*.{h,cpp}:
+          Added has_system_id() to the POA, this calls then the id_assignment
+          strategy and in the places where the id_assignment policy value was
+          checked, call the POA::has_system_id() method
+
+        Tue Nov 16 13:01:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/tao.mpc:
+          Added the new files, in the PortableServer directory I don't have to
+          do this, but in tao.mpc all files are listed explicitly.
+
+        * tao/PortableServer/PortableInterceptorC.h:
+          Removed the Objref_Traits for ::PortableInterceptor::IORInterceptor,
+          it was removed earlier.
+
+        Tue Nov 16 12:05:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/IdUniquenessStrategyMultiple.cpp:
+        * tao/PortableServer/LifespanStrategyPersistent.cpp:
+        * tao/PortableServer/Object_Adapter.cpp:
+        * tao/PortableServer/POA.{cpp,h}:
+        * tao/PortableServer/RequestProcessingStrategyServantActivator.cpp:
+        * tao/PortableServer/ServantRetentionStrategyNonRetain.cpp:
+        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
+          Added server_priority to the POA, which gets the server_priority
+          from the cached_policies, use this in the strategies and shortened
+          the documentation above the Non_Servant_Upcall usages.
+
+        Tue Nov 16 10:27:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/LifespanStrategy*.{h,cpp}:
+        * tao/PortableServer/POA.{h,cpp}:
+        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
+        * tao/PortableServer/ServantRetentionStrategyNonRetain.h
+          Renamed persistent to is_persistent on the lifespan strategy and
+          implemented it in the cpp file. Added is_persistent to the POA and
+          use this method instead of the lifespan strategy directly
+
+        Tue Nov 16 10:10:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/LifespanStrategyPersistent.cpp:
+        * tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp:
+        * tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantActivator.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantLocator.cpp:
+        * tao/PortableServer/ServantRetentionStrategyNonRetain.cpp:
+          Cosmetic changes
+
+        Tue Nov 16 07:34:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/tao.mpc:
+          Added Typecode_typesC.cpp
+
+        Mon Nov 15 18:55:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,cpp}:
+        * tao/PortableServer/IdUniquenessStrategy*.{h,cpp}
+        * tao/PortableServer/Active_Policy_Strategies.cpp:
+          Added is_servant_active to the POA which calls the
+          is_servant_in_map on the servant retention strategy. The id
+          uniqueness strategy now calls the POA instead of the servant
+          retention strategy directly, changed the strategy_init argument to
+          a POA pointer.
+
+        Mon Nov 15 18:45:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Active_Policy_Strategies.cpp:
+        * tao/PortableServer/ServantRetentionStrategy*.{h,cpp}:
+          Removed the id_assignment strategy from the strategy_init call, it
+          is not used here.
+
+        Mon Nov 15 18:42:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,cpp}:
+        * tao/PortableServer/ServantRetentionStrategy*.{h,cpp}:
+        * tao/PortableServer/Active_Policy_Strategies.cpp:
+          Added allow_multiple_activations to the POA, use this in the servant
+          retention strategy. The id uniqueness policy is now not needed
+          directly anymore in the servant retention strategy, so zapped it
+          there
+
+        Mon Nov 15 18:32:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,cpp}:
+        * tao/PortableServer/ServantRetentionStrategy*.{h,cpp}:
+          Added allow_implicit_activation to the POA which calls the implicit
+          activation policy. In the servant retention strategy use this
+          method, this way the servant retention strategy is not dependen on
+          implicit activation policy directly.
+
+        Mon Nov 15 18:21:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,cpp}:
+        * tao/PortableServer/RequestProcessingStrateg*.{h,cpp}:
+        * tao/PortableServer/Active_Policy_Strategies.cpp:
+          Added servant_has_remaining_activations and
+          rebind_using_user_id_and_system_id to the POA and use these in the
+          servant activator request processing strategy instead of calling the
+          servant retention strategy directly. Because of this, the request
+          processing strategy doesn't need the servant retention strategy
+          directly anymore, so removed the srs from the strategy_init call.
+
+        * tao/PortableServer/ServantRetentionStrategy.h:
+          Cosmetic changes
+
+        Mon Nov 15 16:11:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/*.h:
+          Cosmetic changes
+
+        * tao/PortableServer/POA.{h,cpp}:
+        * tao/PortableServer/RequestProcessingStrategyServantActivator.cpp:
+        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
+          Added is_servant_activation_allowed() to the POA and the POA
+          delegates this to the id_uniqueness strategy. The retain servant
+          retention strategy and the servant acivator request processing
+          strategy just call now the POA instead directly using the
+          id_uniqueness strategy. The strategies should be decoupled from
+          other strategies, this is the first change for that approach, thanks
+          to Bala and Carlos for coming with this approach.
+
+        Mon Nov 15 10:01:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Typecode_types.pidl:
+        * tao/Typecode_types.{h,cpp,inl}:
+        * tao/Typecode.{h,cpp}:
+        * tao/ORB.idl:
+        * tao/diffs/Typecode.diff
+          Moved the typecode interface forward declaration with the TCKind
+          enum to a new file that can be compiled with the IDL compiler.
+          Removed some stuff from the Typecode.{h,cpp} that is now generated
+          by the IDL compiler. Some patches have to be done, these are in the
+          diff file.
+
+        * tao/Typecode_types.pidl:
+          Added missing tk_event to the TCKind enum
+
+        * tao/*.pidl:
+        * tao/PortableServer/*.pidl:
+          Regenerated dozens of pidl files with the idl compiler change below.
+
+        * tao/diffs/IOP_Codec.diff:
+        * tao/diffs/Pollable.diff:
+        * tao/diffs/StringSeq.diff:
+        * tao/diffs/TAO.diff:
+          Zapped these not needed diffs
+
+        * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp:
+          Moved the branch POArefactor2 to the latest version of this file,
+          this takes care that the typecodes for exceptions are generated in
+          the C.cpp file instead of A.cpp, making it much easier to regenerate
+          the pidl files in the repo.
+
+        Sun Nov 14 21:06:17 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+        * tao/PortableServer/IdUniquenessStrategy.h:
+        * tao/PortableServer/IdUniquenessStrategyUnique.h:
+        * tao/PortableServer/ServantRetentionStrategy.h:
+
+          Cosmetic changes.
+
+        Sun Nov 14 19:08:52 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+        * tao/PortableServer/Local_Servant_Base.h:
+
+          Changed .i to .inl
+
+        * tao/PortableServer/ServantRetentionStrategyNonRetain.cpp:
+        * tao/PortableServer/ThreadPolicyValueORBControl.cpp:
+
+          Added a comment for Johnny.
+
+        Fri Nov 12 13:27:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/ServerInterceptorAdapter.h:
+          Removed some old todo's which are not valid anymore
+
+        Fri Nov 12 13:25:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.cpp (create_reference_with_id_i):
+          Throw the exception with the correct minor code
+
+        * tao/*C.{h,cpp,i}:
+          Regenerated several files
+
+        Fri Nov 12 08:50:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableInterceptor.pidl:
+          Changed type of object_id attribute of ServerRequestInfo from
+          CORBA::Octet to ObjectId to match the latest corba spec, this fixes
+          bug 1961.
+
+        * tao/PortableInterceptorC.{h,cpp,inl}:
+        * tao/PortableInterceptorA.cpp:
+        * tao/diffs/PortableInterceptor.diff:
+          Regenerated these files and updated diff
+
+        * tao/PortableServer/ServerRequestInfo.{h,cpp}:
+          Updated for change above
+
+        Thu Nov 11 15:52:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA_Current_Impl.cpp (orb_core):
+          Use the orb_core() method from the POA instead of using the
+          orb_core_ member
+
+        * tao/PortableServer/POA.h:
+          Because of the change above POA_Current_Impl doesn't need to be a
+          friend of POA anymore
+
+        Thu Nov 11 15:26:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/PS_Current.pidl
+        * tao/PortableServer/POA_Current.{h,cpp}:
+        * tao/PortableSErver/POA_Current_Impl.{h,cpp}:
+          Added get_servant
+
+        Thu Nov 11 14:04:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/*:
+          Fixed problems when building without native exception support.
+
+        * tao/PortableServer/RequestProcessingStrategy*:
+          Added cleanup_servant, used by the servant retention strategy. The
+          servant activator will then do the etherealize, other strategies to
+          nothing. The servant retention strategy then just calls this method
+          and doesn't know anything about servant activator anymore
+
+        Thu Nov 11 11:58:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Servant_Upcall.cpp (servant_locator_cleanup):
+          Added a todo that this method is not behaving according to the spec.
+          I just stumbled on this, but will have to look more in detail how to
+          update the code so that it matches the spec
+
+        Thu Nov 11 11:23:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/RequestProcessingStrategyServantManager.{h,cpp}:
+          Added validate_servant_manager
+
+        * tao/PortableServer/RequestProcessingStrategyServantActivator.cpp:
+        * tao/PortableServer/RequestProcessingStrategyServantLocator.cpp:
+          Use the new validate_servant_manager to check for nil servant
+          managers and throw the correct exception
+
+        Thu Nov 11 09:04:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Active_Object_Map.{cpp,h,i}:
+        * tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
+        * tao/PortableServer/Object_Adapter.cpp
+        * tao/PortableServer/POA.cpp
+        * tao/PortableServer/Servant_Upcall.{cpp,h,inl}:
+        * tao/PortableServer/ServantRetentionStrategy.h:
+        * tao/PortableServer/ServantRetentionStrategyNonRetain.{h,cpp}:
+        * tao/PortableServer/ServantRetentionStrategyRetain.{h,cpp}:
+          Moved the struct Map_Entry outside the TAO_Active_Object_Map and
+          called it TAO_Active_Object_Map_Entry. This way we can just use a
+          forward declaration in the strategy interfaces and don't need to
+          include the Active Object Map on so many places. This reduces the
+          number of includes and reduces compile time
+
+        Thu Nov 11 08:27:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/IdUniquenessStrategy*.{h,cpp};
+          Added allow_multiple_activations() that can be used from other
+          places
+
+        * tao/PortableServer/ServantRetentionStrategy*.{h,cpp}:
+          Removed get_aom(), added servant_has_remaining_activations() which
+          can then be used by the request processing strategy. With these
+          changes no other strategies need to have the active object map
+
+        * tao/PortableServer/RequesProcessingStrategy*.{h,cpp}:
+          Removed the aom from the strategy_init call, use the servant
+          retention strategy instead of the aom.
+
+        Wed Nov 10 20:20:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/RequestProcessingStrategyServantActivator.{h,cpp}:
+          Moved incarnate and etherealize of the servant to separate helper
+          methods
+
+        Wed Nov 10 19:09:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/IdUniquenessStrategy*.*:
+          Renamed validate to is_servant_activation_allowed, this tells much
+          better what this method does. Also, this method does just the check,
+          it doesn't throw an exception anymore, so the corba environment
+          macros are removed
+
+        * tao/PortableServer/RequestProcessingStrategyServantActivator.cpp:
+          Use the is_servant_activation_allowed method from the id uniqueness
+          strategy instead of handling the check ourselves
+
+        * tao/PortableServer/ServantRetentionStrategyRetain.cpp:
+          Call is_servant_activation_allowed on the IdUniqueness policy and
+          throw an error when it is not possible.
+
+        Wed Nov 10 15:19:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/ServantRetentionStrategyNonRetain.h:
+        * tao/PortableServer/ServantRetentionStrategyRetain.{h,cpp}:
+          Derive the Retain strategy from the NonRetain case, this reduces the
+          code duplication between these strategies a lot. Thanks to Carlos
+          for the proposal to change this. In case the Retain strategy can't
+          find the needed info in the aom, he will ask the NonRetain
+
+        Wed Nov 10 14:34:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Servant_Upcall.h:
+          Added increment_servant_refcount method to increment the refcount on
+          the active object map entry
+
+        * tao/PortableServer/RequestProcessingStrategyServantActivator.cpp:
+          Use the new method above instead of getting the active object map
+          entry here.
+
+        Wed Nov 10 14:11:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/ServantRetentionStrategy*.*:
+          Added rebind_using_user_id_and_system_id to make the request
+          processing strategy much simpler, use this in the servant activator
+          request processing strategy.
+
+        * tao/PortableServer/IdUniquenessStrategy*.{h,cpp}:
+        * tao/PortableServer/RequestProcessingStrategy*.{h,cpp}:
+        * tao/PortableServer/Policy_Strategy.h:
+        * tao/PortableServer/Active_Policy_Strategies.cpp:
+          Removed the strategy_init from PolicyStrategy, pass besides the POA
+          more specific things to the strategies, so that they get exactly
+          what they need, making the strategy code much smaller. Each strategy
+          gets the things it needs, if it needs nothing, it gets nothing, if
+          its need a lot, it receives more.
+
+        * tao/PortableServer/Servant_Base.{h,cpp,i}:
+        * tao/PortableServer/Local_Servant_Base.{h,cpp,inl}:
+          Moved TAO_Local_Servant_Base to its own file
+
+        * tao/Adapter.{h,cpp}:
+        * tao/Adapter_Factory.{h,cpp}:
+        * tao/Adapter_Registry.{h,cpp}:
+        * tao/tao.moc
+          Moved Adapter Factory to its own file, corrected some errors
+
+        Tue Nov  9 15:17:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/BiDIR_GIOP/*:
+          Regenerated IDL, updated diffs, removed msc_ver >= 1200 checks
+
+        Tue Nov  9 14:28:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/POA/Default_Servant/Default_Servant.cpp:
+          Extended this test to check if the correct exception is thrown when
+          we try to retrieve the default servant when none is set and when we
+          try to get/set the servant manager
+
+        Tue Nov  9 14:15:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp:
+          Extended this test so that we test if the correct exception is
+          thrown when we set a nil servant manager or try to overwrite the
+          servant manager
+
+        Tue Nov  9 11:13:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/*Value.{h,cpp}:
+          Splitted several PolicyValue files in multiple
+
+        Tue Nov  9 08:45:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Active_Policy_Strategies.cpp:
+          Fixed wrong svc directive
+
+        Mon Nov  8 12:58:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.cpp:
+        * tao/PortableServer/ServantRetentionStrategy.h:
+        * tao/PortableServer/ServantRetentionStrategyNonRetain.{h,cpp}:
+        * tao/PortableServer/ServantRetentionStrategyRetain.{h,cpp}:
+          Changed the reference_to_servant to check in the POA whether this
+          reference was created by this POA, don't do this in the strategy
+          itself.
+
+        Fri Nov  5 15:15:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/*
+          Splitted all strategy interfaces and implementation to separate
+          files, added strategy factory interfaces and implementations. I have
+          to cleanup a lot of includes/forward declarations and update class
+          names, but the files/classes are now there and splitted making it
+          easier to review things
+
+        Fri Nov  5 07:39:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Activation_Strategy.{h,cpp}:
+          Removed these files
+
+        * tao/PortableServer/ImplicitActivation*.*:
+          In these files everything for ImplicitActivation policy is now
+          available.
+
+        Thu Nov  4 14:08:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Activation_Strategy.{h,cpp}:
+          Move implementation to the cpp file
+
+        * tao/PortableServer/Servant_Retention_Strategy.cpp:
+          Use the Activation_Strategy instead of the Cached_Policies
+
+        * tao/PortableServer/POA.cpp (create_POA_i):
+          Handle a system exception from the unknown_adapter call as described
+          in 11.3.9.2 in the spec
+
+        * tao/PortableServer/Servant_Location.h:
+          Moved TAO_SERVANT_LOCATION enum to its own file to reduce the need
+          to include Object_Adapter.h
+
+        * tao/PortableServer/Object_Adapter.{h,cpp}:
+        * tao/PortableServer/Servant_Retention_Strategy.h:
+        * tao/PortableServer/ServantRetentionStrategy.h:
+        * tao/PortableServer/Request_Processing_Strategy.h:
+          Updated because of change above
+
+        Thu Nov  4 12:49:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,i}:
+          Removed thread_policy(), is not needed anymore
+
+        Thu Nov  4 10:08:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,cpp,i}:
+        * tao/PortableServer/Lifespan_Strategy.{h,cpp}:
+        * tao/PortableServer/Object_Adapter.cpp:
+          Moved validating the lifespan part of an object key from the POA to
+          the Lifespan strategy. This way the creation_time is not needed
+          anymore in the POA and the also removed some helper methods that are
+          now not needed anymore.
+
+        Thu Nov  4 09:32:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.cpp:
+        * tao/PortableServer/Lifespan_Strategy.{h,cpp}:
+        * tao/PortableServer/Id_Assignment_Strategy.{h,cpp}:
+          Moved some parts of the POA::set_id() method to the strategies and
+          call the new create_key methods on the strategies
+
+        Wed Nov  3 11:37:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.h:
+          Removed declaration of default_poa_policies(), there is no
+          implementation for this method
+
+        Wed Nov  3 11:09:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.{h,cpp}:
+          New servant dispatcher to create a GOA on demand
+
+        * tao/orbsvcs/orbsvcs/PortableGroup/GOA.{h,cpp}:
+        * tao/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp:
+        * tao/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp:
+        * tao/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp:
+        * tao/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp:
+          Several changes to be able to load and create the GOA when needed
+
+        Tue Nov  2 15:22:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/PortableServerC.h:
+          Removed the guard to check this file is not included. This file is
+          included by other idl generated files, have to solve that first
+          before this guard can be in place.
+
+        Tue Nov  2 14:12:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Lifespan_Strategy.cpp (notify_shutdown):
+          Only deactive the server_object when it is available
+
+        Tue Nov  2 14:12:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.cpp:
+          Fixed bug in parse_key
+
+        Tue Nov  2 13:29:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/*:
+          Guard inclusion of PortableServerC.h, PortableServer.h must be
+          included by the users, not the C.h
+
+        Tue Nov  2 12:48:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/PS_ForwardC.h:
+        * tao/PortableServer/diffs/PS_Forward.diff:
+          Added TAO_DynamicImplementation forward declaration
+
+        * tao/orbsvcs/examples/ORT/Gateway_i.h:
+          Include PortableServer.h, not PortableServerC.h
+
+        Mon Nov  1 19:24:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Request_Processing_Strategy.{h,cpp}:
+          Removed set_user_id and get_aom methods from the classes in this
+          file, it are nice methods, but should be here, everything in these
+          methods is already handled in the servant_retiontion strategy
+
+        * tao/PortableServer/Servant_Retention_Strategy.cpp:
+          Fixed unused argument warning
+
+        Mon Nov  1 18:44:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Servant_Retention_Strategy.cpp:
+          Changed the implementation of reference_to_servant, use a different
+          method from the request_processing_strategy and implemented the
+          non_retain case, this was previously not there in TAO, but the spec
+          describes that certain functionality must be there
+
+        * tao/PortableServer/Request_Processing_Strategy.{h,cpp}:
+          Removed servant_to_reference, this is not needed, the
+          servant_retention_strategy just calls get_servant(), for aom and
+          servant manager it then gets wrong policy, else it gets the servant
+
+        Mon Nov  1 11:39:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,cpp,i}:
+          Moved methods that use the POAManager to the cpp file, this way we
+          don't need to include POAManager in the header file.
+
+        * tao/PortableServer/Object_Adapter.cpp:
+        * tao/PortableServer/Servant_Upcall.cpp:
+          Added include of POAManager.h because it is now not done in POA.h
+          anymore
+
+        * tao/PortableServer/POA.{h,cpp,i}:
+        * tao/PortableServer/Request_Processing_Strategy.cpp:
+        * tao/PortableServer/Servant_Retention_Strategy.cpp:
+        * tao/PortableServer/ServantRetentionStrategy.h:
+          Removed the active object map completely from the POA, it is now
+          only available in the Retain Servant Retention Strategy. The Request
+          Processing strategy still uses this map, just rewrote the code there
+          to get the servant retention strategy instead of the POA, this will
+          be rewritter later.
+
+        * tao/PortableServer/POA.{cpp,i}:
+        * tao/IORInterceptor/IORInfo.cpp:
+          Removed get_manager_id from the POA, let the IORInfo just retrieve
+          the POA Manager and call get_manager_id on that.
+
+        * tao/PortableServer/POA.{cpp,i}:
+          Moved all methods that acquire the POA lock to the cpp file, that
+          also prevents us from including the poa_macros and POA_Guard.h files
+          in this inline file
+
+        * tao/PortableServer/POA.{h,cpp}:
+        * tao/PortableServer/Servant_Retention_Strategy.{h,cpp}:
+          Moved create_reference and create_reference_with_id to the servant
+          retention strategy
+
+        Mon Nov  1 09:03:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,cpp}:
+          Removed is_servant_in_map
+
+        * tao/PortableServer/Request_Processing_Strategy.cpp:
+        * tao/PortableServer/Id_Uniqueness_Strategy.cpp:
+          Use servantretentionstrategy::is_servant_in_map instead of POA
+          version
+
+        Mon Nov  1 09:03:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,cpp}:
+        * tao/PortableServer/Servant_Retention_Strategy.{h,cpp}:
+          Implemented servant_to_reference in the servant retain strategy.
+          Moved servant_to_system_id_i to the retan servant retain strategy,
+          it is only needed for that strategy. Made temporarily some members
+          in the POA public so that things keep compiling, will look how to
+          make this consistent later.
+
+        Mon Nov  1 08:48:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,i}:
+          Removed servant_to_system_id, this method is protected, so not
+          callable from the outside and not used. The servant_to_system_id_i
+          is a helper method that is used, but there is no need for
+          servant_to_system_id.
+
+        Mon Nov  1 07:21:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/ServantRetentionStrategy.h:
+        * tao/PortableServer/Servant_Retention_Strategy.{h,cpp}:
+        * tao/PortableServer/POA.{h,cpp}:
+          Moved activate_object_with_id to the servant retention strategy and
+          implemented it there. Removed the is_user_id_in_map from the POA and
+          the Non Retain strategy, it is a helper method only for the retain
+          servant retention strategy.
+
+        Fri Oct 29 13:03:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/*.pidl:
+        * tao/PortableServer/diffs/*:
+        * tao/PortableServer/*C.{h,cpp,inl}:
+        * tao/PortableServer/*A.cpp:
+          Moved all Policy enums out of the PortableServer.pidl and to the
+          belonging *Policy.pidl file, that way we only get the Any operations
+          we use
+
+        Fri Oct 29 12:26:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Made the ServantRetentionStrategy loadable by service configurator
+
+        * tao/PortableServer/StrategyFactory.{h,cpp}:
+          Base for all factories creating strategies
+
+        * tao/PortableServer/ServantRetentionStrategyFactory.h:
+          Abstract factory
+
+        * tao/PortableServer/ServantRetentionStrategyFactoryImpl.h:
+          Concrete factory for servant retention strategies
+
+        * tao/PortableServer/Active_Policy_Strategies.cpp:
+          Use servant retention strategy strategy
+
+        * tao/PortableServer/ServantRetentionStrategy.{h,cpp}:
+        * tao/PortableServer/Servant_Retention_Strategy.{h,cpp}:
+          Moved base class to a new file and use that base in all places
+
+        Fri Oct 29 11:45:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{cpp,i}:
+          Moved activate_object from i to cpp file
+
+        * tao/PortableServer/POA.cpp:
+        * tao/PortableServer/Servant_Retention_Strategy.cpp:
+          Implemented the activate_object in the Servant_Retention_Strategy
+          and just call that strategy from the POA.
+
+        * tao/PortableServer/POA.{cpp,h}:
+          Removed default_servant, we don't need it anymore in the POA, it is
+          in the Default_Servant_Request_Processing_Strategy.
+
+        Fri Oct 29 11:06:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Servant_Retention_Strategy.cpp (servant_to_id):
+          Implemented for the retain case.
+
+        * tao/PortableServer/POA.cpp (servant_to_id_):
+          Call the Servant_Retention_Strategy
+
+        Fri Oct 29 10:19:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Request_Processing_Strategy.{h,cpp}:
+          Removed the servant_to_id method, it doesn't belong here.
+          Servant_to_id is in servant_retentium_strategy and this strategy
+          just uses get_servant from the request processing strategy.
+
+        Fri Oct 29 10:15:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.cpp:
+        * tao/PortableServer/Request_Processing_Strategy.cpp:
+          Changed the get_servant, don't throw an exception when no default
+          servant is set with default servant request processing strategy in
+          the strategy itself, let the POA do that, this makes the
+          get_servant() method much more usable from the rest of the policies.
+          The reason of this change is that when get_servant() is used on the
+          POA and default servant policy is set, but no servant, then we
+          should give the exception NoServant, but when other strategies use
+          the default_servant, and it is not there they should give obj
+          adapter exception
+
+        * tao/PortableServer/Servant_Retention_Strategy.{h,cpp}:
+          Implemented servant_to_id for the non retain case and changed the
+          usage of thet get_servant call in the request processing strategy
+
+        Fri Oct 29 09:34:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        All PolicyFactory are now loaded on demand with the correct
+        service name
+
+        Thu Oct 28 13:59:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Changes ServantRetentionPolicyFactory and
+        RequestProcessingPolicyFactory to use a base class as interface and a
+        FactoryImpl for the implementation
+
+        * tao/PortableServer/ThreadPolicyFactoryImpl.cpp:
+          Changed service name
+
+        * tao/PortableServer/PortableServer_PolicyFactory.cpp:
+        * tao/PortableServer/POA.cpp:
+        * tao/PortableServer/Object_Adapter.cpp:
+        * tao/PortableServer/Policy_Creator_T.h:
+          Changed loading of policy factories
+
+        * tao/PortableServer/Lifespan_Strategy.{h,cpp}:
+          Changed use_imr_ to bool
+
+        Thu Oct 28 11:11:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Servant_Retention_Strategy.cpp:
+          Changed the id_to_servant for the non retain case
+
+        Thu Oct 28 10:55:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,cpp}:
+          Added is_poa_generated to check whether object reference is
+          generated by this POA. Use this method in reference_to_id()
+
+        * tao/PortableServer/Servant_Retention_Strategy.cpp (reference_to_servant):
+          Use POA::is_poa_generated to check whether the object reference is
+          generated by the POA.
+
+        Thu Oct 28 10:30:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Servant_Retention_Strategy.{cpp,h}:
+          Added servant_to_reference as empty methods with just the text from
+          the spec. The POA should call this strategy first, this then has to
+          do some more, but all relationships are not clear yet.
+
+        Thu Oct 28 10:04:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Servant_Retention_Strategy.{cpp,h}:
+          Added servant_to_id as empty methods with just the text from the
+          spec. The POA should call this strategy first, this then has to do
+          some more, but all relationships are not clear yet.
+
+        * tao/PortableServer/ThreadPolicyFactory.h
+          Made this a pure virtual base class
+
+        * tao/PortableServer/ThreadPolicyFactoryImpl.cpp
+        * tao/PortableServer/ThreadPolicyFactoryImpl.h
+          The real factory implementation
+
+        * tao/PortableServer/ThreadPolicyFactory.cpp
+          Zapped this file
+
+        * tao/PortableServer/PolicyFactory.h
+          Reduced needed includes
+
+        * tao/PortableServer/Object_Adapter.cpp
+        * tao/PortableServer/POA.cpp
+        * tao/PortableServer/PortableServer_PolicyFactory.cpp
+          Changed for ThreadPolicyFactory
+
+        Wed Oct 27 14:20:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.cpp:
+          We seem to have several more mismatches with the spec, just added
+          some todo's. When the methods in the POA are moved to the
+          strategies, we should check all the methods related to servant
+          activation, deactivation, retrieval with the spec to see if the
+          correct exceptions with the correct minor codes are given
+
+        Wed Oct 27 04:34:29 2004  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+        * tao/PortableServer/Activation_Strategy.h:
+        * tao/PortableServer/Id_Assignment_Strategy.cpp:
+        * tao/PortableServer/Id_Uniqueness_Strategy.cpp:
+        * tao/PortableServer/Id_Uniqueness_Strategy.h:
+        * tao/PortableServer/Lifespan_Strategy.h:
+        * tao/PortableServer/Object_Adapter.h:
+
+          Some warnings fixes and a few comments for Johnny. The most
+          important commment is going to be over email.
+
+        Wed Oct 27 12:02:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Adapter_Activator.h:
+        * tao/PortableServer/Collocated_Object_Proxy_Broker.h:
+        * tao/PortableServer/Default_Acceptor_Filter.h:
+        * tao/PortableServer/Object_Adapter.h:
+        * tao/PortableServer/POA.cpp:
+        * tao/PortableServer/POA.h:
+        * tao/PortableServer/Request_Processing_Strategy.h:
+          Reduced includes
+
+        Wed Oct 27 08:42:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Policy_Creator_T.h:
+          Return 0 in case no factory, not _nil, reduces header dependencies.
+          Don't return a POLICYTYPE *, just let the caller use the _ptr type.
+
+        * tao/PortableServer/POA.cpp:
+        * tao/PortableServer/PortableServer_PolicyFactory.cpp:
+        * tao/PortableServer/Object_Adapater.cpp:
+          Updated because of Policy_Creator_T change
+
+        * tao/PortableServer/POA.{h,cpp}:
+          Added some comments to member that according to me have to moved out
+          of the POA and some methods that have to be reworked to use the
+          strategies.
+
+        Wed Oct 27 07:01:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Lifespan_Strategy.h:
+          Added some comments based on Bala's comments
+
+        Wed Oct 27 06:55:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+          Changed made by Bala
+
+        * tao/PortableServer/Activation_Strategy.h:
+        * tao/PortableServer/Id_Uniqueness_Strategy.cpp
+          Removed variable name
+
+        * tao/PortableServer/Id_Assignment_Strategy.cpp:
+          Layout changed
+
+        * tao/PortableServer/Lifespan_Strategy.h:
+          Bala added some comments to address
+
+        * tao/PortableServer/Object_Adapter.h:
+          Cleanup of includes
+
+        Tue Oct 26 13:59:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Request_Processing_Strategy.cpp:
+          Changed the implementation of set_servant_manager, the spec is more
+          precise what should happen, first it is only allowed to set it once,
+          in case already set a bad_inv_order exception is thrown, twice, when
+          it is set to nil, or given an invalid interface a obj_adapter
+          exception is given
+
+        Tue Oct 26 13:40:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,cpp.i}:
+          Removed get_servant_i, set_servant_i, get_servant_manager_i and
+          set_servant_manager_i, just moved the functionality to the method
+          without _i. All methods just call the request processing strategy,
+          no need to keep these methods anymore. Some missing ACE_CHECKS in
+          the set methods are added.
+
+        Tue Oct 26 11:30:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,cpp}:
+        Tue Oct 26 11:30:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,cpp}:
+          Removed all ServantActivator stuff from the POA
+
+        Tue Oct 26 10:39:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,cpp}:
+          Removed all ServantLocator stuff from the POA
+
+        * tao/PortableServer/Servant_Upcall.{h,inl,cpp}:
+        * tao/PortableServer/Request_Processing_Strategy.cpp:
+          Instead of storing a bool whether to call the servant locator, just
+          store the servant locator itself in the Servant_Upcall. That way we
+          also always use the same servant locator for the preinvoke and the
+          postinvoke. This is easier to handle then the int, but probably we
+          will move this later to the request processing strategy.
+
+        Tue Oct 26 09:59:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,cpp}:
+        * tao/PortableServer/Lifespan_Strategy.{h,cpp}:
+          Moved all ImR code to the Lifespan Strategy and just call from the
+          POA notify_startup and notify_shutdown. The code itself to notify
+          the ImR must be converted, but first move it out. Had to include the
+          different PolicyC files in the POA, have to look why in detail.
+
+        Tue Oct 26 09:18:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POAManager.{h,cpp}:
+        * tao/PortableServer/POA.{h,cpp}:
+        * tao/PortableServer/Servant_Upcall.cpp:
+          Moved check_poa_manager_state from the POA to the POAManager, the
+          POAManager should check its state, the POA just calls this method.
+
+        * tao/PortableServer/POA.{h,cpp}:
+        * tao/PortableServer/Sevant_Retention_Strategy.{h,cpp}:
+         Moved several methods for the cleanup to the servant retention
+         strategy. Some work has to be done for the servant locator.
+
+        Mon Oct 25 17:16:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+
+        * tao/PortableServer/Object_Adapter.h:
+        * tao/PortableServer/POA.{h,cpp}:
+        * tao/PortableServer/Request_Processing_Strategy.{h,cpp}:
+        * tao/PortableServer/Servant_Base.h:
+        * tao/PortableServer/Servant_Retention_Strategy.{cpp,h}:
+        * tao/PortableServer/Servant_Upcall.{cpp,h}:
+        * tao/PortableServer/Servant_Upcall.h:
+          Started moving functionality out of the POA and to the
+          Servant_Retention_Strategies, in some cases when this strategy can't
+          find a servant it goes to the Request_Processing_Strategy to see if
+          that can fulfill the requested task. Made on some places some
+          methods temporarily public to keep going, later I will revisit
+          those. The current state is just that things compile, this is just a
+          checkin to show the current state, things are now completely broken,
+          a lot of functionality is partly moved, making the code unusable at
+          this moment, when all functionality related to servant_retention and
+          request_processing is moved out, then we can test again.
+
+        * tao/PortableServer/Active_Policy_Strategies.{h,cpp,inl}:
+          Added servant_retention_strategy
+
+        Fri Oct 22 14:40:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA_Current_Impl.{h,inl}:
+          Added new replace_object_id(), this is needed for the Request
+          Processing strategies to replace the object id in a smart way
+
+        Fri Oct 22 13:44:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/portableserver_export.h:
+          Removed include of ObjRef_VarOut_T.h, when neede somewhere include
+          it there. With this include at this place everyone gets this include
+          even when not needed.
+
+        * tao/PortableServer/Active_Policy_Strategies:
+        * tao/PortableServer/POA_Guard.h:
+        * tao/PortableServer/POAManager.h:
+        * tao/PortableServer/Policy_Strategy.h:
+        * tao/PortableServer/Thread_Strategy.h:
+          Added missing includes
+
+        Thu Oct 14 07:21:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/RTCORBA/Network_Priority_Mapping_Manager.h:
+        * tao/RTCORBA/Priority_Mapping_Manager.h:
+        * tao/RTCORBA/RT_Current.h:
+        * tao/RTCORBA/RT_Mutex.h:
+        * tao/RTCORBA/RT_ORB.h:
+        * tao/RTCORBA/RT_ORBInitializer.h:
+        * tao/RTCORBA/RT_Policy_i.h:
+        * tao/RTCORBA/RT_PolicyFactory.h:
+        * tao/RTCORBA/RTCORBA_includeC.h:
+          Removed checks for _MSC_VER >= 1200
+
+        Wed Oct 13 12:06:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.cpp (reference_to_id):
+          Use ACE_NEW_THROW_EX instead of plain new
+
+        Wed Oct 13 11:58:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.cpp (id):
+          Use ACE_NEW_THROW_EX instead of plain new
+
+        Wed Oct 13 10:01:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Activation_Strategy.{h,cpp,inl}:
+          Moved accessor methods to the new inline file
+
+        * tao/PortableServer/*Strategy.{h,cpp}:
+          Removed the policy list parameter of the strategy_init method. Some
+          policies need to have data from the POA, at this moment just pass
+          the POA pointer, later we can reduce this even more
+
+        * tao/PortableServer/Object_Adapter.cpp:
+          Changed creation of implicit_activation_policy
+
+        * tao/PortableServer/POA.cpp:
+          Pass the this to the update method of the active_policy_strategies
+
+        * tao/PortableServer/Upcall_Wrapper.h:
+        * tao/PortableServer/ServerInterceptorAdapter.h:
+          Reduced includes
+
+        Wed Oct 13 08:55:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Activation_Strategy.h:
+          Added allow_implicit_activation method and implemented this for both
+          types.
+
+        * tao/PortableServer/Active_Policy_Strategies.{h,cpp}:
+          Added Activation_Strategy.
+
+        * tao/PortableServer/POA.cpp:
+          Fixed type in comment
+
+        Wed Oct 13 08:08:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Key_Adapters.{h,cpp}:
+          Moved include of Map_T.h to the cpp file, added forward declaration
+          of ACE_Active_Map_Manager_Key to the header file
+
+        * tao/PortableServer/Active_Object_Map:
+          Added include of Map_T.h
+
+        Wed Oct 13 07:59:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Creation_Time.{h,cpp,inl}:
+          Moved TAO_Creation_Time and TAO_Temporary_Creation_Time to this
+          file, removed the TAO_ prefix and moved them in the
+          TAO::Portable_Server namespace
+
+        * tao/PortableServer/Lifespan_Strategy.h:
+        * tao/PortableServer/Object_Adatper.{h,cpp,i}:
+        * tao/PortableServer/POA.{h,cpp,i}:
+          Updated because of the move of the time classes
+
+        Tue Oct 12 14:17:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp:
+          Use a dynamic_cast to get the TAO_POA, the _tao_downcast has been
+          zapped with this rework
+
+        Tue Oct 12 14:07:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/tests/Miop/McastHello/server.cpp:
+          Use the new GOA interface instead of the MIOP specific part of the
+          POA. The GOA support still has to be tested, but now we can compile
+
+        Tue Oct 12 13:39:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.cpp:
+          Initialize the active strategies after the cached policies are
+          completely updated.
+
+        * tao/PortableServer/Lifespan_Strategy.h:
+          Added a Server_Object_i pointer to the persistent strategy, it needs
+          to be there. Other code will move there also so that all ImR stuff
+          is in the persistent strategy
+
+        * examples/POA/FindPOA/FindPOA.cpp:
+          Updated because of TAO_Adapter_Activator change
+
+        * tests/ORT/ServerRequestInterceptor.h:
+          Added include of PS_CurrentC.h
+
+        * tests/Portable_Interceptors/PolicyFactory/server.cpp:
+          Include PortableServer.h instead of PortableServerC.h
+
+        Tue Oct 12 12:35:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/ImplRepo_Service/tao_imr_i.cpp:
+          Added include of ServantManagerC.h to get ForwardRequest exception
+
+        Tue Oct 12 12:14:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp:
+          Use a dynamic_cast to get the TAO_POA, the _tao_downcast has been
+          zapped with this rework
+
+        Tue Oct 12 12:17:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/IFRService/IRObject_i.cpp:
+          Added include of POA_Current_Impl.h and used the correct namespace
+
+        * tao/IFR_Client/*:
+        * orbsvcs/orbsvcs/IFR_Service/*S.{h,cpp,i,inl}:
+          Regenerated all the files, also all .i files are replaced with
+          the new .inl files
+
+        * orbsvcs/IFR_Server/diffs/*.diff:
+          Removed all these files, they are outdated, on the wrong place and
+          most of them are zero bytes.
+
+        Tue Oct 12 11:11:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h:
+          Include PortableServer.h instead of PortableServerC.h
+
+        * orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h:
+          Include ServantLocatorC.h instead of PortableServerC.h
+
+        * orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp:
+          Use a dynamic_cast to get the TAO_POA, the _tao_downcast has been
+          zapped with this rework
+
+        Tue Oct 12 10:12:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Policy_Forward.*:
+          Added Policy_Current as forward declared interface, it seems with my
+          rework Policy_Current is not automatically included anymore, so
+          added a forward declaration, this keeps the size much smaller than
+          including the real file with Policy_Current
+
+        Tue Oct 12 09:48:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h:
+          Corrected include because of move of TAO_Object_Adapter_Factory
+
+        Tue Oct 12 09:39:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Lifespan_Strategy.{h,cpp}:
+          Implemented this strategy a little bit more
+
+        * tao/PortableServer/Id_Uniqueness_Strategy.{h,cpp}:
+          Added validate method to check whether servant may be activated or
+          not based on this policy
+
+        * tao/PortableServer/Active_Policy_Strategies.{h,cpp}:
+          Create some more specific strategies, this will use a factory later,
+          but this is for testing now
+
+        * tao/PortableServer/POA.{h,cpp}:
+          Use Lifespan and Id_Uniqueness strategies so far as they now exist
+
+        Tue Oct 12 07:59:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Key_Adapters.{h,cpp,i}:
+          Removed the Key_Adapters.i file, it is empty
+
+        Tue Oct 12 07:59:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.cpp:
+          Changed get_servant_i and set_servant_i methods to use the
+          Request_Processing_Strategy
+
+        * tao/PortableServer/Active_Policy_Strategies.{h,cpp}:
+          Added Id_Assignment_Strategy
+
+        Tue Oct 12 07:37:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Active_Policy_Strategies.cpp:
+          Create the correct ServantRetentionStrategy based on the set
+          policies
+
+        Tue Oct 12 07:11:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,cpp,i}:
+          Removed the single threaded lock functionality, this is handled now
+          by the Single Thread_Strategy
+
+        Mon Oct 11 15:15:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/DomainC.{h,cpp,inl}:
+        * tao/PortableServer/Domain/DomainS.{h,cpp,inl}:
+        * tao/Messaging/MessagingC.*:
+        * tao/Messaging/MessagingS.*:
+          Regenerated
+
+        * tao/PortableServer/POA.{i,cpp}:
+          Moved get/set_servant, get/set_servant_manager to cpp file
+
+        * tao/DynamicInterface/Dynamic_Implementation.cpp:
+          Added include of POA_Current_Impl.h
+
+        * tao/RTPortableServer/RT_Collocation_Resolver.cpp:
+          Servant_Upcall has moved to its own file and to the
+          TAO::Portable_Server namespace
+
+        Mon Oct 11 13:55:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{cpp,i}:
+          Moved the_activator get/set methods from inline to cpp file, uses a
+          lock and requires IDL generated code, not handy in the inline file
+
+        Mon Oct 11 13:41:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/Collocation_Opportunities/Collocation_Opportunities.cpp:
+        * tests/DSI_Gateway/test_dsi.h:
+          Added includes and changes usage of TAO_POA_Current to the new
+          namespace
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp:
+        * TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp:
+        * TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp:
+        * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
+        * TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp:
+          Servant_Upcall has moved to its own file and to the
+          TAO::Portable_Server namespace, changes generation in the TAO_IDL
+          compiler to reflect the new name, and no need to include
+          Object_Manager.h, Servant_Upcall.h is enough
+
+               * tao/PortableServer/*C.{h,cpp,inl}:
+         Regenerated with the latest version of the TAO_IDL compiler
+
+               * tao/PortableServer/Default_Servant_Dispatcher.cpp:
+               * tao/PortableServer/Object_Adapter.{h,i}:
+               * tao/PortableServer/Request_Processing_Strategy.h:
+               * tao/PortableServer/Servant_Upcall.inl:
+               * tao/PortableServer/Servant_Base.cpp:
+               * tao/PortableServer/POA.{h,cpp}:
+         Corrected some small errors and reduced header dependencies
+
+        Mon Oct 11 09:51:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Everything has now been moved to the POArefactor2 branch that I
+        created fresh this morning
+
+        Mon Oct 11 08:07:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/IdAssignmentPolicyFactory.h
+        * tao/PortableServer/IdUniquenessPolicyFactory.h
+        * tao/PortableServer/ImplicitActivationPolicyFactory.h
+        * tao/PortableServer/LifespanPolicyFactory.h
+        * tao/PortableServer/POA_Current.h
+        * tao/PortableServer/RequestProcessingPolicyFactory.h
+        * tao/PortableServer/ServantRetentionPolicyFactory.h
+        * tao/PortableServer/ThreadPolicyFactory.h
+        * tao/PortableServer/Thread_Strategy.cpp
+        * tao/PortableServer/Thread_Strategy.h:
+          Updated by Bala
+
+        Fri Oct  8 09:42:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Activation_Strategy.h:
+        * tao/PortableServer/Active_Policy_Strategies.cpp:
+        * tao/PortableServer/Active_Policy_Strategies.h:
+        * tao/PortableServer/Id_Assignment_Strategy.cpp:
+        * tao/PortableServer/Id_Assignment_Strategy.h:
+        * tao/PortableServer/Id_Uniqueness_Strategy.cpp:
+        * tao/PortableServer/Id_Uniqueness_Strategy.h:
+        * tao/PortableServer/Lifespan_Strategy.h:
+        * tao/PortableServer/Policy_Strategy.h:
+        * tao/PortableServer/Servant_Retention_Strategy.h:
+        * tao/PortableServer/Thread_Strategy.cpp:
+        * tao/PortableServer/Thread_Strategy.h:
+          Added a TAO_POA* to the strategy_init call, this can then be used by
+          the strategies
+
+        * tao/PortableServer/Request_Processing_Strategy.cpp:
+        * tao/PortableServer/Request_Processing_Strategy.h:
+          Besides adding TAO_POA* also now implemented several of the methods
+
+        * tao/PortableServer/POA.cpp:
+          Changed get_servant_i() and set_servant_i() to use the
+          Request_Processing_Strategy to show how another strategy would work
+          after the rework, this way Bala can better see the direction I want
+          to go
+
+        Fri Oct  8 08:36:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA_Current.{h,cpp,inl}:
+        * tao/PortableServer/Object_Adapter.{h,cpp,inl}:
+          Renamed TAO_POA_Current to TAO::Portable_Server::POA_Current and
+          moved it to its own file
+
+        * tao/PortableServer/PortableServer_ORBInitializer.cpp:
+        * tao/RTPortableServer/RT_Object_Adapter_Factory.cpp:
+          Updated because of change above
+
+        Fri Oct  8 08:12:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA_Current_Impl.{h,cpp,inl}:
+        * tao/PortableServer/Servant_Upcall.{h,cpp,inl}:
+          Moved Servant_Upcall and POA_Current_Impl to its own files and to
+          the TAO::Portable_Server namespace. I have to reduce includes and
+          change to TAO_IDL compiler to generate Servant_Upcall in the new
+          namepace
+
+        * tao/PortableServer/Collocated_Object_Proxy_Broker.cpp:
+        * tao/PortableServer/Default_Servant_Dispatcher.{h,cpp}:
+        * tao/PortableServer/Object_Adapter.{cpp,h,i}:
+        * tao/PortableServer/POA.{h,cpp}
+        * tao/PortableServer/Servant_Base.cpp:
+        * tao/PortableServer/Servant_Dispatcher.h:
+        * tao/PortableServer/ServerRequestInfo.h:
+        * tao/DynamicInterface/Dynamic_Implementation.cpp:
+        * tao/RTPortableServer/RT_Servant_Dispatcher.cpp:
+          Updated because of the change above
+
+        Thu Oct  7 14:40:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Non_Servant_Upcall.{h,cpp,inl}:
+        * tao/PortableServer/Object_Adapter.{h,cpp,i}:
+        * tao/PortableServer/POA.{h,cpp}:
+        * tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp:
+          Moved Non_Servant_Upcall to its own file and to the
+          TAO::Portable_Server namespace
+
+        Thu Oct  7 14:11:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Object_Adapter.cpp:
+          Replaced all ACE casts with their C++ versions
+
+        * tao/RTPortableServer/RT_Collocation_Resolver.cpp:
+        * tao/RTPortableServer/RT_Object_Adapter_Factory.h:
+        * tao/RTPortableServer/RT_POA.cpp:
+        * tao/RTPortableServer/RT_Policy_Validator.cpp:
+        * tao/RTPortableServer/RT_Servant_Dispatcher.cpp:
+          Made changes to these files because of the changes in the
+          PortableServer library
+
+        Thu Oct  7 12:40:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Active_Policy_Strategies.{h,cpp}:
+        * tao/PortableServer/POA_Cached_Policies.{h,cpp}:
+        * tao/PortableServer/POA.h:
+          Moved Active_Policy_Strategies to its own file
+
+        Thu Oct  7 12:08:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Id_Assignment_Strategy.{h,cpp}:
+          Moved implementation to cpp file
+
+        Thu Oct  7 11:42:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Request_Processing_Strategy.{h,cpp}:
+          Moved implementation to header file and started with implementing
+          this strategy
+
+        Thu Oct  7 10:10:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Object_Adapter.cpp:
+          Instead of checking the thread policy value, use the thread strategy
+          to obtain and release the lock.
+
+        * tao/PortableServer/Thread_Strategy.{h,cpp}:
+          Implemented this class in cpp file, give enter/exit an int return
+          value
+
+        * tao/PortableServer/POA_Cached_Policies.{h,cpp}:
+          Implemented Active_Policy_Strategies for thread strategy, just to
+          show the idea, have to use a factory and svc conf in the future
+
+        * tao/PortableServer/POA.{h,cpp,i}:
+          Added Active_Policy_Strategies as member, update it on construction
+          of the POA so that the strategies are created. When this is the
+          correct way to go, the code belonging to the single thread lock and
+          the lock itself can be zapped.
+
+        Thu Oct  7 08:29:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Object_Adapter.cpp:
+          Create the default policies using the new way
+
+        * tao/PortableServer/Lifespan_Strategy.{h,cpp}:
+        * tao/PortableServer/Servant_Retention_Strategy.{h,cpp}:
+          Made these compiling so that I can test
+
+        Thu Oct  7 08:22:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/*Policy.{h,cpp}:
+        * tao/PortableServer/*PolicyFactory.{h,cpp}:
+          Moved _tao_cached_type and _tao_scope from the factory to the
+          policy, these methods are called on the policy from within TAO and
+          the default implementation within Policy itself must be overruled by
+          our derived classes.
+
+        Tue Oct  5 14:06:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Policy_Strategy.h:
+        * tao/PortableServer/Thread_Strategy.h:
+          Renamed init to strategy_init to fix warning from the Borland
+          compiler about hiding the init from service_config
+
+        * tao/PortableServer/Servant_Retention_Strategy.{h,cpp}:
+          Added some more methods which belong to this strategy, just a copy,
+          didn't got things compiling yet, more has to move
+
+        * tao/PortableServer/PortableServer_PolicyFactory.cpp:
+          Implemented this using the policy_creator
+
+        * tao/PortableServer/PortableServer.cpp:
+          Removed not needed includes
+
+        * tao/PortableServer/POA.cpp:
+          Implemented the create policy methods
+
+        * tao/PortableServer/Lifespan_Strategy.h:
+          Moved more methods to this strategy
+
+        Tue Oct  5 13:50:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Policy_Creator_T.h:
+          Template to create policies more easier. Still working on the
+          introduction, just a checkin to be sure
+
+        Tue Oct  5 09:46:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Adapter_Activator.h:
+          Removed comment of Bala, got the idea
+
+        * tao/PortableServer/POAManager.h:
+          Reduced needed includes
+
+        * tao/PortableServer/Adapter_Activator.cpp:
+        * tao/PortableServer/Adapter_Activator.h:
+        * tao/PortableServer/Default_Servant_Dispatcher.h:
+        * tao/PortableServer/IdAssignmentPolicyFactory.cpp:
+        * tao/PortableServer/IdAssignmentPolicyValue.h:
+        * tao/PortableServer/PolicyFactory.cpp:
+        * tao/PortableServer/PolicyFactory.h:
+          Bala has added some remarks to these files
+
+        Thu Sep 30 13:50:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA_Cached_Policies.h:
+          Added ThreadStrategy, just to show the idea
+
+        Thu Sep 30 13:42:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Object_Adapter.cpp:
+        * tao/PortableServer/POA_Guard.{h,cpp}:
+        * tao/PortableServer/poa_macros.h
+          Moved POA_Guard to the TAO::Portable_Server namespace
+
+        Thu Sep 30 13:31:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Servant_Retention_Strategy.h:
+          Added is_servant_in_map
+
+        * tao/PortableServer/Upcall_Wrapper.h:
+          No need to add path
+
+        * tao/PortableServer/POA_Cachec_Policies.{h,cpp,i}:
+          Renamed TAO_POA_Cached_Policies to Cached_Policies in the
+          TAO::Portable_Server namespace.
+          Added empty class Active_Policy_Strategies class, the idea is that
+          each POA gets an instance of this class and uses the policy
+          strategies by retrieving them from this class
+
+        * tao/POA.{h,i}:
+          Updated because of Cached_Policies change above
+
+        Thu Sep 30 13:17:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Object_Adapter_Factory.h:
+          Removed msvc push/pop, no need for it in this file
+
+        Thu Sep 30 13:09:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA_Cached_Policies.h:
+          Removed msvc push/pop, no need for it in this file
+
+        Thu Sep 30 12:49:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Object_Adapter.{h,cpp}:
+        * tao/PortableServer/Object_Adapter_Factory.{h,cpp}:
+          Moved Object_Adapter_Factory to its own file
+
+        * tao/PortableServer/PortableServer.cpp:
+          Because the Object_Adapter_Factory is in its own file, include that
+          file instead of Object_Adapter.h
+
+        * tao/PortableServer/POA.cpp:
+          Include the LifespanPolicyFactory.
+
+        Thu Sep 30 12:28:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Id_Assignment_Strategy.h:
+          Added id_assignment_key_type() and id_assignment_key_type_length()
+          methods, for each of the derived classes, implemented this.
+
+        * tao/PortableServer/Lifespan_Strategy.h:
+          Added lifespan_key_type() and lifespan_key_type_length()
+          methods, for each of the derived classes, implemented this.
+
+        * tao/PortableServer/POA.cpp (create_lifespan_policy):
+          Implemented this method, we have to refactor the creation of the
+          policies, to much code duplication
+
+        * tao/PortableServer/Request_Processing_Strategy.h:
+          Added get_servant_manager, set_servant_manager, get_servant and
+          set_servant and implemented these methods for each of the types.
+
+        Wed Sep 29 11:57:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Request_Processing_Strategy.h:
+          Just class definition for this strategy.
+
+        Wed Sep 29 11:33:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Servant_Retention_Strategy.h:
+          Just class definition for this strategy.
+
+        Wed Sep 29 09:30:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Id_Uniqueness_Strategy.h:
+          Just class definition for this strategy.
+
+        Wed Sep 29 09:30:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Id_Assignment_Strategy.h:
+          Just class definition for this strategy.
+
+        Wed Sep 29 09:22:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Policy_Strategy.h:
+        * tao/PortableServer/Thread_Strategy.h:
+          Moved Policy_Strategy to its own file
+
+        * tao/PortableServer/Lifespan_Strategy.h:
+        * tao/PortableServer/Activation_Strategy.h:
+          Just class definitions for these strategies
+
+        Sun Sep 26 14:52:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/*.{h,cpp}:
+          Moved everything from TAO::PortableServer to TAO::Portable_Server to
+          prevent any accidents that a wrong namespace is taken
+
+        Fri Sep 24 14:27:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/*.{h,cpp}:
+          Moved all new Policy Value classes to the TAO::PortableServer
+          namespace. Renamed everything to match filenames. Everything
+          compiles again, no testing done yet.
+          Removed checks for _MSC_VER >= 1200
+
+        Fri Sep 24 14:16:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/*_Value.{h,cpp}:
+          Renamed these files, zapped all underscores so that filenames match
+          the IDL files they belong to. Classes will be renamed soon
+
+        * tao/PortableServer/POA_*.{h,cpp}:
+          Removed POA prefix and underscores to match IDL files
+
+        * tao/PortableServer/Loadable_*.{h,cpp}:
+          Renamed to *Factory.{h,cpp}, classes will be renamed soon
+
+        * tao/PortableServer/POA_Policy.{h,cpp}:
+          Renamed to PolicyFactory.{h,cpp}
+
+        Wed Sep 22 14:16:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Thread_Strategy.{h,cpp}:
+          New file, contains some classes for the idea to implement the
+          policy behaviour in strategies. Just a checkin to share ideas.
+
+        Wed Sep 22 13:50:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/ORT_Adapter_Factory.h:
+        * tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.{h,cpp}:
+          Removed environment macro's, no need for them
+
+        Wed Sep 22 13:15:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Object_Adapter.cpp:
+          Improved loading of thread policy, same code as in the POA and the
+          Policy factory, I like to factor this out to prevent code
+          duplication.
+
+        Wed Sep 22 12:31:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/RTPortableServer/RT_Policy_Validator.cpp:
+          Replaced include of PortableServerC.h with LifespanPolicyC.h
+
+        Wed Sep 22 11:49:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Object_Adapter.cpp:
+        * tao/PortableServer/POA.i:
+        * tao/PortableServer/POA_Guard.{h,cpp}:
+        * tao/PortableServer/poa_macros.h:
+          Changed TAO_POA_Guard, to POA_Guard in the TAO namespace
+
+        Wed Sep 22 10:21:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Loadable_*_Policy.{h,cpp}:
+          Minor updates for values
+
+        * tao/PortableServer/*_Policy_Value.{h,cpp}:
+          New policy value files
+
+        * tao/PortableServer/POA_Policies.{h,cpp,i}:
+          Zapped these files
+
+        * tao/PortableServer/Default_Policy_Validator.cpp:
+          Removed include of POA_Policies, but had to include all *PolicyC.h
+          files
+
+        * tao/PortableServer/POA.cpp:
+          Commented out some code, have to get a cleaner to implement each
+          create policy method
+
+        * tao/PortableServer/POA_Cached_Policies.{h,cpp}:
+          Removed include of POA_Policies, but had to include all *PolicyC.h
+          files
+
+        * tao/PortableServer/POA_Policy_Set.h:
+          Removed include of POA_Policies
+
+        Wed Sep 22 07:42:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Loadable_*_Policy.{h,cpp}:
+          New Loadable Policy files, one set for each Policy we have
+
+        * tao/PortableServer/POA_Policy.h:
+          Removed msvc pragma disable, not needed here
+
+        Tue Sep 21 11:34:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Loadable_Thread_Policy.{h,cpp}:
+        * tao/PortableServer/POA_Policy.h:
+        * tao/PortableServer/POA_ThreadPolicy.cpp:
+        * tao/PortableServer/Thread_Policy_Value.cpp:
+        * tao/PortableServer/PortableServer_PolicyFactory.cpp:
+          Fixed emulated exception usage and work on Bala's comments
+
+        * tao/PortableServer/Loadable_Thread_Policy.h:
+        * tao/PortableServer/POA_ThreadPolicy.h:
+        * tao/PortableServer/PortableServer.h:
+        * tao/PortableServer/POA.cpp:
+        * tao/PortableServer/PortableServer_PolicyFactory.cpp:
+          Changed handling of Loadable_Thread_Policy and the usage of svc conf
+
+        Tue Sep 21 11:34:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Loadable_Thread_Policy.h:
+        * tao/PortableServer/POA_Policy.h:
+        * tao/PortableServer/POA_ThreadPolicy.{h,cpp}:
+          Bala has added some comments to these files
+
+        Mon Sep 20 11:01:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.cpp:
+          Replaced all ACE cast macro's with their C++ versions
+
+        Mon Sep 20 09:19:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ORB_Core.{h,cpp}:
+          Zapped all code that was guarded with #ifdef 0, it is old, and
+          makes it a little bit more readable
+
+        Fri Sep 17 14:07:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA_Thread_Policy.{h,cpp}:
+          Let the constructor do nothing, make an init method to intialize the
+          object, the init method with an Any can throw an exception and that
+          is something we don't want to do in a constructor
+
+        * tao/PortableServer/PortableServer_PolicyFactory.cpp:
+          Don't get the ThreadPolicyValue out of the Any here, just pass it to
+          the Loadable_Thread_Policy and get it out of the Any in the
+          POA_ThreadPolicy.
+
+        * tao/PortableServer/Loadable_Thread_Policy.{h,cpp}:
+          Added create method with an Any, this can throw exceptions
+
+        Fri Sep 17 10:20:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Servant_Base.h:
+          Replaced include of PortableServerC.h with PS_ForwardC.h
+
+        * tao/PortableServer/Active_Object_Map.cpp:
+          Added include of tao/SystemException.h
+
+        Fri Sep 17 09:58:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Collocated_Object_Proxy_Broker.cpp:
+        * tao/PortableServer/Default_Acceptor_Filter.cpp:
+        * tao/PortableServer/Default_Servant_Dispatcher.cpp:
+        * tao/PortableServer/Key_Adapters.cpp:
+        * tao/PortableServer/ORB_Manager.cpp:
+        * tao/PortableServer/POA_Cached_Policies.cpp:
+        * tao/PortableServer/POA_Guard.cpp:
+        * tao/PortableServer/POA_Policies.cpp:
+        * tao/PortableServer/POA_Policy_Set.cpp:
+        * tao/PortableServer/POAManager.cpp:
+        * tao/PortableServer/Servant_Dispatcher.cpp:
+        * tao/PortableServer/ServerRequestInfo.cpp:
+          Added or corrected ACE_RSCID's
+
+        Fri Sep 17 09:38:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Active_Object_Map.h:
+        * tao/PortableServer/Collocated_Object_Proxy_Broker.h:
+        * tao/PortableServer/ORB_Manager.h:
+        * tao/PortableServer/ORT_Adapter.h:
+        * tao/PortableServer/PICurrent_Guard.h:
+        * tao/PortableServer/POA_Policy.h:
+        * tao/PortableServer/POA_Policy_Set.h:
+        * tao/PortableServer/POA_Manager.h:
+        * tao/PortableServer/Servant_Base.h:
+        * tao/PortableServer/Upcall_Wrapper.h:
+          Documentation improvements
+
+        * tao/PortableServer/Key_Adapters.cpp:
+          Replaced all ACE cast macros with C++ versions
+
+        * tao/PortableServer/Key_Adapters.h:
+          Instead of including PortableServerC.h, just include PS_ForwardC.h,
+          this is enough
+
+        * tao/PortableServer/Loadable_Thread_Policy.h:
+        * tao/PortableServer/Thread_Policy_Value.h:
+          Don't export svc config stuff
+
+        Wed Sep 15 12:36:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Policy_Set.cpp:
+          Removed workaround for vc5, that compiler is not supported anymore.
+
+        Wed Sep 15 12:01:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Thread_Policy_Value.{h,cpp}:
+          New file with the thread policy value base and derived classes,
+          moved out of Loadable_Thread_Policy
+
+        * tao/PortableServer/PortableServer_PolicyFactory.cpp:
+        * tao/PortableServer/POA.cpp:
+        * tao/PortableServer/Object_Adapter.cpp:
+          Changed the way we retrieve the thread policy
+
+        * tao/PortableServer.h:
+          Added new *C.h files, without this existing apps don't build
+
+        * tao/PortableServer.cpp:
+          Added svc conf directives to process the new classes
+
+        * tao/POA_Thread_Policy.{h,cpp}:
+          Added missing policy_type method
+
+        * tao/POA_Policies.{h,cpp}:
+          Commented out the TAO_Thread_Policy, we have a new implementation
+
+        Wed Sep 15 09:34:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/orbsvcs/orbsvcs/PortableGroup/GOA.{h,cpp}:
+        * tao/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp:
+        * tao/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.{cpp,h}:
+        * tao/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp:
+        * tao/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h:
+          Changes to make TAO_GOA loadable as POA and use that, at the moment
+          I created the branch it seems CosNaming didn't build, so I can't
+          test this right now, have to move my branch forward one time.
+
+        * tao/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.{cpp,h}:
+          Removed, functionality is now in TAO_GOA
+
+        * tao/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.{h,cpp}:
+          New files
+
+        Wed Sep 15 08:39:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * orbsvcs/orbsvcs/PortableGroup.idl:
+          Fixed this idl file (GOA part)
+
+        Wed Sep 15 08:26:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Adapter.{h,cpp}:
+        * tao/Adapter_Registry.{h,cpp}:
+          Moved the TAO_Adapter_Registry class to its own file
+
+        * tao/Adapter.i:
+          Zapped, was empty
+
+        * tao/ORB_Core.{h,cpp}:
+        * tao/TAO_Internal.cpp:
+          Updated includes/forward declarations because of file split
+
+        Wed Sep 15 07:37:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/orb_typesS.h:
+          New file
+
+        Tue Sep 14 12:45:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA_ThreadPolicy.{cpp,h}:
+          Intermediate commit, not finished yet.
+
+        Tue Sep 14 12:17:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/ORT_Adapter_Factory.h:
+        * tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.{h,cpp}:
+          Removed exception spec from create/destroy method, for the destroy
+          it is not needed, for the create, we could just return 0 in case of
+          out of memory
+
+        Tue Sep 14 11:26:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA_ThreadPolicy.h:
+          Added empty Thread_Policy_Value, just getting the complete picture
+          together.
+
+        Tue Sep 14 08:30:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/PortableGroup_Hooks.{h,cpp}:
+          Zapped these files, not needed anymore now we have a GOA in the
+          PortableServer library
+
+        * tao/ORB_Core.{h,cpp,i}:
+          Zapped all functionality related to PortableGroup hooks, we don't
+          need this anymore.
+
+        Tue Sep 14 08:06:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/GOA*:
+          Zapped these files
+
+        * tao/orbsvcs/orbsvcs/PortableGroup.idl:
+          Added GOA interface here
+
+        * tao/orbsvcs/orbsvcs/GOA.{h,cpp,inl}:
+          Moved the GOA to this place, implementation has to be made correct,
+          POA hook is not needed anymore, must be loadable by service
+          configurator. By moving this now I can cleanup some more stuff in
+          the ORB.
+
+        Mon Sep 13 12:11:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA_ThreadPolicy.h:
+          Added methods required from the Policy interface
+
+        Thu Sep  9 14:07:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Loadable_Thread_Policy.{h,cpp}:
+          First version, also have to work on these
+
+        Thu Sep  9 13:57:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA_ThreadPolicy.h:
+          Temporary checkin, have to work on this
+
+        Thu Sep  9 13:32:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA_Policy.{h,cpp}:
+          Base for the new loadable policies
+
+        Thu Sep  9 13:25:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/GOA.{h,cpp}:
+          First version, still here, move it later, just making sure the GOA
+          stuff doesn't get lost.
+
+        Thu Sep  9 10:28:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IIOP_Endpoints.pid:
+          No need to include orb.idl
+
+        * tao/IIOP_EndpointsC.{h,cpp,i,inl}:
+        * tao/IIOP_EndpointsA.cpp:
+          Regenerated
+
+        * tao/diffs/IIOP_Endpoints.diff:
+          Zapped this file, no diffs needed anymore
+
+        Thu Sep  9 10:28:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IOP_IOR.pid:
+          No need to include orb.idl
+
+        * tao/IOP_IORC.{h,cpp,i,inl}:
+        * tao/IOP_IORA.cpp:
+          Regenerated
+
+        * tao/diffs/IOP_IOR.diff:
+          Zapped this file, no diffs needed anymore
+
+        Thu Sep  9 10:09:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/RTPortableServer/RTPortableServerC.{h,cpp,i,inl}:
+        * tao/RTPortableServer/RTPortableServerA.cpp:
+          Regenerated
+
+        * tao/RTPortableServer/diffs/RTPortableServer.diff:
+          Updated
+
+        * tao/RTPortableServer/RT_POA.i:
+          Include POA_Guard.h
+
+        Thu Sep  9 10:00:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,cpp}:
+          Removed all GOA stuff, will put this in a new GOA class. Will follow
+          later, first get everything building again
+
+        * tao/PortableServer/PortableGroup_Hooks.cpp:
+          Include GOAC.h
+
+        Thu Sep  9 09:15:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/orb.idl:
+        * tao/orb_types.pidl:
+          Moved ValueModifier and Visibility to orb.idl again, not really
+          needed and causes problems with valuetype library
+
+        * tao/orb_typesC.{h,cpp,inl}:
+        * tao/orb_typesA.cpp:
+          Regenerated
+
+        * tao/OBV_Constants.h:
+          Updated because of move
+
+        * tao/ObjRefTemplate/Object_Reference_Template_i.cpp:
+          Replaced tao_poa_downcast with dynamic cast
+
+        Thu Sep  9 08:00:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/orb.idl:
+        * tao/orb_types.pidl:
+          Moved the typedefs from orb.idl to orb_types.pidl. This makes it
+          possiblet to just get the types without all other stuff that is
+          included in orb.idl
+
+        * tao/orb_typesC.{h,cpp,inl}:
+        * tao/orb_typesA.cpp:
+          New generated files
+
+        * tao/OBV_Constants:
+          Removed typedefs, include orb_typesC.h instead
+
+        * tao/ORB.h:
+          Removed typedefs that are now in orb_types. Also removed
+          valuetype_factory_map_ members which was ifdefed out
+
+        * tao/Typecode_Constants.cpp:
+          Removed orb_id, this is now in orb_typesA.cpp
+
+        * tao/Typecode.cpp:
+          Added include of orb_typesC.h
+
+        * tao/PortableServer/PortableServer.pidl:
+        * tao/PortableServer/ServantLocator.pidl:
+          No need to include orb.idl, only need orb_types.pidl
+
+        * tao/PortableServer/*Policy.pidl:
+          Because PortableServer.pidl doesn't include orb_types.pidl, we don't
+          get Policy.pidl for free anymore, we have to explicit include it
+          here
+
+        * tao/PortableServer/*C.{h,cpp,inl}:
+        * tao/PortableServer/*A.cpp:
+        * tao/PortableServer/diffs/*:
+          Regenerated all these files
+
+        Wed Sep  8 14:15:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/POA.{h,cpp,i}:
+        * tao/PortableServer/POA_Guard.{h,cpp}:
+        * tao/PortableServer/Object_Adapter.cpp:
+          Moved TAO_POA_Guard to its own file
+
+        Wed Sep  8 14:02:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Adapter_Activator.{h,cpp}:
+        * tao/PortableServer/POA.{h,cpp}:
+          Moved the TAO_Adapter_Activator to its own file
+
+        Wed Sep  8 12:52:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/diffs/*.diff:
+          Serveral new diffs
+
+        * tao/PortableServer/*C.{h,cpp,inl}:
+          Several new generated files
+
+        * tao/PortableServer/POA.{h,cpp}:
+          Removed tao_poa_downcast, use dynamic cast
+          Also inherit from GOA, this will be moved soon.
+
+        * tao/PortableGroup_Hooks.h:
+          Temporarily removed checks for minimum poa, this has to move
+          together with the GOA to the PortableGroup library.
+
+          Also used the minimum corba 1.0 spec to remove the parts we don't
+          use with minimum corba.
+
+        Wed Sep  8 10:07:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/diffs/PS_Forward.diff:
+        * tao/PortableServer/diffs/ServantLocator.diff:
+          New diffs to be applied after regeneration
+
+        Wed Sep  8 08:59:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Connection_Handler.{h,cpp,i}:
+          Zapped tss_resources, we don't need to store them
+
+        * tao/ORB_Core.{h,cpp}:
+          Zapped inherit_from_parent_thread
+
+        Wed Sep  8 08:14:12 UTC 2004  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/PortableServer.pidl:
+          Splitted this file into the new files below to be able to refactor
+          things
+
+        * tao/PortableServer/POAManager.pidl:
+          PortableServer::POAManager
+
+        * tao/PortableServer/PS_Current.pidl:
+          PortableServer::Current
+
+        * tao/PortableServer/PS_Forward.pidl:
+          Some forward declarations and typedefs needed in several files
+
+        * tao/PortableServer/AdapterActivator.pidl:
+        * tao/PortableServer/IdAssignmentPolicy.pidl:
+        * tao/PortableServer/IdUniquenessPolicy.pidl:
+        * tao/PortableServer/ImplicitActivationPolicy.pidl:
+        * tao/PortableServer/LifespanPolicy.pidl:
+        * tao/PortableServer/RequestProcessingPolicy.pidl:
+        * tao/PortableServer/ServantRetentionPolicy.pidl:
+        * tao/PortableServer/ThreadPolicy.pidl:
+          All available policies, each in its own file
+
+        * tao/PortableServer/ServantActivator.pidl:
+          PortableServer::ServantActivator
+
+        * tao/PortableServer/ServantLocator.pidl:
+          PortableServer::ServantLocator
+
+        * tao/PortableServer/ServantManager.pidl:
+          PortableServer::ServantManager
+
+        * tao/PortableServer/GOA.pidl:
+          The MIOP related methods, in the latest spec, these are in the GOA
+          interface (Group Object Adapter), which is derived from the POA,
+          this GOA will be moved later to PortableGroup.
+
 Tue Feb 15 21:47:15 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_interface.cpp:
         * TAO_IDL/be_include/be_interface.h:
-        
+
           Removed the static method queryinterface_helper(), which is
           no longer used.
-          
+
         * TAO_IDL/be/be_visitor_component/component_ch.cpp:
-        
+
           Removed generation of the static in _tao_class_id. It is
           not used and was removed from interface code generation
           some time ago.
diff --git a/TAO/Release b/TAO/Release
index 890006fa3f9..db52ff5985b 100644
--- a/TAO/Release
+++ b/TAO/Release
@@ -28,7 +28,6 @@ CONTROLLED_FILES = \
 	TAO/interop-tests \
 	TAO/orbsvcs \
 	TAO/performance-tests \
-	TAO/release.pl \
 	TAO/rules.tao.GNU \
 	TAO/tao \
 	TAO/Makefile.am \
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index c58e89e6d40..4ab88c2dc99 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -1601,7 +1601,9 @@ TAO_CodeGen::gen_skel_src_includes (void)
     }
 
   this->gen_standard_include (this->server_skeletons_,
-                              "tao/PortableServer/Object_Adapter.h");
+                              "tao/PortableServer/Servant_Upcall.h");
+  this->gen_standard_include (this->server_skeletons_,
+                              "tao/PortableServer/ForwardRequestC.h");
   this->gen_standard_include (this->server_skeletons_,
                               "tao/PortableServer/Operation_Table.h");
   this->gen_standard_include (this->server_skeletons_,
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
index 397dc2c3986..64c97461afb 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
@@ -94,7 +94,7 @@ be_visitor_interface_strategized_proxy_broker_ss::visit_interface (
       << ")" << be_nl
       << "ACE_THROW_SPEC ((CORBA::Exception))" << be_uidt_nl
       << "{" << be_idt_nl
-      << "TAO_Object_Adapter::Servant_Upcall servant_upcall ("
+      << "TAO::Portable_Server::Servant_Upcall servant_upcall ("
       << be_idt << be_idt_nl
       << "obj->_stubobj ()"
       << "->servant_orb_var ()->orb_core ()"
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
index 27b5d446f24..49f0856ce0f 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
@@ -556,7 +556,7 @@ be_visitor_operation_ami_cs::gen_marshal_and_invoke (be_operation *node,
     this->gen_raise_interceptor_exception (
       bt,
       "CORBA::UNKNOWN",
-      "TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_YES");
+      "TAO::VMCID, CORBA::COMPLETED_YES");
 
   if (status == -1)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
index 8bc9ba1e2b7..31a5efbdafb 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
@@ -81,7 +81,7 @@ be_visitor_operation_direct_proxy_impl_ss::visit_operation (
       << "{" << be_idt_nl;
 
 #if 0
-      << "TAO_Object_Adapter::Servant_Upcall servant_upcall ("
+      << "TAO::Portable_Server::Servant_Upcall servant_upcall ("
       << be_idt << be_idt_nl
       << "obj->_stubobj ()"
       << "->servant_orb_var ()->orb_core ()"
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp
index 74892c293e0..39a2d32d9ba 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/interceptors_ss.cpp
@@ -19,8 +19,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_operation, 
-           operation_interceptors_ss, 
+ACE_RCSID (be_visitor_operation,
+           operation_interceptors_ss,
            "$Id$")
 
 // ******************************************************
@@ -76,7 +76,7 @@ be_visitor_operation_interceptors_ss::generate_class_declaration (
   // Generate the ServerRequestInfo object per operation to
   // be used by the interecptors.
 
-  *os << be_nl << be_nl 
+  *os << be_nl << be_nl
       << "class TAO_ServerRequestInfo_"<< node->flat_name ();
 
   // We need the interface node in which this operation was defined. However,
@@ -162,7 +162,7 @@ be_visitor_operation_interceptors_ss::generate_class_declaration (
     }
 
   // Pass in the pointer to the Servant_Upcall.
-  *os << "TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall," << be_nl;
+  *os << "TAO::Portable_Server::Servant_Upcall *tao_servant_upcall," << be_nl;
 
   // Get the right object implementation.
   *os << intf->full_skel_name () << " *tao_impl";
@@ -443,7 +443,7 @@ be_visitor_operation_interceptors_ss::generate_class_definition (
 
   // Generate the ServerRequestInfo object definition per operation
   // to be used by the interceptors.
-  *os << be_nl << be_nl 
+  *os << be_nl << be_nl
       << "TAO_ServerRequestInfo_" << node->flat_name ();
 
   // We need the interface node in which this operation was defined. However,
@@ -511,7 +511,7 @@ be_visitor_operation_interceptors_ss::generate_class_definition (
 
   *os << " (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &_tao_server_request," << be_nl
-      << "TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall," << be_nl;
+      << "TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall," << be_nl;
 
   be_interface *intf;
   intf = this->ctx_->attribute ()
@@ -771,7 +771,7 @@ be_visitor_operation_interceptors_ss::generate_class_definition (
   // -----------------------------------------------------------------
   // PortableInterceptor::ServerRequestInfo::result()
   // -----------------------------------------------------------------
-  *os << be_nl << be_nl 
+  *os << be_nl << be_nl
       << "CORBA::Any * " << be_nl;
 
   *os << "TAO_ServerRequestInfo_"<< node->flat_name ();
@@ -877,7 +877,7 @@ be_visitor_operation_interceptors_ss::generate_class_definition (
   // -----------------------------------------------------------------
   // PortableInterceptor::ServerRequestInfo::target_most_derived_interface()
   // -----------------------------------------------------------------
-  *os << be_nl << be_nl 
+  *os << be_nl << be_nl
       << "char *" << be_nl;
 
   *os << "TAO_ServerRequestInfo_"<< node->flat_name ();
@@ -925,7 +925,7 @@ be_visitor_operation_interceptors_ss::generate_class_definition (
   // -----------------------------------------------------------------
   // PortableInterceptor::ServerRequestInfo::target_is_a()
   // -----------------------------------------------------------------
-  *os << be_nl << be_nl 
+  *os << be_nl << be_nl
       << "CORBA::Boolean" << be_nl;
 
   *os << "TAO_ServerRequestInfo_"<< node->flat_name ();
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
index 070e579765b..95b181f19ab 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
@@ -198,9 +198,9 @@ be_visitor_operation_ss::visit_operation (be_operation *node)
       << "\n#if (TAO_HAS_INTERCEPTORS == 1)" << be_nl;
 
   // Cast the Servant_Upcall pointer.
-  *os << "TAO_Object_Adapter::Servant_Upcall *_tao_upcall =" << be_idt_nl
+  *os << "TAO::Portable_Server::Servant_Upcall *_tao_upcall =" << be_idt_nl
       << "static_cast<" << be_idt << be_idt_nl
-      << "TAO_Object_Adapter::Servant_Upcall *> (" << be_nl
+      << "TAO::Portable_Server::Servant_Upcall *> (" << be_nl
       << "_tao_servant_upcall" << be_uidt_nl
       << ");" << be_uidt_nl << be_uidt_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp
index 0ea79e2c0de..171f026dbc5 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/thru_poa_proxy_impl_ss.cpp
@@ -91,7 +91,7 @@ be_visitor_operation_thru_poa_proxy_impl_ss::visit_operation (
       << "{" << be_idt_nl;
 
 #if 0
-      << "TAO_Object_Adapter::Servant_Upcall servant_upcall ("
+      << "TAO::Portable_Server::Servant_Upcall servant_upcall ("
       << be_idt << be_idt_nl
       << "obj->_stubobj ()"
       << "->servant_orb_var ()->orb_core ()"
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h
index 8648c264515..4f3a9666ba2 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Stock_Factory_Locator_i.h
@@ -7,6 +7,7 @@
 
 #include "tao/ORB.h"
 #include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/ServantLocatorC.h"
 
 class Quoter_Stock_Factory_Locator_i : public PortableServer::ServantLocator
 {
diff --git a/TAO/examples/Buffered_AMI/Buffered_AMI.mpc b/TAO/examples/Buffered_AMI/Buffered_AMI.mpc
index 3545f350bfa..5f43c5681ad 100644
--- a/TAO/examples/Buffered_AMI/Buffered_AMI.mpc
+++ b/TAO/examples/Buffered_AMI/Buffered_AMI.mpc
@@ -1,15 +1,15 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): messaging, taoexe, portableserver, ami {
+project(*Server): messaging, taoserver, ami {
   Source_Files {
     test_i.cpp
     server.cpp
-  }  
+  }
 }
- 
+
 project(*Client): messaging, taoexe, portableserver, ami {
   Source_Files {
     client.cpp
-  }  
+  }
 }
diff --git a/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc b/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc
index f6bafad3fd3..4377ad161f0 100644
--- a/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc
+++ b/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, messaging {
+project(*Server): taoserver, messaging {
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): taoexe, messaging {
+project(*Client): taoclient, messaging {
   Source_Files {
     client.cpp
   }
diff --git a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
index 7f62ba20434..37723082d44 100644
--- a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
+++ b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(Callback_Quoter notifier): namingexe, naming_serv {
+project(Callback_Quoter notifier): namingexe, naming_serv, utils {
   Source_Files {
     Notifier_i.cpp
     Notifier_Input_Handler.cpp
diff --git a/TAO/examples/Callback_Quoter/Consumer_Handler.h b/TAO/examples/Callback_Quoter/Consumer_Handler.h
index 9a0cd8b6c22..ebd8581071e 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Handler.h
+++ b/TAO/examples/Callback_Quoter/Consumer_Handler.h
@@ -30,7 +30,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/ORB_Manager.h"
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/CosNamingC.h"
 
diff --git a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
index 9f5279a815b..6073b6e7662 100644
--- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
+++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.h
@@ -21,7 +21,7 @@
 
 #include "Notifier_i.h"
 #include "NotifierS.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "orbsvcs/CosNamingS.h"
 #include "orbsvcs/Naming/Naming_Server.h"
 
diff --git a/TAO/examples/Callback_Quoter/Notifier_i.h b/TAO/examples/Callback_Quoter/Notifier_i.h
index ed4397b76bd..d40647a2274 100644
--- a/TAO/examples/Callback_Quoter/Notifier_i.h
+++ b/TAO/examples/Callback_Quoter/Notifier_i.h
@@ -27,7 +27,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ConsumerC.h"
-#include "tao/PortableServer/ORB_Manager.h"
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Containers.h"
 #include "ace/SString.h"
diff --git a/TAO/examples/Event_Comm/Event_Comm.mpc b/TAO/examples/Event_Comm/Event_Comm.mpc
index fd6298eee08..5920a1b56b4 100644
--- a/TAO/examples/Event_Comm/Event_Comm.mpc
+++ b/TAO/examples/Event_Comm/Event_Comm.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*notifier): namingexe, naming_serv {
+project(*notifier): namingexe, naming_serv, utils {
   Source_Files {
     Event_Comm_i.cpp
     Notifier_Server.cpp
diff --git a/TAO/examples/Event_Comm/Notifier_Server.h b/TAO/examples/Event_Comm/Notifier_Server.h
index bbb1880c33a..dc801cc8f3c 100644
--- a/TAO/examples/Event_Comm/Notifier_Server.h
+++ b/TAO/examples/Event_Comm/Notifier_Server.h
@@ -18,7 +18,7 @@
 #define _NOTIFIER_SERVER_H
 
 #include "Event_Comm_i.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "orbsvcs/CosNamingS.h"
 #include "orbsvcs/Naming/Naming_Server.h"
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
index 2b6f34dfc15..45e9eccb633 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduler.cpp
@@ -107,7 +107,7 @@ EDF_Scheduler::create_scheduling_parameter (const EDF_Scheduling::SchedulingPara
                     EDF_Sched_Param_Policy,
                     CORBA::NO_MEMORY (
                                       CORBA::SystemException::_tao_minor_code (
-                                                                               TAO_DEFAULT_MINOR_CODE,
+                                                                               TAO::VMCID,
                                                                                ENOMEM),
                                       CORBA::COMPLETED_NO));
 
@@ -446,7 +446,7 @@ EDF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
       ACE_OS::memcpy (&int_guid,
 		      guid.get_buffer (),
 		      guid.length ());
-  
+
 
 #ifdef KOKYU_DSRT_LOGGING
       ACE_DEBUG ((LM_DEBUG,
@@ -476,7 +476,7 @@ EDF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr ri,
   record the entering dispatcher time on the server side.
   Tenth Time.
 */
-#ifdef KOKYU_HAS_RELEASE_GUARD 
+#ifdef KOKYU_HAS_RELEASE_GUARD
   this->kokyu_dispatcher_->release_guard (guid, qos);
 #else
   this->kokyu_dispatcher_->schedule (guid, qos);
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
index 92039e6c7b1..a3994d8248d 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduler.cpp
@@ -45,20 +45,20 @@ FP_Segment_Sched_Param_Policy::value (
   this->value_ = value;
 }
 
-CORBA::Policy_ptr 
+CORBA::Policy_ptr
 FP_Segment_Sched_Param_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   FP_Segment_Sched_Param_Policy* tmp;
   ACE_NEW_THROW_EX (tmp, FP_Segment_Sched_Param_Policy (*this),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
-void 
+void
 FP_Segment_Sched_Param_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -97,7 +97,7 @@ Fixed_Priority_Scheduler::Fixed_Priority_Scheduler (
   ACE_CHECK;
 
   IOP::CodecFactory_var codec_factory;
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     orb->resolve_initial_references ("CodecFactory"
                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -140,13 +140,13 @@ Fixed_Priority_Scheduler::create_segment_scheduling_parameter (
         CORBA::SystemException
       ))
 {
-  FP_Scheduling::SegmentSchedulingParameterPolicy_ptr 
+  FP_Scheduling::SegmentSchedulingParameterPolicy_ptr
     segment_sched_param_policy;
   ACE_NEW_THROW_EX (segment_sched_param_policy,
                     FP_Segment_Sched_Param_Policy,
                     CORBA::NO_MEMORY (
                                       CORBA::SystemException::_tao_minor_code (
-                                       TAO_DEFAULT_MINOR_CODE,
+                                       TAO::VMCID,
                                        ENOMEM),
                                       CORBA::COMPLETED_NO));
 
@@ -166,8 +166,8 @@ Fixed_Priority_Scheduler::begin_new_scheduling_segment (const RTScheduling::Curr
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
 #ifdef KOKYU_DSRT_LOGGING
-  ACE_DEBUG ((LM_DEBUG, 
-              "(%t|%T):FP_Scheduler::begin_new_scheduling_segment enter\n")); 
+  ACE_DEBUG ((LM_DEBUG,
+              "(%t|%T):FP_Scheduler::begin_new_scheduling_segment enter\n"));
 #endif
 
 #ifdef KOKYU_DSRT_LOGGING
@@ -188,8 +188,8 @@ Fixed_Priority_Scheduler::begin_new_scheduling_segment (const RTScheduling::Curr
   kokyu_dispatcher_->schedule (guid, qos);
 
 #ifdef KOKYU_DSRT_LOGGING
-  ACE_DEBUG ((LM_DEBUG, 
-              "(%t|%T):FP_Scheduler::begin_new_scheduling_segment exit\n")); 
+  ACE_DEBUG ((LM_DEBUG,
+              "(%t|%T):FP_Scheduler::begin_new_scheduling_segment exit\n"));
 #endif
 }
 
@@ -524,7 +524,7 @@ Fixed_Priority_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr
 #endif
     }
 
-  kokyu_dispatcher_->update_schedule (*(this->current_->id ()), 
+  kokyu_dispatcher_->update_schedule (*(this->current_->id ()),
                                       Kokyu::BLOCK);
 
 #ifdef KOKYU_DSRT_LOGGING
@@ -575,7 +575,7 @@ Fixed_Priority_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_
   // Check that the reply service context was received as
   // expected.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (Client_Interceptor::SchedulingInfo 
+    ri->get_reply_service_context (Client_Interceptor::SchedulingInfo
                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -605,7 +605,7 @@ Fixed_Priority_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_
       ACE_DEBUG ((LM_DEBUG,
                   "(%t): Desired_Priority = %d in recvd service context\n",
                   desired_priority));
-#endif                  
+#endif
     }
 
   FP_Scheduler_Traits::QoSDescriptor_t qos;
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
index c29054aa439..4873f12ae51 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduler.cpp
@@ -36,21 +36,21 @@ MIF_Sched_Param_Policy::value (const MIF_Scheduling::SchedulingParameter& value
   this->value_ = value;
 }
 
-CORBA::Policy_ptr 
+CORBA::Policy_ptr
 MIF_Sched_Param_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   MIF_Sched_Param_Policy* tmp = 0;
-  ACE_NEW_THROW_EX (tmp, 
+  ACE_NEW_THROW_EX (tmp,
 		    MIF_Sched_Param_Policy (*this),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
-void 
+void
 MIF_Sched_Param_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -86,7 +86,7 @@ MIF_Scheduler::MIF_Scheduler (CORBA::ORB_ptr orb,
   this->current_ =
     RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   IOP::CodecFactory_var codec_factory;
   CORBA::Object_var obj = orb->resolve_initial_references ("CodecFactory"
                                                            ACE_ENV_ARG_PARAMETER);
@@ -129,7 +129,7 @@ MIF_Scheduler::create_scheduling_parameter (const MIF_Scheduling::SchedulingPara
                     MIF_Sched_Param_Policy,
                     CORBA::NO_MEMORY (
                                       CORBA::SystemException::_tao_minor_code (
-                                       TAO_DEFAULT_MINOR_CODE,
+                                       TAO::VMCID,
                                        ENOMEM),
                                       CORBA::COMPLETED_NO));
 
@@ -149,8 +149,8 @@ MIF_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
 #ifdef KOKYU_DSRT_LOGGING
-  ACE_DEBUG ((LM_DEBUG, 
-              "(%t|%T):MIF_Scheduler::begin_new_scheduling_segment enter\n")); 
+  ACE_DEBUG ((LM_DEBUG,
+              "(%t|%T):MIF_Scheduler::begin_new_scheduling_segment enter\n"));
 #endif
 
 #ifdef KOKYU_DSRT_LOGGING
@@ -171,8 +171,8 @@ MIF_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType
   kokyu_dispatcher_->schedule (guid, qos);
 
 #ifdef KOKYU_DSRT_LOGGING
-  ACE_DEBUG ((LM_DEBUG, 
-              "(%t|%T):MIF_Scheduler::begin_new_scheduling_segment exit\n")); 
+  ACE_DEBUG ((LM_DEBUG,
+              "(%t|%T):MIF_Scheduler::begin_new_scheduling_segment exit\n"));
 #endif
 }
 
@@ -318,7 +318,7 @@ MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
 
       sc.context_data =
         reinterpret_cast<CORBA::OctetSeq &> (*codec_->encode (sc_qos_as_any));
-      
+
 #ifdef KOKYU_DSRT_LOGGING
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%t|%T): send_request : about to add sched SC\n")));
@@ -465,7 +465,7 @@ MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
   if (CORBA::is_nil (sched_policy))
   {
 #ifdef KOKYU_DSRT_LOGGING
-    ACE_DEBUG ((LM_DEBUG, 
+    ACE_DEBUG ((LM_DEBUG,
                 "(%t|%T): sched_policy nil. ",
                 "importance not set in sched params\n"));
 #endif
@@ -474,7 +474,7 @@ MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
   else
     {
 #ifdef KOKYU_DSRT_LOGGING
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "(%t|%T):sched_policy not nil. ",
                   "importance set in sched params\n"));
 #endif
@@ -503,7 +503,7 @@ MIF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
 #endif
     }
 
-  kokyu_dispatcher_->update_schedule (*(this->current_->id ()), 
+  kokyu_dispatcher_->update_schedule (*(this->current_->id ()),
                                       Kokyu::BLOCK);
 
 #ifdef KOKYU_DSRT_LOGGING
@@ -564,7 +564,7 @@ MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
   // Check that the reply service context was received as
   // expected.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (Client_Interceptor::SchedulingInfo 
+    ri->get_reply_service_context (Client_Interceptor::SchedulingInfo
                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
index c70de4a578b..81b6020bf9f 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduler.cpp
@@ -36,21 +36,21 @@ MUF_Sched_Param_Policy::value (const MUF_Scheduling::SchedulingParameter& value
   this->value_ = value;
 }
 
-CORBA::Policy_ptr 
+CORBA::Policy_ptr
 MUF_Sched_Param_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   MUF_Sched_Param_Policy* tmp;
-  ACE_NEW_THROW_EX (tmp, 
+  ACE_NEW_THROW_EX (tmp,
 		    MUF_Sched_Param_Policy (*this),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
   return tmp;
 }
 
-void 
+void
 MUF_Sched_Param_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -88,7 +88,7 @@ MUF_Scheduler::MUF_Scheduler (CORBA::ORB_ptr orb,
   ACE_CHECK;
 
   IOP::CodecFactory_var codec_factory;
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     orb->resolve_initial_references ("CodecFactory"
                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -130,7 +130,7 @@ MUF_Scheduler::create_scheduling_parameter (const MUF_Scheduling::SchedulingPara
                     MUF_Sched_Param_Policy,
                     CORBA::NO_MEMORY (
                                       CORBA::SystemException::_tao_minor_code (
-                                       TAO_DEFAULT_MINOR_CODE,
+                                       TAO::VMCID,
                                        ENOMEM),
                                       CORBA::COMPLETED_NO));
 
@@ -150,8 +150,8 @@ MUF_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType
                    RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
 #ifdef KOKYU_DSRT_LOGGING
-  ACE_DEBUG ((LM_DEBUG, 
-              "(%t|%T):MUF_Scheduler::begin_new_scheduling_segment enter\n")); 
+  ACE_DEBUG ((LM_DEBUG,
+              "(%t|%T):MUF_Scheduler::begin_new_scheduling_segment enter\n"));
 #endif
 
 #ifdef KOKYU_DSRT_LOGGING
@@ -175,8 +175,8 @@ MUF_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType
   kokyu_dispatcher_->schedule (guid, qos);
 
 #ifdef KOKYU_DSRT_LOGGING
-  ACE_DEBUG ((LM_DEBUG, 
-              "(%t|%T):MUF_Scheduler::begin_new_scheduling_segment exit\n")); 
+  ACE_DEBUG ((LM_DEBUG,
+              "(%t|%T):MUF_Scheduler::begin_new_scheduling_segment exit\n"));
 #endif
 }
 
@@ -333,7 +333,7 @@ MUF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
 
       sc.context_data =
         reinterpret_cast<CORBA::OctetSeq &> (*codec_->encode (sc_qos_as_any));
-      
+
 #ifdef KOKYU_DSRT_LOGGING
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%t|%T): send_request : about to add sched SC\n")));
@@ -505,7 +505,7 @@ MUF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
   if (CORBA::is_nil (sched_policy))
   {
 #ifdef KOKYU_DSRT_LOGGING
-    ACE_DEBUG ((LM_DEBUG, 
+    ACE_DEBUG ((LM_DEBUG,
                 "(%t|%T): sched_policy nil.\n "));
 #endif
     //24 hrs from now - infinity
@@ -517,7 +517,7 @@ MUF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
   else
     {
 #ifdef KOKYU_DSRT_LOGGING
-      ACE_DEBUG ((LM_DEBUG, 
+      ACE_DEBUG ((LM_DEBUG,
                   "(%t|%T):sched_policy not nil. ",
                   "sched params set\n"));
 #endif
@@ -550,7 +550,7 @@ MUF_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
 #endif
     }
 
-  kokyu_dispatcher_->update_schedule (*(this->current_->id ()), 
+  kokyu_dispatcher_->update_schedule (*(this->current_->id ()),
                                       Kokyu::BLOCK);
 
 #ifdef KOKYU_DSRT_LOGGING
@@ -602,7 +602,7 @@ MUF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
   // Check that the reply service context was received as
   // expected.
   IOP::ServiceContext_var sc =
-    ri->get_reply_service_context (Client_Interceptor::SchedulingInfo 
+    ri->get_reply_service_context (Client_Interceptor::SchedulingInfo
                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
diff --git a/TAO/examples/Load_Balancing/Identity_Client.h b/TAO/examples/Load_Balancing/Identity_Client.h
index 371c41c17bd..0275dd47847 100644
--- a/TAO/examples/Load_Balancing/Identity_Client.h
+++ b/TAO/examples/Load_Balancing/Identity_Client.h
@@ -22,7 +22,7 @@
 #ifndef IDENTITY_CLIENT_H_
 #define IDENTITY_CLIENT_H_
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/examples/Load_Balancing/Identity_Server.h b/TAO/examples/Load_Balancing/Identity_Server.h
index 5b9249f8fac..1f4c411a44e 100644
--- a/TAO/examples/Load_Balancing/Identity_Server.h
+++ b/TAO/examples/Load_Balancing/Identity_Server.h
@@ -21,7 +21,7 @@
 #ifndef IDENTITY_SERVER_H_
 #define IDENTITY_SERVER_H_
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "Load_BalancerC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/examples/Load_Balancing/Load_Balancing.mpc b/TAO/examples/Load_Balancing/Load_Balancing.mpc
index b2bb9e124aa..736a82ad8ed 100644
--- a/TAO/examples/Load_Balancing/Load_Balancing.mpc
+++ b/TAO/examples/Load_Balancing/Load_Balancing.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoserver {
+project(*server): taoserver, utils {
   avoids += repo
 
   IDL_Files {
@@ -18,7 +18,7 @@ project(*server): taoserver {
   }
 }
 
-project(*Client): taoclient, portableserver {
+project(*Client): taoclient, utils, portableserver {
   avoids += repo
 
   IDL_Files {
@@ -33,7 +33,7 @@ project(*Client): taoclient, portableserver {
   }
 }
 
-project(*Balancer): taoexe, portableserver {
+project(*Balancer): taoexe, utils, portableserver {
   exename = load_balancer
   avoids += repo
 
diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.h b/TAO/examples/Load_Balancing/Load_Balancing_Service.h
index eb42bb8375a..229e17d760c 100644
--- a/TAO/examples/Load_Balancing/Load_Balancing_Service.h
+++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.h
@@ -20,7 +20,7 @@
 #ifndef LOAD_BALANCING_SERVICE_H_
 #define LOAD_BALANCING_SERVICE_H_
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.h b/TAO/examples/Load_Balancing_persistent/Identity_Client.h
index ceafcc5067f..94565ef6278 100755
--- a/TAO/examples/Load_Balancing_persistent/Identity_Client.h
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.h
@@ -22,7 +22,7 @@
 #ifndef IDENTITY_CLIENT_H_
 #define IDENTITY_CLIENT_H_
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.h b/TAO/examples/Load_Balancing_persistent/Identity_Server.h
index d9f69946a5d..36cdc386f62 100755
--- a/TAO/examples/Load_Balancing_persistent/Identity_Server.h
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.h
@@ -21,7 +21,7 @@
 #ifndef IDENTITY_SERVER_H_
 #define IDENTITY_SERVER_H_
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "Load_BalancerC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h
index e25661d9bd5..0ea8c460e6d 100755
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.h
@@ -20,7 +20,7 @@
 #ifndef LOAD_BALANCING_SERVICE_H_
 #define LOAD_BALANCING_SERVICE_H_
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
index 84bdfb0f588..f93b076aa74 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*balancer): taoexe, portableserver, minimum_corba {
+project(*balancer): taoexe, utils, portableserver, minimum_corba {
   avoids += repo
   exename = load_balancer
 
@@ -17,7 +17,7 @@ project(*balancer): taoexe, portableserver, minimum_corba {
   }
 }
 
-project(*server): taoserver, minimum_corba {
+project(*server): taoserver, utils, minimum_corba {
   avoids += repo
 
   Source_Files {
@@ -29,7 +29,7 @@ project(*server): taoserver, minimum_corba {
   }
 }
 
-project(*client): taoclient, portableserver, minimum_corba {
+project(*client): taoclient, utils, portableserver, minimum_corba {
   avoids += repo
   exename = client
 
diff --git a/TAO/examples/Logging/Logging.mpc b/TAO/examples/Logging/Logging.mpc
index 60513e19345..e014cd68c0a 100644
--- a/TAO/examples/Logging/Logging.mpc
+++ b/TAO/examples/Logging/Logging.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Service): namingexe, naming_serv, lifecycle {
+project(*Service): namingexe, naming_serv, lifecycle, utils {
   Source_Files {
     Logger_i.cpp
     Logging_Service.cpp
diff --git a/TAO/examples/Logging/Logging_Service_i.h b/TAO/examples/Logging/Logging_Service_i.h
index e0916ad81ed..becd042d403 100644
--- a/TAO/examples/Logging/Logging_Service_i.h
+++ b/TAO/examples/Logging/Logging_Service_i.h
@@ -31,7 +31,7 @@
 
 #include "ace/Log_Msg.h"
 #include "ace/OS.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/Naming/Naming_Server.h"
 #include "Logger_i.h"
diff --git a/TAO/examples/OBV/Simple_util.h b/TAO/examples/OBV/Simple_util.h
index 352049e88d0..380dc749dc6 100644
--- a/TAO/examples/OBV/Simple_util.h
+++ b/TAO/examples/OBV/Simple_util.h
@@ -23,7 +23,7 @@
 #ifndef TAO_UTIL_H
 #define TAO_UTIL_H
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
diff --git a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
index ce1d87be55f..9431556642e 100644
--- a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
+++ b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver, valuetype, minimum_corba {
+project(*server): taoexe, utils, portableserver, valuetype, minimum_corba {
   Source_Files {
     Server_i.cpp
     Event_Types_impl.cpp
@@ -10,7 +10,7 @@ project(*server): taoexe, portableserver, valuetype, minimum_corba {
   }
 }
 
-project(*client): taoexe, portableserver, valuetype, minimum_corba {
+project(*client): taoexe, utils, portableserver, valuetype, minimum_corba {
   Source_Files {
     Client_i.cpp
     Event_Types_impl.cpp
diff --git a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
index 7f01d95962a..89d427ced0e 100644
--- a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
+++ b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, minimum_corba {
+project(*Server): taoserver, minimum_corba {
    includes += ../Generic_Servant
    libs += Generic_Servant
    after += POA_Generic_Servant_Lib
diff --git a/TAO/examples/POA/Adapter_Activator/server.cpp b/TAO/examples/POA/Adapter_Activator/server.cpp
index 9d8c221b6e7..b58c313ebe5 100644
--- a/TAO/examples/POA/Adapter_Activator/server.cpp
+++ b/TAO/examples/POA/Adapter_Activator/server.cpp
@@ -26,6 +26,7 @@
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
+#include "tao/PortableServer/AdapterActivatorC.h"
 
 ACE_RCSID(Adapter_Activator, server, "$Id$")
 
diff --git a/TAO/examples/POA/DSI/Database_i.h b/TAO/examples/POA/DSI/Database_i.h
index 25c120a7b0e..70a0f306963 100644
--- a/TAO/examples/POA/DSI/Database_i.h
+++ b/TAO/examples/POA/DSI/Database_i.h
@@ -7,6 +7,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/DynamicInterface/Dynamic_Implementation.h"
+#include "tao/PortableServer/PS_CurrentC.h"
 #include "ace/Singleton.h"
 #include "ace/Malloc.h"
 
diff --git a/TAO/examples/POA/DSI/POA_DSI.mpc b/TAO/examples/POA/DSI/POA_DSI.mpc
index 04d3e67fc42..62a433a23c3 100644
--- a/TAO/examples/POA/DSI/POA_DSI.mpc
+++ b/TAO/examples/POA/DSI/POA_DSI.mpc
@@ -1,11 +1,12 @@
 //$Id$
-project(*Client) : taoexe, messaging, portableserver, minimum_corba {
+project(*Client) : taoclient, messaging, minimum_corba {
   source_files {
+    DatabaseC.cpp
     client.cpp
   }
 }
 
-project(*Server) : taoexe, messaging, portableserver, dynamicinterface, minimum_corba {
+project(*Server) : taoserver, messaging, dynamicinterface, minimum_corba {
   source_files {
     Database_i.cpp
     server.cpp
diff --git a/TAO/examples/POA/Default_Servant/File_i.cpp b/TAO/examples/POA/Default_Servant/File_i.cpp
index 3289d6f8bac..56145e39158 100644
--- a/TAO/examples/POA/Default_Servant/File_i.cpp
+++ b/TAO/examples/POA/Default_Servant/File_i.cpp
@@ -18,6 +18,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_unistd.h"
+#include "tao/PortableServer/PS_CurrentC.h"
 
 ACE_RCSID(Default_Servant, File_i, "$Id$")
 
diff --git a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
index 779807622d3..52883cadbcd 100644
--- a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
+++ b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
@@ -1,13 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Client) : taoexe, portableserver, minimum_corba {
+project(*Client) : taoclient, minimum_corba {
   source_files {
+    FileC.cpp
     client.cpp
   }
 }
 
-project(*Server) : taoexe, portableserver, minimum_corba {
+project(*Server) : taoserver, minimum_corba {
   source_files {
     File_i.cpp
     server.cpp
diff --git a/TAO/examples/POA/FindPOA/FindPOA.cpp b/TAO/examples/POA/FindPOA/FindPOA.cpp
index a5247ede801..8d96c04e54c 100644
--- a/TAO/examples/POA/FindPOA/FindPOA.cpp
+++ b/TAO/examples/POA/FindPOA/FindPOA.cpp
@@ -17,12 +17,14 @@
 //===========================================================================
 
 #include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/POA.h"
+#include "tao/PortableServer/Adapter_Activator.h"
 
 #include "tao/ORB.h"
+#include "ace/Log_Msg.h"
+#include "ace/SString.h"
 
-ACE_RCSID (FindPOA, 
-           FindPOA, 
+ACE_RCSID (FindPOA,
+           FindPOA,
            "$Id$")
 
 void
@@ -92,7 +94,7 @@ main (int argc, char **argv)
 
       // Get a TAO_Adapter_Activator reference
       PortableServer::AdapterActivator_var activator =
-        new TAO_Adapter_Activator (poa_manager.in ());
+        new TAO::Portable_Server::Adapter_Activator (poa_manager.in ());
 
       // Register the TAO_Adapter_Activator reference to be the RootPOA's
       // Adapter Activator.
diff --git a/TAO/examples/POA/FindPOA/POA_FindPOA.mpc b/TAO/examples/POA/FindPOA/POA_FindPOA.mpc
index e5743eb768c..6be6fb2148f 100644
--- a/TAO/examples/POA/FindPOA/POA_FindPOA.mpc
+++ b/TAO/examples/POA/FindPOA/POA_FindPOA.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoexe, portableserver, minimum_corba {
+project: taoserver, minimum_corba {
 }
 
diff --git a/TAO/examples/POA/Forwarding/Servant_Activator.h b/TAO/examples/POA/Forwarding/Servant_Activator.h
index b70c23e05f8..7c307fc26aa 100644
--- a/TAO/examples/POA/Forwarding/Servant_Activator.h
+++ b/TAO/examples/POA/Forwarding/Servant_Activator.h
@@ -23,6 +23,7 @@
 
 #include "tao/ORB.h"
 #include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/ServantActivatorC.h"
 
 class ServantActivator : public PortableServer::ServantActivator
 {
diff --git a/TAO/examples/POA/Loader/POA_Loader.mpc b/TAO/examples/POA/Loader/POA_Loader.mpc
index 5fb4927d770..72bcf90edb6 100644
--- a/TAO/examples/POA/Loader/POA_Loader.mpc
+++ b/TAO/examples/POA/Loader/POA_Loader.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(*Server): taoexe, portableserver, minimum_corba {
+project(*Server): taoserver, minimum_corba {
    Source_Files {
     server.cpp
     Servant_Activator.cpp
diff --git a/TAO/examples/POA/Loader/Servant_Activator.h b/TAO/examples/POA/Loader/Servant_Activator.h
index 5f3b6401c3c..969787a3a02 100644
--- a/TAO/examples/POA/Loader/Servant_Activator.h
+++ b/TAO/examples/POA/Loader/Servant_Activator.h
@@ -22,6 +22,7 @@
 #define SERVANT_ACTIVATOR_H
 
 #include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/ServantActivatorC.h"
 
 #include "tao/ORB.h"
 
diff --git a/TAO/examples/POA/Loader/Servant_Locator.h b/TAO/examples/POA/Loader/Servant_Locator.h
index 81b5ebb88be..a5e5725e2bd 100644
--- a/TAO/examples/POA/Loader/Servant_Locator.h
+++ b/TAO/examples/POA/Loader/Servant_Locator.h
@@ -22,6 +22,7 @@
 #define SERVANT_LOCATOR_H
 
 #include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/ServantLocatorC.h"
 
 #include "tao/ORB.h"
 
diff --git a/TAO/examples/POA/NewPOA/POA_NewPOA.mpc b/TAO/examples/POA/NewPOA/POA_NewPOA.mpc
index b330e9a825f..c94b12f94dd 100644
--- a/TAO/examples/POA/NewPOA/POA_NewPOA.mpc
+++ b/TAO/examples/POA/NewPOA/POA_NewPOA.mpc
@@ -1,3 +1,3 @@
 //$Id$
-project : taoexe, portableserver, minimum_corba {
+project : taoserver, minimum_corba {
 }
diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h
index 043dacf4d79..8f2d7afd85f 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Activator.h
@@ -17,6 +17,7 @@
 // ================================================================
 
 #include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/ServantActivatorC.h"
 
 #include "tao/ORB.h"
 
diff --git a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h
index 33a332bb163..14982781d69 100644
--- a/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h
+++ b/TAO/examples/POA/On_Demand_Activation/Servant_Locator.h
@@ -18,6 +18,7 @@
 //==================================================================================
 
 #include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/ServantLocatorC.h"
 
 #include "tao/ORB.h"
 
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h
index dc03fcbe513..53e6316101c 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Activator.h
@@ -23,6 +23,7 @@
 #define SERVANT_ACTIVATOR_H
 
 #include "Servant_Manager.h"
+#include "tao/PortableServer/ServantActivatorC.h"
 
 class ServantActivator_i : public PortableServer::ServantActivator
 {
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h
index 397dc9d87fb..bdd85a2f07e 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Locator.h
@@ -24,6 +24,7 @@
 #include "ace/DLL.h"
 
 #include "Servant_Manager.h"
+#include "tao/PortableServer/ServantLocatorC.h"
 
 class ServantLocator_i : public PortableServer::ServantLocator
 {
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.h b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.h
index 4d89c0f8aca..1e8e3f687b4 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.h
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.h
@@ -24,9 +24,11 @@
 #include "ace/Containers.h"
 
 #include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/POA.h"
+#include "tao/PortableServer/Servant_Base.h"
+#include "tao/PortableServer/Active_Object_Map.h"
 
 #include "tao/ORB.h"
+#include "ace/SString.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc b/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc
index 368e062cbc6..98e7b408cf3 100644
--- a/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc
+++ b/TAO/examples/POA/POA_BiDir/POA_BiDir.mpc
@@ -1,5 +1,5 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoexe, portableserver, bidir_giop, minimum_corba {
+project: taoserver, bidir_giop, minimum_corba {
 }
diff --git a/TAO/examples/POA/RootPOA/RootPOA.mpc b/TAO/examples/POA/RootPOA/RootPOA.mpc
index 1ed2fb1882d..7860ab129f4 100644
--- a/TAO/examples/POA/RootPOA/RootPOA.mpc
+++ b/TAO/examples/POA/RootPOA/RootPOA.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     RootPOA.cpp
   }
diff --git a/TAO/examples/Persistent_Grid/Persistent_Grid.mpc b/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
index 4636150a15e..d4d326d3fc1 100644
--- a/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
+++ b/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver {
+project(*server): taoserver, utils {
   Source_Files {
     Grid_i.cpp
     Simple_util.cpp
@@ -9,7 +9,7 @@ project(*server): taoexe, portableserver {
   }
 }
 
-project(*client): taoexe, portableserver {
+project(*client): taoexe, utils, portableserver {
   Source_Files {
     GridC.cpp
     Simple_util.cpp
@@ -18,7 +18,7 @@ project(*client): taoexe, portableserver {
   }
 }
 
-project(*persistent client): taoexe, portableserver {
+project(*persistent client): taoexe, utils, portableserver {
   Source_Files {
     GridC.cpp
     Simple_util.cpp
diff --git a/TAO/examples/Persistent_Grid/Simple_util.h b/TAO/examples/Persistent_Grid/Simple_util.h
index f1491f00151..c5bcc8fa47a 100644
--- a/TAO/examples/Persistent_Grid/Simple_util.h
+++ b/TAO/examples/Persistent_Grid/Simple_util.h
@@ -19,7 +19,7 @@
 #ifndef TAO_UTIL_H
 #define TAO_UTIL_H
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 
diff --git a/TAO/examples/Quoter/Factory_Finder.h b/TAO/examples/Quoter/Factory_Finder.h
index 3d9e89ca85d..2bed421dc17 100644
--- a/TAO/examples/Quoter/Factory_Finder.h
+++ b/TAO/examples/Quoter/Factory_Finder.h
@@ -19,7 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "Factory_Finder_i.h"
 
 #ifndef QUOTER_FACTORY_FINDER_H
diff --git a/TAO/examples/Quoter/Generic_Factory.h b/TAO/examples/Quoter/Generic_Factory.h
index 1d5950ebb27..8e20a97cba0 100644
--- a/TAO/examples/Quoter/Generic_Factory.h
+++ b/TAO/examples/Quoter/Generic_Factory.h
@@ -19,7 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "Generic_Factory_i.h"
 
 #ifndef GENERIC_FACTORY_H
diff --git a/TAO/examples/Quoter/Quoter.mpc b/TAO/examples/Quoter/Quoter.mpc
index f972a2040d5..8f7dea8f1f6 100644
--- a/TAO/examples/Quoter/Quoter.mpc
+++ b/TAO/examples/Quoter/Quoter.mpc
@@ -4,7 +4,7 @@
 // todo : Once MPC is used for everything, we should consider
 //        removing the includes += lines below, and updating
 //        the source code instead.
-project(*server): namingexe, lifecycle, minimum_corba {
+project(*server): namingexe, lifecycle, minimum_corba, utils {
   idlflags += -I../../orbsvcs/orbsvcs
   includes += ../../orbsvcs/orbsvcs
   Source_Files {
@@ -21,7 +21,7 @@ project(*client): namingexe, lifecycle, minimum_corba {
   }
 }
 
-project(*Factory Finder): namingexe, lifecycle, minimum_corba {
+project(*Factory Finder): namingexe, lifecycle, minimum_corba, utils {
   idlflags += -I../../orbsvcs/orbsvcs
   includes += ../../orbsvcs/orbsvcs
   Source_Files {
@@ -30,7 +30,7 @@ project(*Factory Finder): namingexe, lifecycle, minimum_corba {
   }
 }
 
-project(*Generic Factory): namingexe, lifecycle, minimum_corba {
+project(*Generic Factory): namingexe, lifecycle, minimum_corba, utils {
   idlflags += -I../../orbsvcs/orbsvcs
   includes += ../../orbsvcs/orbsvcs
   Source_Files {
diff --git a/TAO/examples/Quoter/Quoter_i.cpp b/TAO/examples/Quoter/Quoter_i.cpp
index 1e3851293a6..17caadc1bc1 100644
--- a/TAO/examples/Quoter/Quoter_i.cpp
+++ b/TAO/examples/Quoter/Quoter_i.cpp
@@ -15,13 +15,11 @@
 
 #include "Quoter_i.h"
 
-#include "tao/PortableServer/POA.h"
-
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (Quoter, 
-           Quoter_i, 
+ACE_RCSID (Quoter,
+           Quoter_i,
            "$Id$")
 
 // Constructor.  Create all the quoter factories.
diff --git a/TAO/examples/Quoter/server.h b/TAO/examples/Quoter/server.h
index 880be8f44c6..26a0540be88 100644
--- a/TAO/examples/Quoter/server.h
+++ b/TAO/examples/Quoter/server.h
@@ -30,7 +30,7 @@
 #include "ace/Log_Msg.h"
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/Naming/Naming_Server.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "Quoter_i.h"
 #include "QuoterC.h"
 
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
index 91ae7e1ed28..2bf8311319e 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
@@ -7,14 +7,14 @@
 
 ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> server_guid_counter;
 
-RTCORBA::Priority 
+RTCORBA::Priority
 Segment_Sched_Param_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->value_;
 }
 
-void 
+void
 Segment_Sched_Param_Policy::value (RTCORBA::Priority value
                                    ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -27,10 +27,10 @@ Fixed_Priority_Scheduler::Fixed_Priority_Scheduler (CORBA::ORB_ptr orb)
   ACE_TRY_NEW_ENV
     {
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RTScheduler_Current" 
+        orb->resolve_initial_references ("RTScheduler_Current"
                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       this->current_ =
         RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -47,7 +47,7 @@ Fixed_Priority_Scheduler::~Fixed_Priority_Scheduler (void)
 {
 }
 
-FP_Scheduling::SegmentSchedulingParameterPolicy_ptr 
+FP_Scheduling::SegmentSchedulingParameterPolicy_ptr
 Fixed_Priority_Scheduler::create_segment_scheduling_parameter (RTCORBA::Priority segment_priority
                                                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -57,7 +57,7 @@ Fixed_Priority_Scheduler::create_segment_scheduling_parameter (RTCORBA::Priority
                     Segment_Sched_Param_Policy,
                     CORBA::NO_MEMORY (
 				      CORBA::SystemException::_tao_minor_code (
-                                                                               TAO_DEFAULT_MINOR_CODE,
+                                                                               TAO::VMCID,
                                                                                ENOMEM),
 				      CORBA::COMPLETED_NO));
 
@@ -67,8 +67,8 @@ Fixed_Priority_Scheduler::create_segment_scheduling_parameter (RTCORBA::Priority
 
 }
 
-  
-void 
+
+void
 Fixed_Priority_Scheduler::begin_new_scheduling_segment (const RTScheduling::Current::IdType &,
 							const char *,
 							CORBA::Policy_ptr /*sched_policy*/,
@@ -79,13 +79,13 @@ Fixed_Priority_Scheduler::begin_new_scheduling_segment (const RTScheduling::Curr
 {
 }
 
-void 
+void
 Fixed_Priority_Scheduler::begin_nested_scheduling_segment (const RTScheduling::Current::IdType &guid,
 							   const char *name,
 							   CORBA::Policy_ptr sched_param,
 							   CORBA::Policy_ptr implicit_sched_param
 							   ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException, 
+  ACE_THROW_SPEC ((CORBA::SystemException,
 		   RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE))
 {
   this->begin_new_scheduling_segment (guid,
@@ -96,7 +96,7 @@ Fixed_Priority_Scheduler::begin_nested_scheduling_segment (const RTScheduling::C
   ACE_CHECK;
 }
 
-void 
+void
 Fixed_Priority_Scheduler::update_scheduling_segment (const RTScheduling::Current::IdType &guid,
 						     const char *name,
 						     CORBA::Policy_ptr sched_param,
@@ -111,10 +111,10 @@ Fixed_Priority_Scheduler::update_scheduling_segment (const RTScheduling::Current
 				      implicit_sched_param
 				      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
-    
-void 
+
+void
 Fixed_Priority_Scheduler::end_scheduling_segment (const RTScheduling::Current::IdType &,
                                                   const char *
                                                   ACE_ENV_ARG_DECL_NOT_USED)
@@ -122,18 +122,18 @@ Fixed_Priority_Scheduler::end_scheduling_segment (const RTScheduling::Current::I
 {
 }
 
-void 
+void
 Fixed_Priority_Scheduler::end_nested_scheduling_segment (const RTScheduling::Current::IdType &,
 							 const char *,
 							 CORBA::Policy_ptr
 							 ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  
+
 }
-  
 
-void 
+
+void
 Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_info
 					ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
@@ -145,13 +145,13 @@ Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_p
   ACE_Thread::self (current);
   if (ACE_Thread::getprio (current, priority) == -1)
     return;
-  
+
   ACE_DEBUG ((LM_DEBUG,
 	      "Request thread priority is %d %d\n",
 	      priority,
 	      ACE_DEFAULT_THREAD_PRIORITY));
-  
-  
+
+
   IOP::ServiceContext* srv_con = new IOP::ServiceContext;
   srv_con->context_id = Client_Interceptor::SchedulingInfo;
   srv_con->context_data.length (sizeof (long));
@@ -163,10 +163,10 @@ Fixed_Priority_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_p
 					     0
 					     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-void 
+void
 Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr request_info,
 					   RTScheduling::Current::IdType_out guid_out,
 					   CORBA::String_out /*name*/,
@@ -176,52 +176,52 @@ Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInf
   ACE_THROW_SPEC ((CORBA::SystemException,
 		   PortableInterceptor::ForwardRequest))
 {
-  IOP::ServiceContext* serv_cxt = 
+  IOP::ServiceContext* serv_cxt =
     request_info->get_request_service_context (Server_Interceptor::SchedulingInfo
 					       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   if (serv_cxt != 0)
     {
       int gu_id;
       ACE_OS::memcpy (&gu_id,
 		      serv_cxt->context_data.get_buffer (),
 		      serv_cxt->context_data.length ());
-      
+
       char msg [BUFSIZ];
       ACE_OS::sprintf (msg,"The Guid is %d\n", gu_id);
       DT_TEST::instance ()->dt_creator ()->log_msg (msg);
-      
+
       RTScheduling::Current::IdType* guid;
       ACE_NEW (guid,
 	       RTScheduling::Current::IdType);
-      
-      
+
+
       // Generate GUID.
       guid->length (sizeof(long));
-      
+
       ACE_OS::memcpy (guid->get_buffer (),
 		      &gu_id,
 		      sizeof(long));
-      
+
       if (TAO_debug_level > 0)
 	ACE_DEBUG ((LM_DEBUG,
 		    "Receive request The Guid is %d\n",
 		    gu_id));
-      
+
       guid_out.ptr () = guid;
     }
 
 }
 
-void 
+void
 Fixed_Priority_Scheduler::send_reply (PortableInterceptor::ServerRequestInfo_ptr
                                       ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
-void 
+void
 Fixed_Priority_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo_ptr
                                           ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
@@ -229,7 +229,7 @@ Fixed_Priority_Scheduler::send_exception (PortableInterceptor::ServerRequestInfo
 {
 }
 
-void 
+void
 Fixed_Priority_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr
                                       ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
@@ -237,7 +237,7 @@ Fixed_Priority_Scheduler::send_other (PortableInterceptor::ServerRequestInfo_ptr
 {
 }
 
-void 
+void
 Fixed_Priority_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr
 				     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
@@ -245,14 +245,14 @@ Fixed_Priority_Scheduler::send_poll (PortableInterceptor::ClientRequestInfo_ptr
 {
 }
 
-void 
+void
 Fixed_Priority_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr
                                          ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
-    
-void 
+
+void
 Fixed_Priority_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr
                                              ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
@@ -260,50 +260,50 @@ Fixed_Priority_Scheduler::receive_exception (PortableInterceptor::ClientRequestI
 {
 }
 
-void 
+void
 Fixed_Priority_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr
                                          ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException,
 		   PortableInterceptor::ForwardRequest))
 {
 }
-    
-void 
+
+void
 Fixed_Priority_Scheduler::cancel (const RTScheduling::Current::IdType &
                                   ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
-CORBA::PolicyList* 
+CORBA::PolicyList*
 Fixed_Priority_Scheduler::scheduling_policies (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
-    
-void 
+
+void
 Fixed_Priority_Scheduler::scheduling_policies (const CORBA::PolicyList &
                                                ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
-      
-CORBA::PolicyList* 
+
+CORBA::PolicyList*
 Fixed_Priority_Scheduler::poa_policies (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
-    
-char * 
+
+char *
 Fixed_Priority_Scheduler::scheduling_discipline_name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
 }
-    
-RTScheduling::ResourceManager_ptr 
+
+RTScheduling::ResourceManager_ptr
 Fixed_Priority_Scheduler::create_resource_manager (const char *,
                                                    CORBA::Policy_ptr
                                                    ACE_ENV_ARG_DECL_NOT_USED)
@@ -311,8 +311,8 @@ Fixed_Priority_Scheduler::create_resource_manager (const char *,
 {
   return 0;
 }
-    
-void 
+
+void
 Fixed_Priority_Scheduler::set_scheduling_parameter (PortableServer::Servant &,
                                                     const char *,
                                                     CORBA::Policy_ptr
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
index 16d15ab8021..08cccbfbab9 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.cpp
@@ -55,11 +55,11 @@ MIF_Scheduler::MIF_Scheduler (CORBA::ORB_ptr orb)
         orb->resolve_initial_references ("RTScheduler_Current"
                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       this->current_ =
         RTScheduling::Current::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       wait_ = 0;
     }
   ACE_CATCHANY
@@ -113,7 +113,7 @@ MIF_Scheduler::create_segment_scheduling_parameter (CORBA::Short importance
                     Segment_Sched_Param_Policy,
                     CORBA::NO_MEMORY (
 				      CORBA::SystemException::_tao_minor_code (
-				       TAO_DEFAULT_MINOR_CODE,
+               TAO::VMCID,
 				       ENOMEM),
 				      CORBA::COMPLETED_NO));
 
@@ -331,7 +331,7 @@ MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_
       ACE_Thread::self (current);
       if (ACE_Thread::getprio (current, priority) == -1)
 	return;
-      
+
       ACE_DEBUG ((LM_DEBUG,
 		  "Initial thread priority is %d %d\n",
 		  priority,
@@ -348,8 +348,8 @@ MIF_Scheduler::send_request (PortableInterceptor::ClientRequestInfo_ptr request_
       ACE_DEBUG ((LM_DEBUG,
 		  "Bumped thread priority is %d\n",
 		  priority));
-      
-      
+
+
       DT* run_dt;
       ACE_Message_Block* msg;
       ready_que_.dequeue_head (msg);
@@ -379,10 +379,10 @@ MIF_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr reque
     request_info->get_request_service_context (Server_Interceptor::SchedulingInfo);
 
   if (serv_cxt != 0)
-    { 
+    {
       ACE_DEBUG ((LM_DEBUG,
 		  "Got scheduling info\n"));
-      
+
       RTScheduling::Current::IdType* guid;
       ACE_NEW (guid,
 	       RTScheduling::Current::IdType);
@@ -570,7 +570,7 @@ MIF_Scheduler::receive_reply (PortableInterceptor::ClientRequestInfo_ptr
   ACE_Thread::self (current);
   if (ACE_Thread::getprio (current, priority) == -1)
     return;
-  
+
   current_->the_priority (priority - 1
 			  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -610,13 +610,13 @@ MIF_Scheduler::receive_exception (PortableInterceptor::ClientRequestInfo_ptr
 
   lock_.acquire ();
   ready_que_.enqueue_prio (new_dt);
-  
+
   int priority;
   ACE_hthread_t current;
   ACE_Thread::self (current);
   if (ACE_Thread::getprio (current, priority) == -1)
     return;
-  
+
   current_->the_priority (priority - 1
 			  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -662,7 +662,7 @@ MIF_Scheduler::receive_other (PortableInterceptor::ClientRequestInfo_ptr
   ACE_Thread::self (current);
   if (ACE_Thread::getprio (current, priority) == -1)
     return;
-  
+
   current_->the_priority (priority - 1
 			  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
diff --git a/TAO/examples/Simple/Simple_util.h b/TAO/examples/Simple/Simple_util.h
index 543f6dca5e0..d2c00aa066e 100644
--- a/TAO/examples/Simple/Simple_util.h
+++ b/TAO/examples/Simple/Simple_util.h
@@ -19,7 +19,7 @@
 #ifndef TAO_UTIL_H
 #define TAO_UTIL_H
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/Naming/Naming_Server.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/examples/Simple/bank/AccountManager_i.cpp b/TAO/examples/Simple/bank/AccountManager_i.cpp
index e4085e59f6c..13e605ef568 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.cpp
+++ b/TAO/examples/Simple/bank/AccountManager_i.cpp
@@ -3,6 +3,7 @@
 #include "AccountManager_i.h"
 #include "Account_i.h"
 #include "tao/debug.h"
+#include "tao/Utils/ORB_Manager.h"
 
 ACE_RCSID(AccountManager, AccountManager_i, "$Id$")
 
diff --git a/TAO/examples/Simple/bank/AccountManager_i.h b/TAO/examples/Simple/bank/AccountManager_i.h
index 55e39733d18..21321e449c3 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.h
+++ b/TAO/examples/Simple/bank/AccountManager_i.h
@@ -27,7 +27,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "Account_i.h"
-#include "tao/PortableServer/ORB_Manager.h"
 
 #include "ace/Hash_Map_Manager.h"
 #include "ace/OS.h"
@@ -35,6 +34,8 @@
 #include "ace/SString.h"
 #include "ace/Null_Mutex.h"
 
+class TAO_ORB_Manager;
+
 class AccountManager_i : public POA_Bank::AccountManager
 {
   // = TITLE
@@ -87,9 +88,6 @@ private:
   PortableServer::POA_ptr poa_;
   // POA pointer.
 
-  //TAO_ORB_Manager orb_manager_;
-  // The ORB manager.
-
   ACE_Hash_Map_Manager<ACE_CString,
                        Account_i *,
                        ACE_Null_Mutex> hash_map_;
diff --git a/TAO/examples/Simple/bank/bank.mpc b/TAO/examples/Simple/bank/bank.mpc
index 600979a6a74..908b6de0262 100644
--- a/TAO/examples/Simple/bank/bank.mpc
+++ b/TAO/examples/Simple/bank/bank.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): namingexe, naming_serv {
+project(*server): namingexe, naming_serv, utils {
   Source_Files {
     Account_i.cpp
     AccountManager_i.cpp
@@ -10,7 +10,7 @@ project(*server): namingexe, naming_serv {
   }
 }
 
-project(*client): namingexe, naming_serv {
+project(*client): namingexe, naming_serv, utils {
   exename = client
 
   Source_Files {
diff --git a/TAO/examples/Simple/chat/Broadcaster_i.h b/TAO/examples/Simple/chat/Broadcaster_i.h
index cbe7272ad33..666f8ab66c7 100644
--- a/TAO/examples/Simple/chat/Broadcaster_i.h
+++ b/TAO/examples/Simple/chat/Broadcaster_i.h
@@ -22,7 +22,7 @@
 
 #include "BroadcasterS.h"
 #include "ReceiverC.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "ace/Containers.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/examples/Simple/chat/Client_i.h b/TAO/examples/Simple/chat/Client_i.h
index a5f0535b7b8..b42c0514823 100644
--- a/TAO/examples/Simple/chat/Client_i.h
+++ b/TAO/examples/Simple/chat/Client_i.h
@@ -31,7 +31,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 
 class Client_i : public ACE_Event_Handler
 {
diff --git a/TAO/examples/Simple/chat/Server_i.h b/TAO/examples/Simple/chat/Server_i.h
index 9214585fea1..03fdd200b37 100644
--- a/TAO/examples/Simple/chat/Server_i.h
+++ b/TAO/examples/Simple/chat/Server_i.h
@@ -22,7 +22,7 @@
 #define SERVER_I_H
 
 #include "Broadcaster_i.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 
 class Server_i
 {
diff --git a/TAO/examples/Simple/chat/chat.mpc b/TAO/examples/Simple/chat/chat.mpc
index ff927cbff1f..d5a6f5699f6 100644
--- a/TAO/examples/Simple/chat/chat.mpc
+++ b/TAO/examples/Simple/chat/chat.mpc
@@ -1,10 +1,10 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server) : taoexe, portableserver, iortable {
+project(*server) : taoserver, utils, iortable {
   IDL_Files {
     Receiver.idl
-    Broadcaster.idl 
+    Broadcaster.idl
   }
   Source_Files {
     Broadcaster_i.cpp
@@ -13,7 +13,7 @@ project(*server) : taoexe, portableserver, iortable {
   }
 }
 
-project(*client): taoexe, portableserver {
+project(*client): taoexe, portableserver, utils {
   IDL_Files {
     Receiver.idl
     Broadcaster.idl
diff --git a/TAO/examples/Simple/echo/echo.mpc b/TAO/examples/Simple/echo/echo.mpc
index 737aaab2d22..6bb4e4dc783 100644
--- a/TAO/examples/Simple/echo/echo.mpc
+++ b/TAO/examples/Simple/echo/echo.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): namingexe, naming_serv {
+project(*server): namingexe, naming_serv, utils {
   Source_Files {
     Echo_i.cpp
     ../Simple_util.cpp
@@ -9,7 +9,7 @@ project(*server): namingexe, naming_serv {
   }
 }
 
-project(*client): namingexe, naming_serv {
+project(*client): namingexe, naming_serv, utils {
   exename = client
 
   Source_Files {
diff --git a/TAO/examples/Simple/grid/grid.mpc b/TAO/examples/Simple/grid/grid.mpc
index 32af3e12220..b94387ec91b 100644
--- a/TAO/examples/Simple/grid/grid.mpc
+++ b/TAO/examples/Simple/grid/grid.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): namingexe, naming_serv {
+project(*server): namingexe, naming_serv, utils {
   Source_Files {
     Grid_i.cpp
     server.cpp
@@ -9,7 +9,7 @@ project(*server): namingexe, naming_serv {
   }
 }
 
-project(*client): namingexe, naming_serv {
+project(*client): namingexe, naming_serv, utils {
   exename = client
 
   Source_Files {
diff --git a/TAO/examples/Simple/time/time.mpc b/TAO/examples/Simple/time/time.mpc
index bab89530e80..176bc335f8d 100644
--- a/TAO/examples/Simple/time/time.mpc
+++ b/TAO/examples/Simple/time/time.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): namingexe, naming_serv {
+project(*server): namingexe, naming_serv, utils {
   Source_Files {
     Time_i.cpp
     server.cpp
@@ -9,7 +9,7 @@ project(*server): namingexe, naming_serv {
   }
 }
 
-project(*client): namingexe, naming_serv {
+project(*client): namingexe, naming_serv, utils {
   exename = client
 
   Source_Files {
diff --git a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
index e95c8c82581..6e4bebb7597 100644
--- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
@@ -30,15 +30,15 @@
 #include "orbsvcs/Runtime_Scheduler.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "tao/ORB_Core.h"
 
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID (Event_Supplier, 
-           DualEC_Sup, 
+ACE_RCSID (Event_Supplier,
+           DualEC_Sup,
            "$Id$")
 
 static const char usage [] =
@@ -699,7 +699,7 @@ DualEC_Supplier::compute_schedules (void)
                                              ACE_SCOPE_THREAD),
              ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
-             infos_out_hi, deps_out_hi, 
+             infos_out_hi, deps_out_hi,
              configs_out_hi, anomalies_out_hi ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
@@ -712,7 +712,7 @@ DualEC_Supplier::compute_schedules (void)
                                              ACE_SCOPE_THREAD),
              ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
-             infos_out_lo, deps_out_lo, 
+             infos_out_lo, deps_out_lo,
              configs_out_lo, anomalies_out_lo ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
@@ -734,7 +734,7 @@ DualEC_Supplier::compute_schedules (void)
                                              ACE_SCOPE_THREAD),
              ACE_Sched_Params::priority_max (ACE_SCHED_FIFO,
                                              ACE_SCOPE_THREAD),
-             this->infos_lo_.out (), 
+             this->infos_lo_.out (),
              this->deps_hi_.out (),
              this->configs_lo_.out (),
              this->anomalies_lo_.out () ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
index 792eba220c4..834f47ccb98 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
@@ -25,7 +25,7 @@
 #include "orbsvcs/Scheduler_Factory.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
@@ -35,8 +35,8 @@
 
 #include "ace/os_include/os_ctype.h"
 
-ACE_RCSID (Event_Supplier, 
-           Event_Sup, 
+ACE_RCSID (Event_Supplier,
+           Event_Sup,
            "$Id$")
 
 static const char usage [] =
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc b/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc
index bb4348b6d0c..0deff2e4ad1 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(*Event_Sup): rtoldevent, namingexe {
+project(*Event_Sup): rtoldevent, namingexe, utils {
   exename = Event_Sup
   idlflags += -I$(TAO_ROOT)/orbsvcs/orbsvcs
   includes += $(TAO_ROOT)/orbsvcs/orbsvcs $(TAO_ROOT)/orbsvcs
@@ -28,7 +28,7 @@ project(*Event_Con): rtoldevent, namingexe {
   }
 }
 
-project(*Logging_Sup): rtoldevent, namingexe {
+project(*Logging_Sup): rtoldevent, namingexe, utils {
   exename = Logging_Sup
   idlflags += -I$(TAO_ROOT)/orbsvcs/orbsvcs
   includes += $(TAO_ROOT)/orbsvcs/orbsvcs $(TAO_ROOT)/orbsvcs
@@ -43,7 +43,7 @@ project(*Logging_Sup): rtoldevent, namingexe {
   }
 }
 
-project(*DualEC_Sup): rtoldevent, namingexe {
+project(*DualEC_Sup): rtoldevent, namingexe, utils {
   exename = DualEC_Sup
   idlflags += -I$(TAO_ROOT)/orbsvcs/orbsvcs
   includes += $(TAO_ROOT)/orbsvcs/orbsvcs $(TAO_ROOT)/orbsvcs
diff --git a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
index a9df0f2e9b2..02335e137ff 100644
--- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
@@ -29,7 +29,7 @@
 #include "orbsvcs/Scheduler_Factory.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
@@ -39,8 +39,8 @@
 
 #include "ace/os_include/os_ctype.h"
 
-ACE_RCSID (Event_Supplier, 
-           Logging_Sup, 
+ACE_RCSID (Event_Supplier,
+           Logging_Sup,
            "$Id$")
 
 static const char usage [] =
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
index 133b1c752e8..1949fe51117 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
@@ -27,7 +27,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Log_Msg.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "orbsvcs/Concurrency/Concurrency_Utils.h"
 #include "orbsvcs/Naming/Naming_Server.h"
 
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
index 1287013fe4b..896ea1a4f60 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, core, concurrency, naming_serv {
+project : orbsvcsexe, core, concurrency, naming_serv, utils {
   exename  = Concurrency_Service
 }
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
index b0e7514c829..ee22bd331d4 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
@@ -407,7 +407,7 @@ TAO::FT_ReplicationManager::register_fault_notifier_i (
     ));
     ACE_THROW (CORBA::BAD_PARAM (
       CORBA::SystemException::_tao_minor_code (
-        TAO_DEFAULT_MINOR_CODE,
+        TAO::VMCID,
         EINVAL),
       CORBA::COMPLETED_NO));
   }
@@ -473,7 +473,7 @@ TAO::FT_ReplicationManager::register_fault_notifier_i (
 
     ACE_THROW (CORBA::INTERNAL (
       CORBA::SystemException::_tao_minor_code (
-        TAO_DEFAULT_MINOR_CODE,
+        TAO::VMCID,
         EINVAL),
       CORBA::COMPLETED_NO));
   }
@@ -1035,7 +1035,7 @@ TAO::FT_ReplicationManager::create_object (
                     PortableGroup::GenericFactory::FactoryCreationId,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.h b/TAO/orbsvcs/IFR_Service/IFR_Service.h
index 566eec1207a..3a49f16968c 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.h
@@ -16,7 +16,7 @@
 #ifndef IFR_SERVICE_H
 #define IFR_SERVICE_H
 
-#include "tao/PortableServer/PortableServerC.h"
+#include "tao/PortableServer/PortableServer.h"
 #include "orbsvcs/IFRService/IFR_Service_Utils.h"
 #include "tao/ORB.h"
 
@@ -24,43 +24,43 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+/**
+ * @class IFR_Service
+ *
+ * A class that initializes, runs and shuts down
+ * the Interface Repository service.
+ */
 class IFR_Service
 {
-  // = TITLE
-  //    IFR_Service
-  //
-  // = DESCRIPTION
-  //    A class that initializes, runs and shuts down
-  //    the Interface Repository service.
 public:
 
+  /// Default constructor.
   IFR_Service (void);
-  // Default constructor.
 
+  /// Destructor
   ~IFR_Service (void);
-  // Destructor
 
+  /// Initialize the IFR service.
   int init (int argc,
             char *argv[]
             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-  // Initialize the IFR service.
 
+  /// Shut down the IFR Service.
   int fini (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  // Shut down the IFR Service.
-  
+
+  /// Run the IFR service.
   int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  // Run the IFR service.
 
 protected:
-  
+
+  /// Reference to our ORB.
   CORBA::ORB_var orb_;
-  // Reference to our ORB.
 
+  /// Root POA reference.
   PortableServer::POA_var root_poa_;
-  // Root POA reference.
 
+  /// IFR Server instance.
   TAO_IFR_Server my_ifr_server_;
-  // IFR Server instance.
 };
 
 #endif /* IFR_SERVICE_H */
diff --git a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h
index f629595b5c3..8e2d0ed52f3 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.h
@@ -14,7 +14,9 @@
 #ifndef IMR_ADAPTER_ACTIVATOR_H
 #define IMR_ADAPTER_ACTIVATOR_H
 
-#include "tao/PortableServer/PortableServerC.h"
+#include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/AdapterActivatorC.h"
+#include "tao/PortableServer/ServantLocatorC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
index 73d9ad0c420..afb2d49cf3e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.cpp
@@ -18,7 +18,8 @@
 #include "tao/Object_KeyC.h"
 #include "tao/ORB_Constants.h"
 
-#include "tao/PortableServer/Object_Adapter.h"
+#include "tao/PortableServer/POA_Current.h"
+#include "tao/PortableServer/POA_Current_Impl.h"
 
 /**
 * This constructor takes in orb and ImR_Locator_i pointers to store for later
@@ -84,7 +85,7 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
     ACE_TRY_CHECK;
 
     ACE_CString ior = pior.in();
- 
+
     // Check that the returned ior is the expected partial ior with
     // missing ObjectKey.
     if (ior.find("corbaloc:") != 0 || ior[ior.length() - 1] != '/')
@@ -94,17 +95,18 @@ ImR_Forwarder::preinvoke (const PortableServer::ObjectId &,
         CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
         CORBA::COMPLETED_NO));
     }
- 
+
     CORBA::String_var key_str;
     // Unlike POA Current, this implementation cannot be cached.
-    TAO_POA_Current* tao_current =
-      dynamic_cast<TAO_POA_Current*> (this->poa_current_var_.in ());
+    TAO::Portable_Server::POA_Current* tao_current =
+      dynamic_cast <TAO::Portable_Server::POA_Current*> (this->poa_current_var_.in ());
+
     ACE_ASSERT(tao_current != 0);
-    TAO_POA_Current_Impl* impl = tao_current->implementation ();
+    TAO::Portable_Server::POA_Current_Impl* impl = tao_current->implementation ();
     TAO::ObjectKey::encode_sequence_to_string (key_str.out(), impl->object_key ());
- 
+
     ior += key_str.in();
- 
+
     forward_obj =
       this->orb_->string_to_object (ior.c_str () ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (0);
diff --git a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h
index 2236f1cf7ff..ef5a8f2a8b6 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Forwarder.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Forwarder.h
@@ -15,7 +15,9 @@
 #ifndef IMR_FORWARDER_H
 #define IMR_FORWARDER_H
 
-#include "tao/PortableServer/PortableServerC.h"
+#include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/ServantLocatorC.h"
+#include "tao/PortableServer/PS_CurrentC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.idl b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.idl
index b3886b8952e..c3e333d3f57 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.idl
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator.idl
@@ -2,7 +2,7 @@
 
 // $Id$
 
-#include "tao/PortableServer/ImplRepo.pidl"
+#include "tao/ImR_Client/ImplRepo.pidl"
 
 module ImplementationRepository
 {
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
index 1a59d3efab3..6cadc6e7623 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -7,7 +7,7 @@
 #include "orbsvcs/Time_Utilities.h"
 
 #include "tao/IORTable/IORTable.h"
-#include "tao/PortableServer/POA.h"
+#include "tao/PortableServer/PortableServer.h"
 #include "tao/ORB_Core.h"
 #include "tao/default_ports.h"
 #include "tao/Messaging/Messaging.h"
@@ -393,7 +393,7 @@ ACE_THROW_SPEC ((CORBA::SystemException,
   {
     info.reset();
   }
- 
+
   while(true)
   {
     if (is_alive(info))
@@ -636,7 +636,7 @@ ImR_Locator_i::register_server_i (const char* server,
         server, info->activator.c_str()));
       ACE_THROW (ImplementationRepository::AlreadyRegistered());
     }
- 
+
     if (this->debug_ > 0)
       ACE_DEBUG((LM_DEBUG, "ImR Locator: Updating server <%s>.\n", server));
 
@@ -821,7 +821,7 @@ ImR_Locator_i::server_is_running (const char* name,
     // allocated on the heap here, but is deleted within the
     // handle_timeout() call.
     Status_Changed_Timer* sct;
-    ACE_NEW_THROW_EX (sct, 
+    ACE_NEW_THROW_EX (sct,
                       Status_Changed_Timer (this, info),
                       CORBA::NO_MEMORY ());
 
@@ -1109,7 +1109,7 @@ ImR_Locator_i::is_alive(Server_Info& info)
     // This is evil, but there's not much else we can do for now. We should never
     // reach this code once the ImR Servers are fixed so that they don't lie about
     // server_is_running. Currently, they send this notification during poa creation.
-    // We have to run the orb, because the very thing that may be slowing the 
+    // We have to run the orb, because the very thing that may be slowing the
     // aliveness of the servers is the fact that they're trying to register more
     // objects with us.
     ACE_Time_Value tv = IS_ALIVE_RETRY_INTERVAL;
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
index 30218651d5b..75d9ac4a2c6 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_Service.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(ImR_Activator_IDL) : orbsvcslib, portableserver, messaging {
+project(ImR_Activator_IDL) : orbsvcslib, portableserver, messaging, imr_client {
   sharedname = TAO_ImR_Activator_IDL
   dynamicflags = ACTIVATOR_IDL_BUILD_DLL
   idlflags += -GH -Wb,export_macro=ActivatorIDL_Export -Wb,export_include=activator_idl_export.h
@@ -16,7 +16,7 @@ project(ImR_Activator_IDL) : orbsvcslib, portableserver, messaging {
   }
 }
 
-project(ImR_Locator_IDL) : orbsvcslib, valuetype, portableserver {
+project(ImR_Locator_IDL) : orbsvcslib, valuetype, portableserver, imr_client {
   sharedname   = TAO_ImR_Locator_IDL
   after       += ImR_Activator_IDL
   libs        += TAO_ImR_Activator_IDL
@@ -37,7 +37,7 @@ project(ImR_Locator_IDL) : orbsvcslib, valuetype, portableserver {
   }
 }
 
-project(ImR_Activator) : orbsvcslib, core, acexml, minimum_corba, valuetype, portableserver {
+project(ImR_Activator) : orbsvcslib, core, acexml, minimum_corba, valuetype, portableserver, imr_client {
   sharedname   = TAO_ImR_Activator
   dynamicflags = ACTIVATOR_BUILD_DLL
   after       += ImR_Activator_IDL ImR_Locator_IDL
@@ -57,7 +57,7 @@ project(ImR_Activator) : orbsvcslib, core, acexml, minimum_corba, valuetype, por
   }
 }
 
-project(ImR_Locator) : orbsvcslib, core, minimum_corba, iortable, portableserver, messaging, svc_utils, acexml {
+project(ImR_Locator) : orbsvcslib, core, minimum_corba, iortable, portableserver, messaging, svc_utils, acexml, imr_client {
   sharedname   = TAO_ImR_Locator
   dynamicflags = LOCATOR_BUILD_DLL
   after       += ImR_Locator_IDL ImR_Activator_IDL
@@ -83,7 +83,7 @@ project(ImR_Locator) : orbsvcslib, core, minimum_corba, iortable, portableserver
   }
 }
 
-project(ImR_Locator_Service) : orbsvcsexe, core, minimum_corba, iortable, messaging, acexml ,svc_utils {
+project(ImR_Locator_Service) : orbsvcsexe, core, minimum_corba, iortable, messaging, acexml ,svc_utils, imr_client {
   exename  = ImplRepo_Service
   after   += ImR_Locator ImR_Activator_IDL ImR_Locator_IDL
   libs    += TAO_ImR_Locator TAO_ImR_Activator_IDL TAO_ImR_Locator_IDL
@@ -106,7 +106,7 @@ project(ImR_Locator_Service) : orbsvcsexe, core, minimum_corba, iortable, messag
 }
 
 
-project(ImR_Activator_Service) : orbsvcsexe, core, acexml, minimum_corba, messaging, svc_utils {
+project(ImR_Activator_Service) : orbsvcsexe, core, acexml, minimum_corba, messaging, svc_utils, imr_client {
   exename  = ImR_Activator
   after   += ImR_Activator ImR_Activator_IDL ImR_Locator_IDL
   libs    += TAO_ImR_Activator TAO_ImR_Activator_IDL TAO_ImR_Locator_IDL
@@ -119,7 +119,7 @@ project(ImR_Activator_Service) : orbsvcsexe, core, acexml, minimum_corba, messag
 }
 
 
-project(tao_imr) : orbsvcsexe, core, minimum_corba, portableserver {
+project(tao_imr) : orbsvcsexe, core, minimum_corba, portableserver, imr_client {
   exename  = tao_imr
   install  = $(ACE_ROOT)/bin
   Source_Files {
diff --git a/TAO/orbsvcs/ImplRepo_Service/Iterator.h b/TAO/orbsvcs/ImplRepo_Service/Iterator.h
index 40059bcd58f..9a8dc019eae 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Iterator.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Iterator.h
@@ -15,8 +15,8 @@
 #define IMR_ITERATOR_H
 
 #include "Locator_Repository.h"
-#include "tao/PortableServer/PortableServerC.h"
-#include "tao/PortableServer/ImplRepoS.h"
+#include "tao/PortableServer/PortableServer.h"
+#include "tao/ImR_Client/ImplRepoS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/ImplRepo_Service/Server_Info.h b/TAO/orbsvcs/ImplRepo_Service/Server_Info.h
index b6e451d9419..9380e364774 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.h
@@ -15,7 +15,7 @@
 
 #include "ace/Bound_Ptr.h"
 
-#include "tao/PortableServer/ImplRepoC.h"
+#include "tao/ImR_Client/ImplRepoC.h"
 
 #include "ace/SString.h"
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
index 99da29e20cd..c55ea3fe38c 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
@@ -2,7 +2,8 @@
 
 #include "tao_imr_i.h"
 
-#include "tao/PortableServer/POA.h"
+#include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/ForwardRequestC.h"
 
 #include "tao/Stub.h"
 #include "tao/Profile.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h
index 10573eeda31..f2fe1710355 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h
@@ -15,7 +15,7 @@
 #ifndef TAO_IMR_I_H
 #define TAO_IMR_I_H
 
-#include "tao/PortableServer/ImplRepoC.h"
+#include "tao/ImR_Client/ImplRepoC.h"
 #include "tao/corba.h"
 #include "ace/SString.h"
 #include "ace/Auto_Ptr.h"
diff --git a/TAO/orbsvcs/ImplRepo_Service/utils.h b/TAO/orbsvcs/ImplRepo_Service/utils.h
index 8007c51902a..cf28b14fb75 100644
--- a/TAO/orbsvcs/ImplRepo_Service/utils.h
+++ b/TAO/orbsvcs/ImplRepo_Service/utils.h
@@ -2,7 +2,7 @@
 #ifndef TAO_IMR_UTILS_H
 #define TAO_IMR_UTILS_H
 
-#include "tao/PortableServer/ImplRepoC.h"
+#include "tao/ImR_Client/ImplRepoC.h"
 
 #include "ace/SString.h"
 
@@ -12,7 +12,7 @@
 
 class ImR_Utils {
 public:
-  static ACE_CString activationModeToString(ImplementationRepository::ActivationMode mode) 
+  static ACE_CString activationModeToString(ImplementationRepository::ActivationMode mode)
   {
     switch (mode )
     {
@@ -29,7 +29,7 @@ public:
       return "";
     }
   }
-  static ImplementationRepository::ActivationMode parseActivationMode(const ACE_CString& s) 
+  static ImplementationRepository::ActivationMode parseActivationMode(const ACE_CString& s)
   {
     if (s == "NORMAL")
       return ImplementationRepository::NORMAL;
@@ -42,10 +42,10 @@ public:
 
     return ImplementationRepository::NORMAL;
   }
-  static ACE_CString envListToString(const ImplementationRepository::EnvironmentList& lst) 
+  static ACE_CString envListToString(const ImplementationRepository::EnvironmentList& lst)
   {
     ACE_CString ret;
-    for (CORBA::ULong n = 0; n < lst.length(); ++n) 
+    for (CORBA::ULong n = 0; n < lst.length(); ++n)
     {
       ret += "name=\"";
       ret += lst[n].name.in();
@@ -55,7 +55,7 @@ public:
     }
     return ret;
   }
-  static ImplementationRepository::EnvironmentList parseEnvList(const ACE_CString& s) 
+  static ImplementationRepository::EnvironmentList parseEnvList(const ACE_CString& s)
   {
     ImplementationRepository::EnvironmentList ret(10);
 
@@ -64,17 +64,17 @@ public:
     const ACE_CString ENDTAG = "\"";
 
     ssize_t i = 0;
-    
+
     for (CORBA::ULong idx = 0; ; ++idx)
     {
-      // find name 
+      // find name
       ssize_t j = s.find(NAMETAG, i);
       if (j == ACE_CString::npos) break;
       j += NAMETAG.length();
       ssize_t k = s.find(ENDTAG, j + 1);
       if (k == ACE_CString::npos) break;
       ACE_CString name = s.substr(j, k - j);
-      
+
       i = k + 1;
 
       // find value
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
index 636b1d99d03..35355e5368e 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.h
@@ -19,7 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "LifeCycle_Service_i.h"
 
 #ifndef LIFECYCLE_SERVICE_H
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
index 1375457f260..06eccfc1104 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, core, lifecycle, naming, trading_serv, minimum_corba {
+project : orbsvcsexe, core, lifecycle, naming, trading_serv, minimum_corba, utils {
   exename  = LifeCycle_Service
 }
diff --git a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
index f501af2db29..0c5d929232c 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
@@ -166,7 +166,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
                         TAO_LB_LoadManager,
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/LoadBalancer/Signal_Handler.h b/TAO/orbsvcs/LoadBalancer/Signal_Handler.h
index 8d7e65db10a..5e9e7c2dea2 100644
--- a/TAO/orbsvcs/LoadBalancer/Signal_Handler.h
+++ b/TAO/orbsvcs/LoadBalancer/Signal_Handler.h
@@ -21,10 +21,9 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/ORB.h"
-#include "tao/PortableServer/PortableServerC.h"
+#include "tao/PortableServer/PortableServer.h"
 #include "ace/Signal.h"
 
-
 /**
  * @class TAO_LB_Signal_Handler
  *
@@ -98,5 +97,4 @@ private:
 
 };
 
-
 #endif  /* TAO_LB_SIGNAL_HANDLER_H */
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.h b/TAO/orbsvcs/Naming_Service/Naming_Service.h
index b2326ebabab..2ad9cb1f7dd 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.h
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.h
@@ -20,7 +20,6 @@
 #ifndef TAO_NAMING_SERVICE_H
 #define TAO_NAMING_SERVICE_H
 
-#include "tao/PortableServer/ORB_Manager.h"
 #include "orbsvcs/Naming/Naming_Server.h"
 
 class TAO_Naming_Service
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h
index e76f5c63b15..3ffa5426945 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h
@@ -25,7 +25,7 @@
 #ifndef TAO_SCHEDULING_SERVICE_H
 #define TAO_SCHEDULING_SERVICE_H
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "orbsvcs/Sched/Reconfig_Scheduler.h"
 #if defined (TAO_USES_STRATEGY_SCHEDULER)
 #include "orbsvcs/Sched/Strategy_Scheduler.h"
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc
index 425c601b15d..d960fa1d23f 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, core, rtsched, naming, svc_utils, iortable, portableserver {
+project : orbsvcsexe, core, rtsched, naming, svc_utils, iortable, portableserver, utils {
   exename  = Scheduling_Service
 }
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.h b/TAO/orbsvcs/Time_Service/Clerk_i.h
index 78d4d7c61b0..30d226c8c15 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.h
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.h
@@ -19,7 +19,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/Log_Msg.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/Naming/Naming_Server.h"
 #include "orbsvcs/Time/TAO_Time_Service_Clerk.h"
diff --git a/TAO/orbsvcs/Time_Service/Server_i.h b/TAO/orbsvcs/Time_Service/Server_i.h
index 70660377faf..2e9505f5399 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.h
+++ b/TAO/orbsvcs/Time_Service/Server_i.h
@@ -19,7 +19,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/Log_Msg.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/Naming/Naming_Server.h"
 #include "orbsvcs/Time/TAO_Time_Service_Server.h"
diff --git a/TAO/orbsvcs/Time_Service/Time_Service.mpc b/TAO/orbsvcs/Time_Service/Time_Service.mpc
index 865cc01d9fc..f084b72995d 100644
--- a/TAO/orbsvcs/Time_Service/Time_Service.mpc
+++ b/TAO/orbsvcs/Time_Service/Time_Service.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(Time_Service_Server) : orbsvcsexe, core, time, naming_serv {
+project(Time_Service_Server) : orbsvcsexe, core, time, naming_serv, utils {
   exename  = Time_Service_Server
   Source_Files {
     Server_i.cpp
@@ -9,7 +9,7 @@ project(Time_Service_Server) : orbsvcsexe, core, time, naming_serv {
   }
 }
 
-project(Time_Service_Clerk) : orbsvcsexe, core, time, naming_serv {
+project(Time_Service_Clerk) : orbsvcsexe, core, time, naming_serv, utils {
   exename  = Time_Service_Clerk
   Source_Files {
     Clerk_i.cpp
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.h b/TAO/orbsvcs/Trading_Service/Trading_Service.h
index 55f5073f798..f793fc7b1d7 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.h
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.h
@@ -16,7 +16,6 @@
 #ifndef _TRADING_SERVICE_H
 #define _TRADING_SERVICE_H
 
-#include "tao/PortableServer/ORB_Manager.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Signal.h"
 
diff --git a/TAO/orbsvcs/Trading_Service/Trading_Service.mpc b/TAO/orbsvcs/Trading_Service/Trading_Service.mpc
index 46950125c54..884c05caf01 100644
--- a/TAO/orbsvcs/Trading_Service/Trading_Service.mpc
+++ b/TAO/orbsvcs/Trading_Service/Trading_Service.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, core, naming, trading_serv {
+project : orbsvcsexe, core, naming, trading_serv, utils {
   exename  = Trading_Service
 }
 
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp
index 7c9a7013075..2a7399a364d 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp
@@ -40,7 +40,7 @@ ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr info
                       ReplicaController (orb.in ()),
                       CORBA::NO_MEMORY (
                         CORBA::SystemException::_tao_minor_code (
-                          TAO_DEFAULT_MINOR_CODE,
+                          TAO::VMCID,
                           ENOMEM),
                       CORBA::COMPLETED_NO));
 
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
index ece15d8bcb8..bdd9174ad5c 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
@@ -471,7 +471,7 @@ namespace
                       FT::FTRequestServiceContext,
                       CORBA::NO_MEMORY (
                         CORBA::SystemException::_tao_minor_code (
-                          TAO_DEFAULT_MINOR_CODE,
+                          TAO::VMCID,
                           ENOMEM),
                         CORBA::COMPLETED_NO));
 
diff --git a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
index 8883013b75d..f6239df905c 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/ORBInitializer.cpp
@@ -37,7 +37,7 @@ ORBInitializer::post_init (
                     ServerRequestInterceptor,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
@@ -54,7 +54,7 @@ ORBInitializer::post_init (
                     TAO_LB_ServerRequestInterceptor (this->load_alert_),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
index 7a089b04d7e..431ebd7622f 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/RPS_Monitor.cpp
@@ -39,7 +39,7 @@ RPS_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL)
                     CosLoadBalancing::Location (this->location_),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
@@ -69,7 +69,7 @@ RPS_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
                     CosLoadBalancing::LoadList (1),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
@@ -79,7 +79,7 @@ RPS_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
   load_list->length (1);
 
   load_list[0].id = CosLoadBalancing::RequestsPerSecond;
-  
+
   // VC 7.1 gives a warning without an explicit cast.
   load_list[0].value =
     static_cast<CORBA::Float> (request_count / elapsed_time.msec () * 1000);
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_i.h b/TAO/orbsvcs/examples/ORT/Gateway_i.h
index 3d8adbae1d5..e2da612d297 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_i.h
+++ b/TAO/orbsvcs/examples/ORT/Gateway_i.h
@@ -18,9 +18,10 @@
 #define GATEWAY_I_H
 
 #include "tao/DynamicInterface/DII_CORBA_methods.h"
-#include "tao/PortableServer/PortableServerC.h"
+#include "tao/PortableServer/PortableServer.h"
 #include "tao/DynamicInterface/Dynamic_Implementation.h"
 #include "tao/IFR_Client/IFR_Client_Adapter_Impl.h"
+#include "tao/PortableServer/PS_CurrentC.h"
 
 class Gateway_i
   : public virtual PortableServer::DynamicImplementation
diff --git a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
index 20ec718076c..32c4e9ce579 100644
--- a/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
+++ b/TAO/orbsvcs/examples/ORT/Object_Factory_i.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "Object_Factory_i.h"
-#include "tao/PortableServer/POA.h"
+#include "tao/PortableServer/Root_POA.h"
 
 Object_Factory_i::Object_Factory_i (CORBA::ORB_ptr orb,
                                     PortableServer::POA_ptr gateway_poa)
diff --git a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp
index 471b38d8515..93fd158c07b 100644
--- a/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp
+++ b/TAO/orbsvcs/examples/ORT/Server_IORInterceptor_ORBInitializer.cpp
@@ -46,7 +46,7 @@ Server_IORInterceptor_ORBInitializer::post_init (
                     Server_IORInterceptor (gateway_object_factory.in ()),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
index fc1dacd3ec2..4c223b52763 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -28,7 +28,6 @@
 #include "ace/Svc_Handler.h"
 #include "ace/SOCK_Acceptor.h"
 
-#include "tao/PortableServer/ORB_Manager.h"
 #include "orbsvcs/AV/AV_export.h"
 #include "orbsvcs/CosPropertyServiceS.h"
 #include "orbsvcs/AVStreamsS.h"
@@ -45,9 +44,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined (_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
+# pragma warning(push)
 # pragma warning (disable : 4250)
 #endif /* _MSC_VER */
 
@@ -1547,7 +1544,7 @@ public:
 
 #include "Flows_T.h"
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
index 0288bb565b3..61a55dd05d5 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
@@ -17,11 +17,11 @@
 #include /**/ "ace/pre.h"
 
 #include "AVStreams_i.h"
-#include "tao/PortableServer/ORB_Manager.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined (_MSC_VER)
+# pragma warning(push)
 # pragma warning (disable : 4250)
 #endif /* _MSC_VER */
 
@@ -174,5 +174,9 @@ protected:
 // Include the templates here.
 #include "Endpoint_Strategy_T.h"
 
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
 #include /**/ "ace/post.h"
 #endif /* TAO_AV_ENDPOINT_STRATEGY_H */
diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
index 997aed079b2..9886212697f 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
@@ -9,7 +9,6 @@
 
 #include "tao/debug.h"
 
-#include "tao/PortableServer/ORB_Manager.h"
 #include "ace/OS_NS_strings.h"
 
 #if !defined (__ACE_INLINE__)
@@ -37,7 +36,7 @@ TAO_FlowSpec_Entry::TAO_FlowSpec_Entry (void)
    local_sec_addr_ (0),
    num_local_sec_addrs_ (0),
    peer_sec_addr_ (0),
-   num_peer_sec_addrs_ (0),   
+   num_peer_sec_addrs_ (0),
    peer_control_addr_ (0),
    local_addr_ (0),
    local_control_addr_ (0),
@@ -77,7 +76,7 @@ TAO_FlowSpec_Entry::TAO_FlowSpec_Entry (const char *flowname,
    local_sec_addr_ (0),
    num_local_sec_addrs_ (0),
    peer_sec_addr_ (0),
-   num_peer_sec_addrs_ (0),   
+   num_peer_sec_addrs_ (0),
    peer_control_addr_ (0),
    local_addr_ (0),
    local_control_addr_ (0),
@@ -117,7 +116,7 @@ TAO_FlowSpec_Entry::TAO_FlowSpec_Entry (const char *flowname,
    local_sec_addr_ (0),
    num_local_sec_addrs_ (0),
    peer_sec_addr_ (0),
-   num_peer_sec_addrs_ (0),  
+   num_peer_sec_addrs_ (0),
    peer_control_addr_ (0),
    local_addr_ (0),
    local_control_addr_ (0),
@@ -243,11 +242,11 @@ TAO_FlowSpec_Entry::parse_address (const char *address,
   TAO_Tokenizer protocol_tokenizer (address,'=');
 
   this->carrier_protocol_ = protocol_tokenizer[0];
-  
+
   int result = this->set_protocol ();
   if (result < 0)
     return result;
-  
+
   if (protocol_tokenizer [1] != 0)
     {
       ACE_DEBUG ((LM_DEBUG,
@@ -260,11 +259,11 @@ TAO_FlowSpec_Entry::parse_address (const char *address,
 	  if (this->protocol_ == TAO_AV_Core::TAO_AV_SCTP_SEQ)
 	    {
 	      TAO_Tokenizer addr_token (protocol_tokenizer [1], ';');
-	      
+
 	      ACE_DEBUG ((LM_DEBUG,
 			  "Number of local sec addresses = %d\n",
 			  addr_token.num_tokens () - 1));
-	      
+
 	      if (addr_token.num_tokens () != 0)
 		{
 		  addr += addr_token [0];
@@ -281,7 +280,7 @@ TAO_FlowSpec_Entry::parse_address (const char *address,
 		}
 	    }
 	  else addr += protocol_tokenizer[1];
-	  
+
 
           switch (this->protocol_)
             {
@@ -355,7 +354,7 @@ TAO_FlowSpec_Entry::parse_address (const char *address,
 
 	  if (this->protocol_ == TAO_AV_Core::TAO_AV_SCTP_SEQ)
 	    {
-	      
+
 	      ACE_DEBUG ((LM_DEBUG,
 			  "Number of local sec addresses = %d\n",
 			  port_tokenizer.num_tokens () - 1));
@@ -554,35 +553,35 @@ TAO_Forward_FlowSpec_Entry::parse (const char *flowSpec_entry)
   if (tokenizer [TAO_AV_PEER_ADDR] != 0)
     {
       ACE_INET_Addr *addr = 0;
-                  
-      
+
+
       if (this->protocol_ == TAO_AV_Core::TAO_AV_SCTP_SEQ)
 	{
 	  TAO_Tokenizer addr_token (tokenizer [TAO_AV_PEER_ADDR], ';');
-	  
+
 	  ACE_DEBUG ((LM_DEBUG,
 		      "Number of peer sec addresses = %d\n",
 		      addr_token.num_tokens () - 1));
-	  
+
 	  if (addr_token.num_tokens () != 0)
 	    {
 	      ACE_NEW_RETURN (addr,
 			      ACE_INET_Addr (addr_token [0]),
 			      0);
-	      
+
 	      ACE_NEW_RETURN (peer_sec_addr_, char* [addr_token.num_tokens () - 1],-1);
 	      for (int j = 1; j <= addr_token.num_tokens () - 1; j++)
 		{
 		  ACE_DEBUG ((LM_DEBUG,
 			      "adding addresses to sequence %s\n",
 			      addr_token [j]));
-		  
+
 		  peer_sec_addr_ [j-1] =  CORBA::string_dup (addr_token [j]);
 		}
 	      num_peer_sec_addrs_ = addr_token.num_tokens () - 1;
 	    }
 	}
-      else  
+      else
 	{
 	  ACE_NEW_RETURN (addr,
 			  ACE_INET_Addr (tokenizer [TAO_AV_PEER_ADDR]),
@@ -595,13 +594,13 @@ TAO_Forward_FlowSpec_Entry::parse (const char *flowSpec_entry)
       ACE_DEBUG ((LM_DEBUG,
 		  "Peer Address %s \n",
 		  buf));
-      
-    }  
+
+    }
 
   if (tokenizer [TAO_AV_FLOW_PROTOCOL] != 0)
     if (this->parse_flow_protocol_string (tokenizer [TAO_AV_FLOW_PROTOCOL]) < 0)
       return -1;
-  
+
   return 0;
 }
 
@@ -629,7 +628,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void)
 {
   if (this->flowname_.length() == 0)
     return "";
-  
+
   char address [BUFSIZ];
   ACE_CString address_str;
   ACE_CString peer_address_str;
@@ -671,7 +670,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void)
 	      address_str += this->local_sec_addr_ [i];
 	    }
 	}
-      
+
     }
   else
     {
@@ -733,7 +732,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void)
 	    ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr*> (this->peer_addr_);
             inet_addr->addr_to_string (address,BUFSIZ);
 	    //inet_addr->get_host_name (address, BUFSIZ);
-	    
+
 	    //cstring += ACE_OS::itoa (address, BUFSIZ, inet_addr->get_port_number ());
 
           }
@@ -747,7 +746,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void)
 	  //peer_address_str = this->carrier_protocol_;
 	  //peer_address_str += "=";
 	  peer_address_str += cstring;
-	  
+
 	  if (this->protocol_ == TAO_AV_Core::TAO_AV_SCTP_SEQ)
 	    {
 	      for (int i = 0; i < this->num_peer_sec_addrs_; i++)
@@ -800,7 +799,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void)
   this->entry_ += this->flow_protocol_;
   this->entry_ += "\\";
   this->entry_ += address_str;
-  
+
   if (this->peer_addr_ != 0)
     {
       this->entry_ += "\\";
@@ -808,8 +807,8 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void)
     }
   else ACE_DEBUG ((LM_DEBUG,
 		   "No peer address specified\n"));
-  
-  if (TAO_debug_level > 0) 
+
+  if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,"Forward entry_to_string: entry = %s\n",this->entry_.c_str()));
 
   return this->entry_.c_str();
@@ -892,7 +891,7 @@ TAO_Reverse_FlowSpec_Entry::parse (const char *flowSpec_entry)
     ACE_DEBUG ((LM_DEBUG,
                 "TAO_Reverse_FlowSpec_Entry::parse %s\n",
                 flowSpec_entry));
-  
+
   if (tokenizer [TAO_AV_ADDRESS] != 0)
     if (this->parse_address (tokenizer [TAO_AV_ADDRESS], TAO_AV_Core::TAO_AV_BOTH) < 0)
       return -1;
diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.h b/TAO/orbsvcs/orbsvcs/AV/Policy.h
index 24fd3082914..222e50afd51 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Policy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Policy.h
@@ -17,7 +17,10 @@
 #include /**/ "ace/pre.h"
 
 #include "ace/Addr.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Basic_Types.h"
+#include "tao/CORBA_String.h"
+#include "tao/Sequence_T.h"
+#include "ace/Time_Value.h"
 #include "orbsvcs/AV/AV_export.h"
 
 struct TAO_AV_frame_info
@@ -93,6 +96,7 @@ protected:
 
 typedef TAO_Unbounded_Sequence<TAO_AV_Policy*> TAO_AV_PolicyList;
 
+class ACE_Message_Block;
 class TAO_AV_Protocol_Object;
 class TAO_AV_Transport;
 class TAO_AV_Flow_Handler;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
index 5f25b3fffd2..791fb2bce44 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
@@ -21,8 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/PortableServerC.h"
 #include "orbsvcs/CosEvent/event_serv_export.h"
+#include "tao/PortableServer/PortableServer.h"
 
 class TAO_CEC_EventChannel;
 class TAO_CEC_ProxyPushSupplier;
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
index 8ca9427e19e..ddd191c302a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.cpp
@@ -12,8 +12,8 @@
 
 #include "ace/OS_NS_errno.h"
 
-ACE_RCSID (CosEvent, 
-           CEC_Dispatching, 
+ACE_RCSID (CosEvent,
+           CEC_Dispatching,
            "$Id$")
 
 int
@@ -70,7 +70,7 @@ TAO_CEC_Dispatching_Task::push (TAO_CEC_ProxyPushSupplier *proxy,
   void* buf = this->allocator_->malloc (sizeof (TAO_CEC_Push_Command));
 
   if (buf == 0)
-    ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+    ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID,
                                  CORBA::COMPLETED_NO));
 
   ACE_Message_Block *mb =
@@ -93,7 +93,7 @@ TAO_CEC_Dispatching_Task::invoke (TAO_CEC_ProxyPushSupplier *proxy,
   void* buf = this->allocator_->malloc (sizeof (TAO_CEC_Invoke_Command));
 
   if (buf == 0)
-    ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+    ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID,
                                  CORBA::COMPLETED_NO));
 
   ACE_Message_Block *mb =
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
index 242c3cd2172..3463ad99f74 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
@@ -26,10 +26,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/PortableServerC.h"
 #include "tao/Objref_VarOut_T.h"
 
 #include "orbsvcs/CosEvent/event_serv_export.h"
+#include "tao/PortableServer/PortableServer.h"
 
 class TAO_CEC_EventChannel;
 class TAO_CEC_ProxyPushConsumer;
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
index e77afbb200c..86dbc908354 100644
--- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosTrading) : orbsvcslib, core {
+project(CosTrading) : orbsvcslib, core, utils {
   sharedname   = TAO_CosTrading
   dynamicflags = TAO_TRADING_BUILD_DLL
 
@@ -93,7 +93,7 @@ project(CosTrading_Skel) : orbsvcslib, core, trading, portableserver {
 }
 
 
-project(CosTrading_Serv) : orbsvcslib, core, trading_skel, dynamicany, svc_utils {
+project(CosTrading_Serv) : orbsvcslib, core, trading_skel, dynamicany, svc_utils, utils {
   sharedname   = TAO_CosTrading_Serv
   dynamicflags = TAO_TRADING_SERV_BUILD_DLL
   tagchecks   += Trader
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
index db1d0cef034..ec794142b7e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
@@ -10,8 +10,8 @@
 #include "EC_Dispatching_Task.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Event, 
-           EC_Dispatching, 
+ACE_RCSID (Event,
+           EC_Dispatching,
            "$Id$")
 
 int
@@ -77,7 +77,7 @@ TAO_EC_Dispatching_Task::push (TAO_EC_ProxyPushSupplier *proxy,
   void* buf = this->allocator_->malloc (sizeof (TAO_EC_Push_Command));
 
   if (buf == 0)
-    ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+    ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID,
                                  CORBA::COMPLETED_NO));
 
   ACE_Message_Block *mb =
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
index 69654539cc9..9cb09930bc6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
@@ -9,8 +9,8 @@
 #include "EC_Filter.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Event, 
-           EC_Filter, 
+ACE_RCSID (Event,
+           EC_Filter,
            "$Id$")
 
 TAO_EC_Filter::~TAO_EC_Filter (void)
@@ -46,7 +46,7 @@ TAO_EC_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info
                              ACE_ENV_ARG_DECL)
 {
   ACE_UNUSED_ARG (qos_info);
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
+  ACE_THROW (CORBA::NO_IMPLEMENT (TAO::VMCID,
                                   CORBA::COMPLETED_NO));
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
index 2ad2a374996..9d1d284ef0a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.cpp
@@ -18,8 +18,8 @@
 #include "EC_Kokyu_Dispatching.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (Event, 
-           EC_Kokyu_Dispatching, 
+ACE_RCSID (Event,
+           EC_Kokyu_Dispatching,
            "$Id$")
 
 TAO_EC_Kokyu_Dispatching::TAO_EC_Kokyu_Dispatching (TAO_EC_Event_Channel_Base *ec, int sched_policy, int sched_scope)
@@ -44,7 +44,7 @@ TAO_EC_Kokyu_Dispatching::activate (void)
 {
   if (!lanes_setup_)
     setup_lanes ();
-  
+
   this->dispatcher_->activate ();
 
   //ACE_DEBUG ((LM_DEBUG, "Kokyu dispatcher activated\n"));
@@ -94,7 +94,7 @@ TAO_EC_Kokyu_Dispatching::setup_lanes (void)
   attrs.sched_scope (disp_sched_scope_);
 
   // Create Kokyu::Dispatcher using factory
-  Kokyu::Dispatcher_Auto_Ptr 
+  Kokyu::Dispatcher_Auto_Ptr
     tmp(Kokyu::Dispatcher_Factory::create_dispatcher(attrs));
   this->dispatcher_ = tmp;
   this->lanes_setup_ = 1;
@@ -128,12 +128,12 @@ TAO_EC_Kokyu_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
 {
     if (this->dispatcher_.get () == 0)
         this->setup_lanes ();
-    
-    void* buf = 
+
+    void* buf =
       this->allocator_->malloc (sizeof (TAO_EC_Kokyu_Push_Command ));
 
     if (buf == 0)
-      ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+      ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID,
                                    CORBA::COMPLETED_NO));
 
   // Create Dispatch_Command
@@ -141,16 +141,16 @@ TAO_EC_Kokyu_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
     new (buf) TAO_EC_Kokyu_Push_Command (proxy,
                                          consumer,
                                          event, this->allocator_);
-    
-  /*    
+
+  /*
   TAO_EC_Kokyu_Push_Command *cmd =
     new TAO_EC_Kokyu_Push_Command (proxy,
                                    consumer,
                                  event, 0);
   */
-    
+
   // Convert TAO_EC_QOS_Info to QoSDescriptor
-  RtecScheduler::RT_Info *rt_info = 
+  RtecScheduler::RT_Info *rt_info =
     this->scheduler_->get(qos_info.rt_info);
 
   Kokyu::QoSDescriptor qosd;
@@ -158,7 +158,7 @@ TAO_EC_Kokyu_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
   qosd.deadline_ = rt_info->period;
   ORBSVCS_Time::TimeT_to_Time_Value (qosd.execution_time_,
                                      rt_info->worst_case_execution_time);
-  
+
   this->dispatcher_->dispatch(cmd,qosd);
 }
 
@@ -188,7 +188,7 @@ TAO_EC_Kokyu_Push_Command::execute ()
 
   ACE_TRY
     {
-      //ACE_DEBUG ((LM_DEBUG, 
+      //ACE_DEBUG ((LM_DEBUG,
       //            "(%t) Command object executed.\n"));
 
       this->proxy_->push_to_consumer (this->consumer_.in (),
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
index 8efb85c2d98..f9c0006b629 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
@@ -19,7 +19,7 @@
 
 #include /**/ "event_export.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
-#include "tao/PortableServer/PortableServerC.h"
+#include "tao/PortableServer/PortableServer.h"
 #include "tao/ORB.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
index c59cd08d228..270378879cc 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
@@ -12,7 +12,7 @@
 ACE_RCSID (FaultTolerance,
            FT_ClientORBInitializer,
            "$Id$")
-           
+
 void
 TAO_FT_ClientORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
@@ -59,7 +59,7 @@ TAO_FT_ClientORBInitializer::register_policy_factories (
                     TAO_FT_ClientPolicyFactory,
                     CORBA::NO_MEMORY (
                                       CORBA::SystemException::_tao_minor_code (
-                         TAO_DEFAULT_MINOR_CODE,
+                         TAO::VMCID,
                          ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
index 532b838dd79..822749dc676 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
@@ -37,7 +37,7 @@ TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val
   TAO_FT_Request_Duration_Policy *tmp;
   ACE_NEW_THROW_EX (tmp,
                     TAO_FT_Request_Duration_Policy (value),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
@@ -60,7 +60,7 @@ TAO_FT_Request_Duration_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_FT_Request_Duration_Policy* tmp;
   ACE_NEW_THROW_EX (tmp, TAO_FT_Request_Duration_Policy (*this),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
@@ -122,7 +122,7 @@ TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val
                     TAO_FT_Heart_Beat_Policy (value->heartbeat,
                                               value->heartbeat_interval,
                                               value->heartbeat_timeout),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
@@ -144,7 +144,7 @@ TAO_FT_Heart_Beat_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_FT_Heart_Beat_Policy * tmp;
   ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Policy (*this),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
index dfe0a842ff7..799d3cdff6a 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
@@ -155,7 +155,7 @@ namespace TAO
     if (!(icdr.read_string (rep_id.out ()) &&
           icdr.read_ulong (min) &&
           icdr.read_ulong (cs)))
-      ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
+      ACE_THROW (CORBA::MARSHAL (TAO::VMCID,
                                  CORBA::COMPLETED_MAYBE));
 
     cs = CORBA::CompletionStatus (cs);
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
index fb692cfe234..1060bbacfba 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
@@ -62,7 +62,7 @@ TAO_FT_ORBInitializer::register_policy_factories (
                     TAO_FT_PolicyFactory,
                     CORBA::NO_MEMORY (
                                       CORBA::SystemException::_tao_minor_code (
-                         TAO_DEFAULT_MINOR_CODE,
+                         TAO::VMCID,
                          ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
index 75b0e06d821..a99cc55c052 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
@@ -35,7 +35,7 @@ TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val
   TAO_FT_Request_Duration_Policy *tmp;
   ACE_NEW_THROW_EX (tmp,
                     TAO_FT_Request_Duration_Policy (value),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
@@ -58,7 +58,7 @@ TAO_FT_Request_Duration_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_FT_Request_Duration_Policy* tmp;
   ACE_NEW_THROW_EX (tmp, TAO_FT_Request_Duration_Policy (*this),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
@@ -120,7 +120,7 @@ TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val
                     TAO_FT_Heart_Beat_Policy (value->heartbeat,
                                               value->heartbeat_interval,
                                               value->heartbeat_timeout),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
@@ -142,7 +142,7 @@ TAO_FT_Heart_Beat_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_FT_Heart_Beat_Policy * tmp;
   ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Policy (*this),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
@@ -209,7 +209,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val
   TAO_FT_Heart_Beat_Enabled_Policy *tmp;
   ACE_NEW_THROW_EX (tmp,
                     TAO_FT_Heart_Beat_Enabled_Policy (value),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
@@ -230,7 +230,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_FT_Heart_Beat_Enabled_Policy * tmp;
   ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Enabled_Policy (*this),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
index 728f608a449..1696f69d90e 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
@@ -56,7 +56,7 @@ TAO_FT_ServerORBInitializer::register_policy_factories (
                     TAO_FT_ServerPolicyFactory,
                     CORBA::NO_MEMORY (
                                       CORBA::SystemException::_tao_minor_code (
-                         TAO_DEFAULT_MINOR_CODE,
+                         TAO::VMCID,
                          ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
index 3a6aae1b42a..4c4608608c9 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
@@ -32,7 +32,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val
   TAO_FT_Heart_Beat_Enabled_Policy *tmp;
   ACE_NEW_THROW_EX (tmp,
                     TAO_FT_Heart_Beat_Enabled_Policy (value),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
@@ -53,7 +53,7 @@ TAO_FT_Heart_Beat_Enabled_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_FT_Heart_Beat_Enabled_Policy * tmp;
   ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Enabled_Policy (*this),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
index 792633f19a1..0b3ad78e22e 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
@@ -169,7 +169,7 @@ namespace TAO
       {
         ACE_THROW (CORBA::TRANSIENT (
                        CORBA::SystemException::_tao_minor_code (
-                       TAO_DEFAULT_MINOR_CODE,
+                       TAO::VMCID,
                        EINVAL),
                        CORBA::COMPLETED_NO));
       }
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
index b347f95660d..d5cdd436cb0 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.cpp
@@ -61,7 +61,7 @@ namespace TAO_FTRT {
           FTRT_ClientORB_Initializer(transaction_depth),
           CORBA::NO_MEMORY (
           CORBA::SystemException::_tao_minor_code (
-          TAO_DEFAULT_MINOR_CODE,
+          TAO::VMCID,
           ENOMEM),
           CORBA::COMPLETED_NO));
         ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h
index 5cb5792d3c1..7dd61ba8316 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h
@@ -14,7 +14,7 @@
 #define AMI_REPLICATION_STRATEGY_H
 
 #include "ace/Task.h"
-#include "tao/PortableServer/PortableServerC.h"
+#include "tao/PortableServer/PortableServer.h"
 #include "orbsvcs/FTRT_GroupManagerC.h"
 #include "Replication_Strategy.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
index 2c54702549e..1e010ee35df 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
@@ -14,7 +14,7 @@
 #define GROUPINFOPUBLISHER_H
 
 #include "orbsvcs/FtRtecEventChannelAdminC.h"
-#include "tao/PortableServer/PortableServerC.h"
+#include "tao/PortableServer/PortableServer.h"
 #include "ace/Vector_T.h"
 #include "ace/Singleton.h"
 #include "ace/Synch.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
index 77d43f4d398..b835b0e4ab6 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
@@ -4,6 +4,7 @@
 #include "Update_Manager.h"
 #include "AMI_Primary_Replication_Strategy.h"
 #include "../Utils/resolve_init.h"
+#include "tao/PortableServer/PS_CurrentC.h"
 
 ACE_RCSID (EventChannel,
            UpdateableHandler,
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h
index 9de80b870c4..875ac649b29 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h
@@ -11,7 +11,7 @@
 //=============================================================================
 #ifndef CREATE_PERSISTENT_POA_H
 #define CREATE_PERSISTENT_POA_H
-#include "tao/PortableServer/PortableServerC.h"
+#include "tao/PortableServer/PortableServer.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
index ad2fba0b0f3..9db2b2cb14b 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
@@ -4,6 +4,7 @@
 #include "resolve_init.h"
 #include "orbsvcs/FtRtecEventCommS.h"
 #include "tao/ORB_Core.h"
+#include "tao/PortableServer/PS_CurrentC.h"
 
 ACE_RCSID (Utils,
            FTEC_Gateway,
@@ -144,7 +145,7 @@ FTEC_Gateway::FTEC_Gateway(CORBA::ORB_ptr orb, FtRtecEventChannelAdmin::EventCha
 : impl_(new FTEC_Gateway_Impl)
 {
   impl_->local_orb = CORBA::is_nil(orb);
-  if (!impl_->local_orb) 
+  if (!impl_->local_orb)
     impl_->orb = CORBA::ORB::_duplicate(orb);
   impl_->ftec = FtRtecEventChannelAdmin::EventChannel::_duplicate(ftec);
 }
@@ -291,7 +292,7 @@ void FTEC_Gateway::push(RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy_consu
                         const RtecEventComm::EventSet & data
                         ACE_ENV_ARG_DECL)
 {
-  PortableServer::ObjectId_var object_id = 
+  PortableServer::ObjectId_var object_id =
     impl_->poa->reference_to_id(proxy_consumer  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
   FtRtecEventComm::ObjectId** result;
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
index 4dc6c541936..3876219be61 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
@@ -366,7 +366,7 @@ TAO::HTIOP::Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
                     TAO::HTIOP::Profile (this->orb_core ()),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
index 5d6e1cf94dc..6cc0c041d50 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp
@@ -125,7 +125,7 @@ TAO::HTIOP::Profile::parse_string_i (const char *ior
       // No object key delimiter or no hostname specified.
       ACE_THROW (CORBA::INV_OBJREF
                  (CORBA::SystemException::_tao_minor_code
-                  (TAO_DEFAULT_MINOR_CODE,
+                  (TAO::VMCID,
                    EINVAL),
                   CORBA::COMPLETED_NO));
     }
@@ -140,7 +140,7 @@ TAO::HTIOP::Profile::parse_string_i (const char *ior
       // No hostname specified!  It is required by the spec.
       ACE_THROW (CORBA::INV_OBJREF
                  (CORBA::SystemException::_tao_minor_code
-                  (TAO_DEFAULT_MINOR_CODE,
+                  (TAO::VMCID,
                    EINVAL),
                   CORBA::COMPLETED_NO));
     }
@@ -194,7 +194,7 @@ TAO::HTIOP::Profile::parse_string_i (const char *ior
           // @@ What's the right exception to throw here?
           ACE_THROW (CORBA::INV_OBJREF
                      (CORBA::SystemException::_tao_minor_code
-                      (TAO_DEFAULT_MINOR_CODE,
+                      (TAO::VMCID,
                        EINVAL),
                       CORBA::COMPLETED_NO));
         }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
index 1bf55e161f7..e4a78651efe 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
@@ -29,12 +29,13 @@
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:609
 
-#ifndef _TAO_IDL_SERVER_IFR_BASES_CPP_
-#define _TAO_IDL_SERVER_IFR_BASES_CPP_
+#ifndef _TAO_IDL_ORIG_IFR_BASES_CPP_
+#define _TAO_IDL_ORIG_IFR_BASES_CPP_
 
 
 #include "IFR_BaseS.h"
-#include "tao/PortableServer/Object_Adapter.h"
+#include "tao/PortableServer/Servant_Upcall.h"
+#include "tao/PortableServer/ForwardRequestC.h"
 #include "tao/PortableServer/Operation_Table.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/ORB_Core.h"
@@ -71,20 +72,20 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:574
+  // be\be_visitor_arg_traits.cpp:624
 
 #if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_SS_)
 #define _CORBA_DEFINITIONKIND__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::DefinitionKind>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::DefinitionKind>
     : public
         Basic_Arg_Traits_T<
             CORBA::DefinitionKind
@@ -112,13 +113,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:612
+  // be\be_visitor_arg_traits.cpp:662
 
 #if !defined (_CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_SS_)
 #define _CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::Contained::Description>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::Contained::Description>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::Contained::Description,
@@ -165,13 +166,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_SS_)
 #define _CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::Container::DescriptionSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::Container::DescriptionSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::Container::DescriptionSeq,
@@ -320,13 +321,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_)
 #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::InterfaceDefSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::InterfaceDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDefSeq,
@@ -390,13 +391,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_SS_)
 #define _CORBA_VALUEDEFSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::ValueDefSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::ValueDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ValueDefSeq,
@@ -443,13 +444,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_SS_)
 #define _CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::AbstractInterfaceDefSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::AbstractInterfaceDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::AbstractInterfaceDefSeq,
@@ -496,13 +497,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_CONTAINEDSEQ__ARG_TRAITS_SS_)
 #define _CORBA_CONTAINEDSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::ContainedSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::ContainedSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ContainedSeq,
@@ -515,13 +516,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_SS_)
 #define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::StructMemberSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::StructMemberSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::StructMemberSeq,
@@ -534,13 +535,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_SS_)
 #define _CORBA_INITIALIZERSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::InitializerSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::InitializerSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InitializerSeq,
@@ -553,13 +554,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_SS_)
 #define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::ExtInitializerSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExtInitializerSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExtInitializerSeq,
@@ -572,13 +573,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_SS_)
 #define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::UnionMemberSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::UnionMemberSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::UnionMemberSeq,
@@ -591,13 +592,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_SS_)
 #define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::EnumMemberSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::EnumMemberSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::EnumMemberSeq,
@@ -625,7 +626,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_IRObject_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_IRObject_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_IRObject_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -737,7 +738,7 @@ class TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::IRObject *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -790,7 +791,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::IRObject *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -880,7 +881,7 @@ class TAO_ServerRequestInfo_CORBA_IRObject_destroy : public TAO_ServerRequestInf
 public:
   TAO_ServerRequestInfo_CORBA_IRObject_destroy (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::IRObject *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -930,7 +931,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_IRObject_destroy::TAO_ServerRequestInfo_CORBA_IRObject_destroy (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::IRObject *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -1055,7 +1056,7 @@ POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -1125,7 +1126,7 @@ POA_CORBA::_TAO_IRObject_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_IRObject_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -1256,9 +1257,9 @@ void POA_CORBA::IRObject::_get_def_kind_skel (
   ::CORBA::DefinitionKind _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -1391,9 +1392,9 @@ void POA_CORBA::IRObject::destroy_skel (
   
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -1501,7 +1502,7 @@ void POA_CORBA::IRObject::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::IRObject *_tao_impl =
-    (POA_CORBA::IRObject *) _tao_servant;
+    static_cast<POA_CORBA::IRObject *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -1531,7 +1532,7 @@ void POA_CORBA::IRObject::_non_existent_skel (
   )
 {
   POA_CORBA::IRObject *_tao_impl =
-    (POA_CORBA::IRObject *) _tao_servant;
+    static_cast<POA_CORBA::IRObject *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -1564,7 +1565,7 @@ void POA_CORBA::IRObject::_interface_skel (
     }
   
   POA_CORBA::IRObject *_tao_impl =
-    (POA_CORBA::IRObject *) _tao_servant;
+    static_cast<POA_CORBA::IRObject *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -1595,7 +1596,7 @@ void POA_CORBA::IRObject::_component_skel (
   )
 {
   POA_CORBA::IRObject *_tao_impl =
-    (POA_CORBA::IRObject *) _tao_object_reference;
+    static_cast<POA_CORBA::IRObject *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -1615,23 +1616,17 @@ CORBA::Boolean POA_CORBA::IRObject::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::IRObject::_downcast (
@@ -1659,7 +1654,7 @@ const char* POA_CORBA::IRObject::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::IRObject::_dispatch (
     TAO_ServerRequest &req,
@@ -1674,7 +1669,7 @@ void POA_CORBA::IRObject::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::IRObject *
 POA_CORBA::IRObject::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -1685,22 +1680,14 @@ POA_CORBA::IRObject::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -1727,7 +1714,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_Contained_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_Contained_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_Contained_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -1870,7 +1857,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_id_get : public TAO_ServerRequestInf
 public:
   TAO_ServerRequestInfo_CORBA_Contained_id_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Contained *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -1923,7 +1910,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Contained_id_get::TAO_ServerRequestInfo_CORBA_Contained_id_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Contained *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -2013,7 +2000,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_id_set : public TAO_ServerRequestInf
 public:
   TAO_ServerRequestInfo_CORBA_Contained_id_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Contained *tao_impl,
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2065,7 +2052,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Contained_id_set::TAO_ServerRequestInfo_CORBA_Contained_id_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Contained *tao_impl,
     const char * id
     ACE_ENV_ARG_DECL_NOT_USED
@@ -2154,7 +2141,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_name_get : public TAO_ServerRequestI
 public:
   TAO_ServerRequestInfo_CORBA_Contained_name_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Contained *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -2207,7 +2194,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Contained_name_get::TAO_ServerRequestInfo_CORBA_Contained_name_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Contained *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -2297,7 +2284,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_name_set : public TAO_ServerRequestI
 public:
   TAO_ServerRequestInfo_CORBA_Contained_name_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Contained *tao_impl,
       const char * name
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2349,7 +2336,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Contained_name_set::TAO_ServerRequestInfo_CORBA_Contained_name_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Contained *tao_impl,
     const char * name
     ACE_ENV_ARG_DECL_NOT_USED
@@ -2438,7 +2425,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_version_get : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_Contained_version_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Contained *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -2491,7 +2478,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Contained_version_get::TAO_ServerRequestInfo_CORBA_Contained_version_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Contained *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -2581,7 +2568,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_version_set : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_Contained_version_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Contained *tao_impl,
       const char * version
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2633,7 +2620,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Contained_version_set::TAO_ServerRequestInfo_CORBA_Contained_version_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Contained *tao_impl,
     const char * version
     ACE_ENV_ARG_DECL_NOT_USED
@@ -2722,7 +2709,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_defined_in_get : public TAO_ServerRe
 public:
   TAO_ServerRequestInfo_CORBA_Contained_defined_in_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Contained *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -2775,7 +2762,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::TAO_ServerRequestInfo_CORBA_Contained_defined_in_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Contained *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -2865,7 +2852,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get : public TAO_Serve
 public:
   TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Contained *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -2918,7 +2905,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Contained *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -3008,7 +2995,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get : public T
 public:
   TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Contained *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -3061,7 +3048,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Contained *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -3151,7 +3138,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_describe : public TAO_ServerRequestI
 public:
   TAO_ServerRequestInfo_CORBA_Contained_describe (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Contained *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -3204,7 +3191,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Contained_describe::TAO_ServerRequestInfo_CORBA_Contained_describe (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Contained *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -3294,7 +3281,7 @@ class TAO_ServerRequestInfo_CORBA_Contained_move : public TAO_ServerRequestInfo
 public:
   TAO_ServerRequestInfo_CORBA_Contained_move (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Contained *tao_impl,
       ::CORBA::Container_ptr new_container,
       const char * new_name,
@@ -3350,7 +3337,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Contained_move::TAO_ServerRequestInfo_CORBA_Contained_move (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Contained *tao_impl,
     ::CORBA::Container_ptr new_container,
     const char * new_name,
@@ -3497,7 +3484,7 @@ POA_CORBA::_TAO_Contained_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -3567,7 +3554,7 @@ POA_CORBA::_TAO_Contained_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_Contained_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -3936,9 +3923,9 @@ void POA_CORBA::Contained::_get_id_skel (
   CORBA::String_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -4082,9 +4069,9 @@ void POA_CORBA::Contained::_set_id_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -4200,9 +4187,9 @@ void POA_CORBA::Contained::_get_name_skel (
   CORBA::String_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -4346,9 +4333,9 @@ void POA_CORBA::Contained::_set_name_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -4464,9 +4451,9 @@ void POA_CORBA::Contained::_get_version_skel (
   CORBA::String_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -4610,9 +4597,9 @@ void POA_CORBA::Contained::_set_version_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -4728,9 +4715,9 @@ void POA_CORBA::Contained::_get_defined_in_skel (
   ::CORBA::Container_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -4863,9 +4850,9 @@ void POA_CORBA::Contained::_get_absolute_name_skel (
   CORBA::String_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -4998,9 +4985,9 @@ void POA_CORBA::Contained::_get_containing_repository_skel (
   ::CORBA::Repository_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -5133,9 +5120,9 @@ void POA_CORBA::Contained::describe_skel (
   ::CORBA::Contained::Description_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -5283,9 +5270,9 @@ void POA_CORBA::Contained::move_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -5404,7 +5391,7 @@ void POA_CORBA::Contained::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::Contained *_tao_impl =
-    (POA_CORBA::Contained *) _tao_servant;
+    static_cast<POA_CORBA::Contained *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -5434,7 +5421,7 @@ void POA_CORBA::Contained::_non_existent_skel (
   )
 {
   POA_CORBA::Contained *_tao_impl =
-    (POA_CORBA::Contained *) _tao_servant;
+    static_cast<POA_CORBA::Contained *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -5467,7 +5454,7 @@ void POA_CORBA::Contained::_interface_skel (
     }
   
   POA_CORBA::Contained *_tao_impl =
-    (POA_CORBA::Contained *) _tao_servant;
+    static_cast<POA_CORBA::Contained *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -5498,7 +5485,7 @@ void POA_CORBA::Contained::_component_skel (
   )
 {
   POA_CORBA::Contained *_tao_impl =
-    (POA_CORBA::Contained *) _tao_object_reference;
+    static_cast<POA_CORBA::Contained *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -5518,27 +5505,21 @@ CORBA::Boolean POA_CORBA::Contained::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::Contained::_downcast (
@@ -5572,7 +5553,7 @@ const char* POA_CORBA::Contained::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::Contained::_dispatch (
     TAO_ServerRequest &req,
@@ -5587,7 +5568,7 @@ void POA_CORBA::Contained::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::Contained *
 POA_CORBA::Contained::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -5598,22 +5579,14 @@ POA_CORBA::Contained::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -5640,7 +5613,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_Container_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_Container_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_Container_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -5790,7 +5763,7 @@ class TAO_ServerRequestInfo_CORBA_Container_lookup : public TAO_ServerRequestInf
 public:
   TAO_ServerRequestInfo_CORBA_Container_lookup (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Container *tao_impl,
       const char * search_name
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -5845,7 +5818,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Container_lookup::TAO_ServerRequestInfo_CORBA_Container_lookup (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Container *tao_impl,
     const char * search_name
     ACE_ENV_ARG_DECL_NOT_USED
@@ -5945,7 +5918,7 @@ class TAO_ServerRequestInfo_CORBA_Container_contents : public TAO_ServerRequestI
 public:
   TAO_ServerRequestInfo_CORBA_Container_contents (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Container *tao_impl,
       ::CORBA::DefinitionKind & limit_type,
       const ::CORBA::Boolean & exclude_inherited
@@ -6002,7 +5975,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Container_contents::TAO_ServerRequestInfo_CORBA_Container_contents (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Container *tao_impl,
     ::CORBA::DefinitionKind & limit_type,
     const ::CORBA::Boolean & exclude_inherited
@@ -6108,7 +6081,7 @@ class TAO_ServerRequestInfo_CORBA_Container_lookup_name : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_Container_lookup_name (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Container *tao_impl,
       const char * search_name,
       const ::CORBA::Long & levels_to_search,
@@ -6169,7 +6142,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Container_lookup_name::TAO_ServerRequestInfo_CORBA_Container_lookup_name (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Container *tao_impl,
     const char * search_name,
     const ::CORBA::Long & levels_to_search,
@@ -6287,7 +6260,7 @@ class TAO_ServerRequestInfo_CORBA_Container_describe_contents : public TAO_Serve
 public:
   TAO_ServerRequestInfo_CORBA_Container_describe_contents (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Container *tao_impl,
       ::CORBA::DefinitionKind & limit_type,
       const ::CORBA::Boolean & exclude_inherited,
@@ -6346,7 +6319,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Container_describe_contents::TAO_ServerRequestInfo_CORBA_Container_describe_contents (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Container *tao_impl,
     ::CORBA::DefinitionKind & limit_type,
     const ::CORBA::Boolean & exclude_inherited,
@@ -6458,7 +6431,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_module : public TAO_ServerReq
 public:
   TAO_ServerRequestInfo_CORBA_Container_create_module (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Container *tao_impl,
       const char * id,
       const char * name,
@@ -6517,7 +6490,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Container_create_module::TAO_ServerRequestInfo_CORBA_Container_create_module (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Container *tao_impl,
     const char * id,
     const char * name,
@@ -6629,7 +6602,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_constant : public TAO_ServerR
 public:
   TAO_ServerRequestInfo_CORBA_Container_create_constant (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Container *tao_impl,
       const char * id,
       const char * name,
@@ -6692,7 +6665,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Container_create_constant::TAO_ServerRequestInfo_CORBA_Container_create_constant (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Container *tao_impl,
     const char * id,
     const char * name,
@@ -6816,7 +6789,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_struct : public TAO_ServerReq
 public:
   TAO_ServerRequestInfo_CORBA_Container_create_struct (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Container *tao_impl,
       const char * id,
       const char * name,
@@ -6877,7 +6850,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Container_create_struct::TAO_ServerRequestInfo_CORBA_Container_create_struct (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Container *tao_impl,
     const char * id,
     const char * name,
@@ -6995,7 +6968,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_union : public TAO_ServerRequ
 public:
   TAO_ServerRequestInfo_CORBA_Container_create_union (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Container *tao_impl,
       const char * id,
       const char * name,
@@ -7058,7 +7031,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Container_create_union::TAO_ServerRequestInfo_CORBA_Container_create_union (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Container *tao_impl,
     const char * id,
     const char * name,
@@ -7182,7 +7155,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_enum : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_Container_create_enum (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Container *tao_impl,
       const char * id,
       const char * name,
@@ -7243,7 +7216,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Container_create_enum::TAO_ServerRequestInfo_CORBA_Container_create_enum (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Container *tao_impl,
     const char * id,
     const char * name,
@@ -7361,7 +7334,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_alias : public TAO_ServerRequ
 public:
   TAO_ServerRequestInfo_CORBA_Container_create_alias (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Container *tao_impl,
       const char * id,
       const char * name,
@@ -7422,7 +7395,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Container_create_alias::TAO_ServerRequestInfo_CORBA_Container_create_alias (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Container *tao_impl,
     const char * id,
     const char * name,
@@ -7540,7 +7513,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_interface : public TAO_Server
 public:
   TAO_ServerRequestInfo_CORBA_Container_create_interface (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Container *tao_impl,
       const char * id,
       const char * name,
@@ -7601,7 +7574,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Container_create_interface::TAO_ServerRequestInfo_CORBA_Container_create_interface (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Container *tao_impl,
     const char * id,
     const char * name,
@@ -7719,7 +7692,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_value : public TAO_ServerRequ
 public:
   TAO_ServerRequestInfo_CORBA_Container_create_value (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Container *tao_impl,
       const char * id,
       const char * name,
@@ -7792,7 +7765,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Container_create_value::TAO_ServerRequestInfo_CORBA_Container_create_value (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Container *tao_impl,
     const char * id,
     const char * name,
@@ -7946,7 +7919,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_value_box : public TAO_Server
 public:
   TAO_ServerRequestInfo_CORBA_Container_create_value_box (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Container *tao_impl,
       const char * id,
       const char * name,
@@ -8007,7 +7980,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Container_create_value_box::TAO_ServerRequestInfo_CORBA_Container_create_value_box (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Container *tao_impl,
     const char * id,
     const char * name,
@@ -8125,7 +8098,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_exception : public TAO_Server
 public:
   TAO_ServerRequestInfo_CORBA_Container_create_exception (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Container *tao_impl,
       const char * id,
       const char * name,
@@ -8186,7 +8159,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Container_create_exception::TAO_ServerRequestInfo_CORBA_Container_create_exception (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Container *tao_impl,
     const char * id,
     const char * name,
@@ -8304,7 +8277,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_native : public TAO_ServerReq
 public:
   TAO_ServerRequestInfo_CORBA_Container_create_native (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Container *tao_impl,
       const char * id,
       const char * name,
@@ -8363,7 +8336,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Container_create_native::TAO_ServerRequestInfo_CORBA_Container_create_native (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Container *tao_impl,
     const char * id,
     const char * name,
@@ -8475,7 +8448,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface : public T
 public:
   TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Container *tao_impl,
       const char * id,
       const char * name,
@@ -8536,7 +8509,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Container *tao_impl,
     const char * id,
     const char * name,
@@ -8654,7 +8627,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_local_interface : public TAO_
 public:
   TAO_ServerRequestInfo_CORBA_Container_create_local_interface (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Container *tao_impl,
       const char * id,
       const char * name,
@@ -8715,7 +8688,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Container_create_local_interface::TAO_ServerRequestInfo_CORBA_Container_create_local_interface (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Container *tao_impl,
     const char * id,
     const char * name,
@@ -8833,7 +8806,7 @@ class TAO_ServerRequestInfo_CORBA_Container_create_ext_value : public TAO_Server
 public:
   TAO_ServerRequestInfo_CORBA_Container_create_ext_value (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Container *tao_impl,
       const char * id,
       const char * name,
@@ -8906,7 +8879,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Container_create_ext_value::TAO_ServerRequestInfo_CORBA_Container_create_ext_value (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Container *tao_impl,
     const char * id,
     const char * name,
@@ -9106,7 +9079,7 @@ POA_CORBA::_TAO_Container_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -9176,7 +9149,7 @@ POA_CORBA::_TAO_Container_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_Container_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -9813,9 +9786,9 @@ void POA_CORBA::Container::lookup_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -9963,9 +9936,9 @@ void POA_CORBA::Container::contents_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -10121,9 +10094,9 @@ void POA_CORBA::Container::lookup_name_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -10285,9 +10258,9 @@ void POA_CORBA::Container::describe_contents_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -10445,9 +10418,9 @@ void POA_CORBA::Container::create_module_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -10609,9 +10582,9 @@ void POA_CORBA::Container::create_constant_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -10779,9 +10752,9 @@ void POA_CORBA::Container::create_struct_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -10947,9 +10920,9 @@ void POA_CORBA::Container::create_union_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -11117,9 +11090,9 @@ void POA_CORBA::Container::create_enum_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -11283,9 +11256,9 @@ void POA_CORBA::Container::create_alias_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -11449,9 +11422,9 @@ void POA_CORBA::Container::create_interface_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -11627,9 +11600,9 @@ void POA_CORBA::Container::create_value_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -11817,9 +11790,9 @@ void POA_CORBA::Container::create_value_box_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -11983,9 +11956,9 @@ void POA_CORBA::Container::create_exception_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -12147,9 +12120,9 @@ void POA_CORBA::Container::create_native_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -12309,9 +12282,9 @@ void POA_CORBA::Container::create_abstract_interface_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -12475,9 +12448,9 @@ void POA_CORBA::Container::create_local_interface_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -12653,9 +12626,9 @@ void POA_CORBA::Container::create_ext_value_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -12822,7 +12795,7 @@ void POA_CORBA::Container::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::Container *_tao_impl =
-    (POA_CORBA::Container *) _tao_servant;
+    static_cast<POA_CORBA::Container *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -12852,7 +12825,7 @@ void POA_CORBA::Container::_non_existent_skel (
   )
 {
   POA_CORBA::Container *_tao_impl =
-    (POA_CORBA::Container *) _tao_servant;
+    static_cast<POA_CORBA::Container *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -12885,7 +12858,7 @@ void POA_CORBA::Container::_interface_skel (
     }
   
   POA_CORBA::Container *_tao_impl =
-    (POA_CORBA::Container *) _tao_servant;
+    static_cast<POA_CORBA::Container *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -12916,7 +12889,7 @@ void POA_CORBA::Container::_component_skel (
   )
 {
   POA_CORBA::Container *_tao_impl =
-    (POA_CORBA::Container *) _tao_object_reference;
+    static_cast<POA_CORBA::Container *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -12936,27 +12909,21 @@ CORBA::Boolean POA_CORBA::Container::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::Container::_downcast (
@@ -12990,7 +12957,7 @@ const char* POA_CORBA::Container::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::Container::_dispatch (
     TAO_ServerRequest &req,
@@ -13005,7 +12972,7 @@ void POA_CORBA::Container::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::Container *
 POA_CORBA::Container::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -13016,22 +12983,14 @@ POA_CORBA::Container::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -13058,7 +13017,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_IDLType_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_IDLType_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_IDLType_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -13170,7 +13129,7 @@ class TAO_ServerRequestInfo_CORBA_IDLType_type_get : public TAO_ServerRequestInf
 public:
   TAO_ServerRequestInfo_CORBA_IDLType_type_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::IDLType *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -13223,7 +13182,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_IDLType_type_get::TAO_ServerRequestInfo_CORBA_IDLType_type_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::IDLType *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -13359,7 +13318,7 @@ POA_CORBA::_TAO_IDLType_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -13429,7 +13388,7 @@ POA_CORBA::_TAO_IDLType_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_IDLType_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -13536,9 +13495,9 @@ void POA_CORBA::IDLType::_get_type_skel (
   CORBA::TypeCode_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -13666,7 +13625,7 @@ void POA_CORBA::IDLType::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::IDLType *_tao_impl =
-    (POA_CORBA::IDLType *) _tao_servant;
+    static_cast<POA_CORBA::IDLType *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -13696,7 +13655,7 @@ void POA_CORBA::IDLType::_non_existent_skel (
   )
 {
   POA_CORBA::IDLType *_tao_impl =
-    (POA_CORBA::IDLType *) _tao_servant;
+    static_cast<POA_CORBA::IDLType *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -13729,7 +13688,7 @@ void POA_CORBA::IDLType::_interface_skel (
     }
   
   POA_CORBA::IDLType *_tao_impl =
-    (POA_CORBA::IDLType *) _tao_servant;
+    static_cast<POA_CORBA::IDLType *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -13760,7 +13719,7 @@ void POA_CORBA::IDLType::_component_skel (
   )
 {
   POA_CORBA::IDLType *_tao_impl =
-    (POA_CORBA::IDLType *) _tao_object_reference;
+    static_cast<POA_CORBA::IDLType *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -13780,27 +13739,21 @@ CORBA::Boolean POA_CORBA::IDLType::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::IDLType::_downcast (
@@ -13834,7 +13787,7 @@ const char* POA_CORBA::IDLType::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::IDLType::_dispatch (
     TAO_ServerRequest &req,
@@ -13849,7 +13802,7 @@ void POA_CORBA::IDLType::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::IDLType *
 POA_CORBA::IDLType::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -13860,22 +13813,14 @@ POA_CORBA::IDLType::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -13902,7 +13847,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_TypedefDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_TypedefDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_TypedefDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -14092,7 +14037,7 @@ POA_CORBA::_TAO_TypedefDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -14162,7 +14107,7 @@ POA_CORBA::_TAO_TypedefDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -14240,7 +14185,7 @@ void POA_CORBA::TypedefDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::TypedefDef *_tao_impl =
-    (POA_CORBA::TypedefDef *) _tao_servant;
+    static_cast<POA_CORBA::TypedefDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -14270,7 +14215,7 @@ void POA_CORBA::TypedefDef::_non_existent_skel (
   )
 {
   POA_CORBA::TypedefDef *_tao_impl =
-    (POA_CORBA::TypedefDef *) _tao_servant;
+    static_cast<POA_CORBA::TypedefDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -14303,7 +14248,7 @@ void POA_CORBA::TypedefDef::_interface_skel (
     }
   
   POA_CORBA::TypedefDef *_tao_impl =
-    (POA_CORBA::TypedefDef *) _tao_servant;
+    static_cast<POA_CORBA::TypedefDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -14334,7 +14279,7 @@ void POA_CORBA::TypedefDef::_component_skel (
   )
 {
   POA_CORBA::TypedefDef *_tao_impl =
-    (POA_CORBA::TypedefDef *) _tao_object_reference;
+    static_cast<POA_CORBA::TypedefDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -14354,35 +14299,29 @@ CORBA::Boolean POA_CORBA::TypedefDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/TypedefDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::TypedefDef::_downcast (
@@ -14428,7 +14367,7 @@ const char* POA_CORBA::TypedefDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::TypedefDef::_dispatch (
     TAO_ServerRequest &req,
@@ -14443,7 +14382,7 @@ void POA_CORBA::TypedefDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::TypedefDef *
 POA_CORBA::TypedefDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -14454,22 +14393,14 @@ POA_CORBA::TypedefDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h
index fd936e5a547..8cecc4049b1 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h
@@ -28,8 +28,8 @@
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:390
 
-#ifndef _TAO_IDL_SERVER_IFR_BASES_H_
-#define _TAO_IDL_SERVER_IFR_BASES_H_
+#ifndef _TAO_IDL_ORIG_IFR_BASES_H_
+#define _TAO_IDL_ORIG_IFR_BASES_H_
 
 #include /**/ "ace/pre.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp
index 6c9a79646d5..1a5fed2264d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp
@@ -28,8 +28,8 @@
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:683
 
-#ifndef _TAO_IDL_SERVER_IFR_BASES_T_CPP_
-#define _TAO_IDL_SERVER_IFR_BASES_T_CPP_
+#ifndef _TAO_IDL_ORIG_IFR_BASES_T_CPP_
+#define _TAO_IDL_ORIG_IFR_BASES_T_CPP_
 
 #include "IFR_BaseS_T.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h
index dcff2ee6c2e..c4b36f6d65a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h
@@ -28,8 +28,8 @@
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:546
 
-#ifndef _TAO_IDL_SERVER_IFR_BASES_T_H_
-#define _TAO_IDL_SERVER_IFR_BASES_T_H_
+#ifndef _TAO_IDL_ORIG_IFR_BASES_T_H_
+#define _TAO_IDL_ORIG_IFR_BASES_T_H_
 
 #include /**/ "ace/pre.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
index 2e72c40c80b..790fd216975 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
@@ -29,12 +29,13 @@
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:609
 
-#ifndef _TAO_IDL_SERVER_IFR_BASICS_CPP_
-#define _TAO_IDL_SERVER_IFR_BASICS_CPP_
+#ifndef _TAO_IDL_ORIG_IFR_BASICS_CPP_
+#define _TAO_IDL_ORIG_IFR_BASICS_CPP_
 
 
 #include "IFR_BasicS.h"
-#include "tao/PortableServer/Object_Adapter.h"
+#include "tao/PortableServer/Servant_Upcall.h"
+#include "tao/PortableServer/ForwardRequestC.h"
 #include "tao/PortableServer/Operation_Table.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/ORB_Core.h"
@@ -71,20 +72,20 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:574
+  // be\be_visitor_arg_traits.cpp:624
 
 #if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_SS_)
 #define _CORBA_DEFINITIONKIND__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::DefinitionKind>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::DefinitionKind>
     : public
         Basic_Arg_Traits_T<
             CORBA::DefinitionKind
@@ -163,13 +164,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:612
+  // be\be_visitor_arg_traits.cpp:662
 
 #if !defined (_CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_SS_)
 #define _CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::InterfaceDef::FullInterfaceDescription>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::InterfaceDef::FullInterfaceDescription>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDef::FullInterfaceDescription,
@@ -182,13 +183,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_)
 #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::InterfaceDefSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::InterfaceDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDefSeq,
@@ -201,13 +202,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_SS_)
 #define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::StructMemberSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::StructMemberSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::StructMemberSeq,
@@ -220,13 +221,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_SS_)
 #define _CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::ExcDescriptionSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExcDescriptionSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExcDescriptionSeq,
@@ -239,13 +240,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_SS_)
 #define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::UnionMemberSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::UnionMemberSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::UnionMemberSeq,
@@ -258,13 +259,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_SS_)
 #define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::EnumMemberSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::EnumMemberSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::EnumMemberSeq,
@@ -379,13 +380,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:574
+  // be\be_visitor_arg_traits.cpp:624
 
 #if !defined (_CORBA_PRIMITIVEKIND__ARG_TRAITS_SS_)
 #define _CORBA_PRIMITIVEKIND__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::PrimitiveKind>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::PrimitiveKind>
     : public
         Basic_Arg_Traits_T<
             CORBA::PrimitiveKind
@@ -396,13 +397,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_SS_)
 #define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::ExceptionDefSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExceptionDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExceptionDefSeq,
@@ -415,13 +416,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:574
+  // be\be_visitor_arg_traits.cpp:624
 
 #if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_SS_)
 #define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::AttributeMode>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::AttributeMode>
     : public
         Basic_Arg_Traits_T<
             CORBA::AttributeMode
@@ -449,13 +450,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:612
+  // be\be_visitor_arg_traits.cpp:662
 
 #if !defined (_CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_SS_)
 #define _CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::ExtAttributeDescription>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExtAttributeDescription>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExtAttributeDescription,
@@ -485,13 +486,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:574
+  // be\be_visitor_arg_traits.cpp:624
 
 #if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_SS_)
 #define _CORBA_OPERATIONMODE__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::OperationMode>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::OperationMode>
     : public
         Basic_Arg_Traits_T<
             CORBA::OperationMode
@@ -502,13 +503,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_SS_)
 #define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::ParDescriptionSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::ParDescriptionSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ParDescriptionSeq,
@@ -521,13 +522,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_SS_)
 #define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::ContextIdSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::ContextIdSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ContextIdSeq,
@@ -557,13 +558,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:612
+  // be\be_visitor_arg_traits.cpp:662
 
 #if !defined (_CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_SS_)
 #define _CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription,
@@ -591,7 +592,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_Repository_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_Repository_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_Repository_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -751,7 +752,7 @@ class TAO_ServerRequestInfo_CORBA_Repository_lookup_id : public TAO_ServerReques
 public:
   TAO_ServerRequestInfo_CORBA_Repository_lookup_id (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Repository *tao_impl,
       const char * search_id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -806,7 +807,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Repository_lookup_id::TAO_ServerRequestInfo_CORBA_Repository_lookup_id (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Repository *tao_impl,
     const char * search_id
     ACE_ENV_ARG_DECL_NOT_USED
@@ -906,7 +907,7 @@ class TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode : public TAO
 public:
   TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Repository *tao_impl,
       ::CORBA::TypeCode_ptr tc
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -961,7 +962,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Repository *tao_impl,
     ::CORBA::TypeCode_ptr tc
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1061,7 +1062,7 @@ class TAO_ServerRequestInfo_CORBA_Repository_get_primitive : public TAO_ServerRe
 public:
   TAO_ServerRequestInfo_CORBA_Repository_get_primitive (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Repository *tao_impl,
       ::CORBA::PrimitiveKind & kind
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1116,7 +1117,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Repository_get_primitive::TAO_ServerRequestInfo_CORBA_Repository_get_primitive (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Repository *tao_impl,
     ::CORBA::PrimitiveKind & kind
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1216,7 +1217,7 @@ class TAO_ServerRequestInfo_CORBA_Repository_create_string : public TAO_ServerRe
 public:
   TAO_ServerRequestInfo_CORBA_Repository_create_string (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Repository *tao_impl,
       const ::CORBA::ULong & bound
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1271,7 +1272,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Repository_create_string::TAO_ServerRequestInfo_CORBA_Repository_create_string (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Repository *tao_impl,
     const ::CORBA::ULong & bound
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1371,7 +1372,7 @@ class TAO_ServerRequestInfo_CORBA_Repository_create_wstring : public TAO_ServerR
 public:
   TAO_ServerRequestInfo_CORBA_Repository_create_wstring (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Repository *tao_impl,
       const ::CORBA::ULong & bound
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1426,7 +1427,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Repository_create_wstring::TAO_ServerRequestInfo_CORBA_Repository_create_wstring (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Repository *tao_impl,
     const ::CORBA::ULong & bound
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1526,7 +1527,7 @@ class TAO_ServerRequestInfo_CORBA_Repository_create_sequence : public TAO_Server
 public:
   TAO_ServerRequestInfo_CORBA_Repository_create_sequence (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Repository *tao_impl,
       const ::CORBA::ULong & bound,
       ::CORBA::IDLType_ptr element_type
@@ -1583,7 +1584,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Repository_create_sequence::TAO_ServerRequestInfo_CORBA_Repository_create_sequence (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Repository *tao_impl,
     const ::CORBA::ULong & bound,
     ::CORBA::IDLType_ptr element_type
@@ -1689,7 +1690,7 @@ class TAO_ServerRequestInfo_CORBA_Repository_create_array : public TAO_ServerReq
 public:
   TAO_ServerRequestInfo_CORBA_Repository_create_array (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Repository *tao_impl,
       const ::CORBA::ULong & length,
       ::CORBA::IDLType_ptr element_type
@@ -1746,7 +1747,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Repository_create_array::TAO_ServerRequestInfo_CORBA_Repository_create_array (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Repository *tao_impl,
     const ::CORBA::ULong & length,
     ::CORBA::IDLType_ptr element_type
@@ -1852,7 +1853,7 @@ class TAO_ServerRequestInfo_CORBA_Repository_create_fixed : public TAO_ServerReq
 public:
   TAO_ServerRequestInfo_CORBA_Repository_create_fixed (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Repository *tao_impl,
       const ::CORBA::UShort & digits,
       const ::CORBA::Short & scale
@@ -1909,7 +1910,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Repository_create_fixed::TAO_ServerRequestInfo_CORBA_Repository_create_fixed (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Repository *tao_impl,
     const ::CORBA::UShort & digits,
     const ::CORBA::Short & scale
@@ -2061,7 +2062,7 @@ POA_CORBA::_TAO_Repository_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -2131,7 +2132,7 @@ POA_CORBA::_TAO_Repository_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_Repository_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -2442,9 +2443,9 @@ void POA_CORBA::Repository::lookup_id_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -2590,9 +2591,9 @@ void POA_CORBA::Repository::get_canonical_typecode_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -2738,9 +2739,9 @@ void POA_CORBA::Repository::get_primitive_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -2886,9 +2887,9 @@ void POA_CORBA::Repository::create_string_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -3034,9 +3035,9 @@ void POA_CORBA::Repository::create_wstring_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -3184,9 +3185,9 @@ void POA_CORBA::Repository::create_sequence_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -3338,9 +3339,9 @@ void POA_CORBA::Repository::create_array_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -3492,9 +3493,9 @@ void POA_CORBA::Repository::create_fixed_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -3629,7 +3630,7 @@ void POA_CORBA::Repository::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::Repository *_tao_impl =
-    (POA_CORBA::Repository *) _tao_servant;
+    static_cast<POA_CORBA::Repository *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -3659,7 +3660,7 @@ void POA_CORBA::Repository::_non_existent_skel (
   )
 {
   POA_CORBA::Repository *_tao_impl =
-    (POA_CORBA::Repository *) _tao_servant;
+    static_cast<POA_CORBA::Repository *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -3692,7 +3693,7 @@ void POA_CORBA::Repository::_interface_skel (
     }
   
   POA_CORBA::Repository *_tao_impl =
-    (POA_CORBA::Repository *) _tao_servant;
+    static_cast<POA_CORBA::Repository *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -3723,7 +3724,7 @@ void POA_CORBA::Repository::_component_skel (
   )
 {
   POA_CORBA::Repository *_tao_impl =
-    (POA_CORBA::Repository *) _tao_object_reference;
+    static_cast<POA_CORBA::Repository *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -3743,31 +3744,25 @@ CORBA::Boolean POA_CORBA::Repository::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Repository:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::Repository::_downcast (
@@ -3807,7 +3802,7 @@ const char* POA_CORBA::Repository::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::Repository::_dispatch (
     TAO_ServerRequest &req,
@@ -3822,7 +3817,7 @@ void POA_CORBA::Repository::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::Repository *
 POA_CORBA::Repository::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -3833,22 +3828,14 @@ POA_CORBA::Repository::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -3875,7 +3862,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_ModuleDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_ModuleDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ModuleDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -4084,7 +4071,7 @@ POA_CORBA::_TAO_ModuleDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -4154,7 +4141,7 @@ POA_CORBA::_TAO_ModuleDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -4232,7 +4219,7 @@ void POA_CORBA::ModuleDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::ModuleDef *_tao_impl =
-    (POA_CORBA::ModuleDef *) _tao_servant;
+    static_cast<POA_CORBA::ModuleDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -4262,7 +4249,7 @@ void POA_CORBA::ModuleDef::_non_existent_skel (
   )
 {
   POA_CORBA::ModuleDef *_tao_impl =
-    (POA_CORBA::ModuleDef *) _tao_servant;
+    static_cast<POA_CORBA::ModuleDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -4295,7 +4282,7 @@ void POA_CORBA::ModuleDef::_interface_skel (
     }
   
   POA_CORBA::ModuleDef *_tao_impl =
-    (POA_CORBA::ModuleDef *) _tao_servant;
+    static_cast<POA_CORBA::ModuleDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -4326,7 +4313,7 @@ void POA_CORBA::ModuleDef::_component_skel (
   )
 {
   POA_CORBA::ModuleDef *_tao_impl =
-    (POA_CORBA::ModuleDef *) _tao_object_reference;
+    static_cast<POA_CORBA::ModuleDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -4346,35 +4333,29 @@ CORBA::Boolean POA_CORBA::ModuleDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ModuleDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::ModuleDef::_downcast (
@@ -4420,7 +4401,7 @@ const char* POA_CORBA::ModuleDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::ModuleDef::_dispatch (
     TAO_ServerRequest &req,
@@ -4435,7 +4416,7 @@ void POA_CORBA::ModuleDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::ModuleDef *
 POA_CORBA::ModuleDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -4446,22 +4427,14 @@ POA_CORBA::ModuleDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -4488,7 +4461,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_ConstantDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_ConstantDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ConstantDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -4636,7 +4609,7 @@ class TAO_ServerRequestInfo_CORBA_ConstantDef_type_get : public TAO_ServerReques
 public:
   TAO_ServerRequestInfo_CORBA_ConstantDef_type_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ConstantDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -4689,7 +4662,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::TAO_ServerRequestInfo_CORBA_ConstantDef_type_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ConstantDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -4779,7 +4752,7 @@ class TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get : public TAO_ServerRe
 public:
   TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ConstantDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -4832,7 +4805,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ConstantDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -4922,7 +4895,7 @@ class TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set : public TAO_ServerRe
 public:
   TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ConstantDef *tao_impl,
       ::CORBA::IDLType_ptr type_def
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -4974,7 +4947,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ConstantDef *tao_impl,
     ::CORBA::IDLType_ptr type_def
     ACE_ENV_ARG_DECL_NOT_USED
@@ -5063,7 +5036,7 @@ class TAO_ServerRequestInfo_CORBA_ConstantDef_value_get : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_ConstantDef_value_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ConstantDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -5116,7 +5089,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::TAO_ServerRequestInfo_CORBA_ConstantDef_value_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ConstantDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -5206,7 +5179,7 @@ class TAO_ServerRequestInfo_CORBA_ConstantDef_value_set : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_ConstantDef_value_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ConstantDef *tao_impl,
       const ::CORBA::Any & value
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -5258,7 +5231,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::TAO_ServerRequestInfo_CORBA_ConstantDef_value_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ConstantDef *tao_impl,
     const ::CORBA::Any & value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -5393,7 +5366,7 @@ POA_CORBA::_TAO_ConstantDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -5463,7 +5436,7 @@ POA_CORBA::_TAO_ConstantDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -5675,9 +5648,9 @@ void POA_CORBA::ConstantDef::_get_type_skel (
   CORBA::TypeCode_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -5810,9 +5783,9 @@ void POA_CORBA::ConstantDef::_get_type_def_skel (
   ::CORBA::IDLType_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -5956,9 +5929,9 @@ void POA_CORBA::ConstantDef::_set_type_def_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -6074,9 +6047,9 @@ void POA_CORBA::ConstantDef::_get_value_skel (
   CORBA::Any_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -6220,9 +6193,9 @@ void POA_CORBA::ConstantDef::_set_value_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -6333,7 +6306,7 @@ void POA_CORBA::ConstantDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::ConstantDef *_tao_impl =
-    (POA_CORBA::ConstantDef *) _tao_servant;
+    static_cast<POA_CORBA::ConstantDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -6363,7 +6336,7 @@ void POA_CORBA::ConstantDef::_non_existent_skel (
   )
 {
   POA_CORBA::ConstantDef *_tao_impl =
-    (POA_CORBA::ConstantDef *) _tao_servant;
+    static_cast<POA_CORBA::ConstantDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -6396,7 +6369,7 @@ void POA_CORBA::ConstantDef::_interface_skel (
     }
   
   POA_CORBA::ConstantDef *_tao_impl =
-    (POA_CORBA::ConstantDef *) _tao_servant;
+    static_cast<POA_CORBA::ConstantDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -6427,7 +6400,7 @@ void POA_CORBA::ConstantDef::_component_skel (
   )
 {
   POA_CORBA::ConstantDef *_tao_impl =
-    (POA_CORBA::ConstantDef *) _tao_object_reference;
+    static_cast<POA_CORBA::ConstantDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -6447,31 +6420,25 @@ CORBA::Boolean POA_CORBA::ConstantDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ConstantDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::ConstantDef::_downcast (
@@ -6511,7 +6478,7 @@ const char* POA_CORBA::ConstantDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::ConstantDef::_dispatch (
     TAO_ServerRequest &req,
@@ -6526,7 +6493,7 @@ void POA_CORBA::ConstantDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::ConstantDef *
 POA_CORBA::ConstantDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -6537,22 +6504,14 @@ POA_CORBA::ConstantDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -6579,7 +6538,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_StructDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_StructDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_StructDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -6745,7 +6704,7 @@ class TAO_ServerRequestInfo_CORBA_StructDef_members_get : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_StructDef_members_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::StructDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -6798,7 +6757,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_StructDef_members_get::TAO_ServerRequestInfo_CORBA_StructDef_members_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::StructDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -6888,7 +6847,7 @@ class TAO_ServerRequestInfo_CORBA_StructDef_members_set : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_StructDef_members_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::StructDef *tao_impl,
       const ::CORBA::StructMemberSeq & members
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -6940,7 +6899,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_StructDef_members_set::TAO_ServerRequestInfo_CORBA_StructDef_members_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::StructDef *tao_impl,
     const ::CORBA::StructMemberSeq & members
     ACE_ENV_ARG_DECL_NOT_USED
@@ -7075,7 +7034,7 @@ POA_CORBA::_TAO_StructDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -7145,7 +7104,7 @@ POA_CORBA::_TAO_StructDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_StructDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -7282,9 +7241,9 @@ void POA_CORBA::StructDef::_get_members_skel (
   ::CORBA::StructMemberSeq_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -7428,9 +7387,9 @@ void POA_CORBA::StructDef::_set_members_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -7541,7 +7500,7 @@ void POA_CORBA::StructDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::StructDef *_tao_impl =
-    (POA_CORBA::StructDef *) _tao_servant;
+    static_cast<POA_CORBA::StructDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -7571,7 +7530,7 @@ void POA_CORBA::StructDef::_non_existent_skel (
   )
 {
   POA_CORBA::StructDef *_tao_impl =
-    (POA_CORBA::StructDef *) _tao_servant;
+    static_cast<POA_CORBA::StructDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -7604,7 +7563,7 @@ void POA_CORBA::StructDef::_interface_skel (
     }
   
   POA_CORBA::StructDef *_tao_impl =
-    (POA_CORBA::StructDef *) _tao_servant;
+    static_cast<POA_CORBA::StructDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -7635,7 +7594,7 @@ void POA_CORBA::StructDef::_component_skel (
   )
 {
   POA_CORBA::StructDef *_tao_impl =
-    (POA_CORBA::StructDef *) _tao_object_reference;
+    static_cast<POA_CORBA::StructDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -7655,43 +7614,37 @@ CORBA::Boolean POA_CORBA::StructDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/TypedefDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/StructDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::StructDef::_downcast (
@@ -7749,7 +7702,7 @@ const char* POA_CORBA::StructDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::StructDef::_dispatch (
     TAO_ServerRequest &req,
@@ -7764,7 +7717,7 @@ void POA_CORBA::StructDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::StructDef *
 POA_CORBA::StructDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -7775,22 +7728,14 @@ POA_CORBA::StructDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -7817,7 +7762,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_UnionDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_UnionDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_UnionDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -7988,7 +7933,7 @@ class TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get : public TAO_S
 public:
   TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::UnionDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -8041,7 +7986,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::UnionDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -8131,7 +8076,7 @@ class TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get : public T
 public:
   TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::UnionDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -8184,7 +8129,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::UnionDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -8274,7 +8219,7 @@ class TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set : public T
 public:
   TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::UnionDef *tao_impl,
       ::CORBA::IDLType_ptr discriminator_type_def
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -8326,7 +8271,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::UnionDef *tao_impl,
     ::CORBA::IDLType_ptr discriminator_type_def
     ACE_ENV_ARG_DECL_NOT_USED
@@ -8415,7 +8360,7 @@ class TAO_ServerRequestInfo_CORBA_UnionDef_members_get : public TAO_ServerReques
 public:
   TAO_ServerRequestInfo_CORBA_UnionDef_members_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::UnionDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -8468,7 +8413,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_UnionDef_members_get::TAO_ServerRequestInfo_CORBA_UnionDef_members_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::UnionDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -8558,7 +8503,7 @@ class TAO_ServerRequestInfo_CORBA_UnionDef_members_set : public TAO_ServerReques
 public:
   TAO_ServerRequestInfo_CORBA_UnionDef_members_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::UnionDef *tao_impl,
       const ::CORBA::UnionMemberSeq & members
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -8610,7 +8555,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_UnionDef_members_set::TAO_ServerRequestInfo_CORBA_UnionDef_members_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::UnionDef *tao_impl,
     const ::CORBA::UnionMemberSeq & members
     ACE_ENV_ARG_DECL_NOT_USED
@@ -8745,7 +8690,7 @@ POA_CORBA::_TAO_UnionDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -8815,7 +8760,7 @@ POA_CORBA::_TAO_UnionDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_UnionDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -9030,9 +8975,9 @@ void POA_CORBA::UnionDef::_get_discriminator_type_skel (
   CORBA::TypeCode_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -9165,9 +9110,9 @@ void POA_CORBA::UnionDef::_get_discriminator_type_def_skel (
   ::CORBA::IDLType_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -9311,9 +9256,9 @@ void POA_CORBA::UnionDef::_set_discriminator_type_def_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -9429,9 +9374,9 @@ void POA_CORBA::UnionDef::_get_members_skel (
   ::CORBA::UnionMemberSeq_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -9575,9 +9520,9 @@ void POA_CORBA::UnionDef::_set_members_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -9688,7 +9633,7 @@ void POA_CORBA::UnionDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::UnionDef *_tao_impl =
-    (POA_CORBA::UnionDef *) _tao_servant;
+    static_cast<POA_CORBA::UnionDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -9718,7 +9663,7 @@ void POA_CORBA::UnionDef::_non_existent_skel (
   )
 {
   POA_CORBA::UnionDef *_tao_impl =
-    (POA_CORBA::UnionDef *) _tao_servant;
+    static_cast<POA_CORBA::UnionDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -9751,7 +9696,7 @@ void POA_CORBA::UnionDef::_interface_skel (
     }
   
   POA_CORBA::UnionDef *_tao_impl =
-    (POA_CORBA::UnionDef *) _tao_servant;
+    static_cast<POA_CORBA::UnionDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -9782,7 +9727,7 @@ void POA_CORBA::UnionDef::_component_skel (
   )
 {
   POA_CORBA::UnionDef *_tao_impl =
-    (POA_CORBA::UnionDef *) _tao_object_reference;
+    static_cast<POA_CORBA::UnionDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -9802,43 +9747,37 @@ CORBA::Boolean POA_CORBA::UnionDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/TypedefDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/UnionDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::UnionDef::_downcast (
@@ -9896,7 +9835,7 @@ const char* POA_CORBA::UnionDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::UnionDef::_dispatch (
     TAO_ServerRequest &req,
@@ -9911,7 +9850,7 @@ void POA_CORBA::UnionDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::UnionDef *
 POA_CORBA::UnionDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -9922,22 +9861,14 @@ POA_CORBA::UnionDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -9964,7 +9895,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_EnumDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_EnumDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_EnumDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -10110,7 +10041,7 @@ class TAO_ServerRequestInfo_CORBA_EnumDef_members_get : public TAO_ServerRequest
 public:
   TAO_ServerRequestInfo_CORBA_EnumDef_members_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::EnumDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -10163,7 +10094,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_EnumDef_members_get::TAO_ServerRequestInfo_CORBA_EnumDef_members_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::EnumDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -10253,7 +10184,7 @@ class TAO_ServerRequestInfo_CORBA_EnumDef_members_set : public TAO_ServerRequest
 public:
   TAO_ServerRequestInfo_CORBA_EnumDef_members_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::EnumDef *tao_impl,
       const ::CORBA::EnumMemberSeq & members
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -10305,7 +10236,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_EnumDef_members_set::TAO_ServerRequestInfo_CORBA_EnumDef_members_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::EnumDef *tao_impl,
     const ::CORBA::EnumMemberSeq & members
     ACE_ENV_ARG_DECL_NOT_USED
@@ -10440,7 +10371,7 @@ POA_CORBA::_TAO_EnumDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -10510,7 +10441,7 @@ POA_CORBA::_TAO_EnumDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_EnumDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -10646,9 +10577,9 @@ void POA_CORBA::EnumDef::_get_members_skel (
   ::CORBA::EnumMemberSeq_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -10792,9 +10723,9 @@ void POA_CORBA::EnumDef::_set_members_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -10905,7 +10836,7 @@ void POA_CORBA::EnumDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::EnumDef *_tao_impl =
-    (POA_CORBA::EnumDef *) _tao_servant;
+    static_cast<POA_CORBA::EnumDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -10935,7 +10866,7 @@ void POA_CORBA::EnumDef::_non_existent_skel (
   )
 {
   POA_CORBA::EnumDef *_tao_impl =
-    (POA_CORBA::EnumDef *) _tao_servant;
+    static_cast<POA_CORBA::EnumDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -10968,7 +10899,7 @@ void POA_CORBA::EnumDef::_interface_skel (
     }
   
   POA_CORBA::EnumDef *_tao_impl =
-    (POA_CORBA::EnumDef *) _tao_servant;
+    static_cast<POA_CORBA::EnumDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -10999,7 +10930,7 @@ void POA_CORBA::EnumDef::_component_skel (
   )
 {
   POA_CORBA::EnumDef *_tao_impl =
-    (POA_CORBA::EnumDef *) _tao_object_reference;
+    static_cast<POA_CORBA::EnumDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -11019,39 +10950,33 @@ CORBA::Boolean POA_CORBA::EnumDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/TypedefDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/EnumDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::EnumDef::_downcast (
@@ -11103,7 +11028,7 @@ const char* POA_CORBA::EnumDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::EnumDef::_dispatch (
     TAO_ServerRequest &req,
@@ -11118,7 +11043,7 @@ void POA_CORBA::EnumDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::EnumDef *
 POA_CORBA::EnumDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -11129,22 +11054,14 @@ POA_CORBA::EnumDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -11171,7 +11088,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_AliasDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_AliasDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_AliasDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -11317,7 +11234,7 @@ class TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get : public TAO_Se
 public:
   TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::AliasDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -11370,7 +11287,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::AliasDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -11460,7 +11377,7 @@ class TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set : public TAO_Se
 public:
   TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::AliasDef *tao_impl,
       ::CORBA::IDLType_ptr original_type_def
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -11512,7 +11429,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::AliasDef *tao_impl,
     ::CORBA::IDLType_ptr original_type_def
     ACE_ENV_ARG_DECL_NOT_USED
@@ -11647,7 +11564,7 @@ POA_CORBA::_TAO_AliasDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -11717,7 +11634,7 @@ POA_CORBA::_TAO_AliasDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_AliasDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -11853,9 +11770,9 @@ void POA_CORBA::AliasDef::_get_original_type_def_skel (
   ::CORBA::IDLType_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -11999,9 +11916,9 @@ void POA_CORBA::AliasDef::_set_original_type_def_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -12112,7 +12029,7 @@ void POA_CORBA::AliasDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::AliasDef *_tao_impl =
-    (POA_CORBA::AliasDef *) _tao_servant;
+    static_cast<POA_CORBA::AliasDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -12142,7 +12059,7 @@ void POA_CORBA::AliasDef::_non_existent_skel (
   )
 {
   POA_CORBA::AliasDef *_tao_impl =
-    (POA_CORBA::AliasDef *) _tao_servant;
+    static_cast<POA_CORBA::AliasDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -12175,7 +12092,7 @@ void POA_CORBA::AliasDef::_interface_skel (
     }
   
   POA_CORBA::AliasDef *_tao_impl =
-    (POA_CORBA::AliasDef *) _tao_servant;
+    static_cast<POA_CORBA::AliasDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -12206,7 +12123,7 @@ void POA_CORBA::AliasDef::_component_skel (
   )
 {
   POA_CORBA::AliasDef *_tao_impl =
-    (POA_CORBA::AliasDef *) _tao_object_reference;
+    static_cast<POA_CORBA::AliasDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -12226,39 +12143,33 @@ CORBA::Boolean POA_CORBA::AliasDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/TypedefDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/AliasDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::AliasDef::_downcast (
@@ -12310,7 +12221,7 @@ const char* POA_CORBA::AliasDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::AliasDef::_dispatch (
     TAO_ServerRequest &req,
@@ -12325,7 +12236,7 @@ void POA_CORBA::AliasDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::AliasDef *
 POA_CORBA::AliasDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -12336,22 +12247,14 @@ POA_CORBA::AliasDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -12378,7 +12281,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_NativeDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_NativeDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_NativeDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -12568,7 +12471,7 @@ POA_CORBA::_TAO_NativeDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -12638,7 +12541,7 @@ POA_CORBA::_TAO_NativeDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_NativeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -12717,7 +12620,7 @@ void POA_CORBA::NativeDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::NativeDef *_tao_impl =
-    (POA_CORBA::NativeDef *) _tao_servant;
+    static_cast<POA_CORBA::NativeDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -12747,7 +12650,7 @@ void POA_CORBA::NativeDef::_non_existent_skel (
   )
 {
   POA_CORBA::NativeDef *_tao_impl =
-    (POA_CORBA::NativeDef *) _tao_servant;
+    static_cast<POA_CORBA::NativeDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -12780,7 +12683,7 @@ void POA_CORBA::NativeDef::_interface_skel (
     }
   
   POA_CORBA::NativeDef *_tao_impl =
-    (POA_CORBA::NativeDef *) _tao_servant;
+    static_cast<POA_CORBA::NativeDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -12811,7 +12714,7 @@ void POA_CORBA::NativeDef::_component_skel (
   )
 {
   POA_CORBA::NativeDef *_tao_impl =
-    (POA_CORBA::NativeDef *) _tao_object_reference;
+    static_cast<POA_CORBA::NativeDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -12831,39 +12734,33 @@ CORBA::Boolean POA_CORBA::NativeDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/TypedefDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/NativeDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::NativeDef::_downcast (
@@ -12915,7 +12812,7 @@ const char* POA_CORBA::NativeDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::NativeDef::_dispatch (
     TAO_ServerRequest &req,
@@ -12930,7 +12827,7 @@ void POA_CORBA::NativeDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::NativeDef *
 POA_CORBA::NativeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -12941,22 +12838,14 @@ POA_CORBA::NativeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -12983,7 +12872,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_PrimitiveDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_PrimitiveDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -13098,7 +12987,7 @@ class TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::PrimitiveDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -13151,7 +13040,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::PrimitiveDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -13287,7 +13176,7 @@ POA_CORBA::_TAO_PrimitiveDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -13357,7 +13246,7 @@ POA_CORBA::_TAO_PrimitiveDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -13465,9 +13354,9 @@ void POA_CORBA::PrimitiveDef::_get_kind_skel (
   ::CORBA::PrimitiveKind _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -13594,7 +13483,7 @@ void POA_CORBA::PrimitiveDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::PrimitiveDef *_tao_impl =
-    (POA_CORBA::PrimitiveDef *) _tao_servant;
+    static_cast<POA_CORBA::PrimitiveDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -13624,7 +13513,7 @@ void POA_CORBA::PrimitiveDef::_non_existent_skel (
   )
 {
   POA_CORBA::PrimitiveDef *_tao_impl =
-    (POA_CORBA::PrimitiveDef *) _tao_servant;
+    static_cast<POA_CORBA::PrimitiveDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -13657,7 +13546,7 @@ void POA_CORBA::PrimitiveDef::_interface_skel (
     }
   
   POA_CORBA::PrimitiveDef *_tao_impl =
-    (POA_CORBA::PrimitiveDef *) _tao_servant;
+    static_cast<POA_CORBA::PrimitiveDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -13688,7 +13577,7 @@ void POA_CORBA::PrimitiveDef::_component_skel (
   )
 {
   POA_CORBA::PrimitiveDef *_tao_impl =
-    (POA_CORBA::PrimitiveDef *) _tao_object_reference;
+    static_cast<POA_CORBA::PrimitiveDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -13708,31 +13597,25 @@ CORBA::Boolean POA_CORBA::PrimitiveDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/PrimitiveDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::PrimitiveDef::_downcast (
@@ -13772,7 +13655,7 @@ const char* POA_CORBA::PrimitiveDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::PrimitiveDef::_dispatch (
     TAO_ServerRequest &req,
@@ -13787,7 +13670,7 @@ void POA_CORBA::PrimitiveDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::PrimitiveDef *
 POA_CORBA::PrimitiveDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -13798,22 +13681,14 @@ POA_CORBA::PrimitiveDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -13840,7 +13715,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_StringDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_StringDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_StringDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -13974,7 +13849,7 @@ class TAO_ServerRequestInfo_CORBA_StringDef_bound_get : public TAO_ServerRequest
 public:
   TAO_ServerRequestInfo_CORBA_StringDef_bound_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::StringDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -14027,7 +13902,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_StringDef_bound_get::TAO_ServerRequestInfo_CORBA_StringDef_bound_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::StringDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -14117,7 +13992,7 @@ class TAO_ServerRequestInfo_CORBA_StringDef_bound_set : public TAO_ServerRequest
 public:
   TAO_ServerRequestInfo_CORBA_StringDef_bound_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::StringDef *tao_impl,
       const ::CORBA::ULong & bound
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -14169,7 +14044,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_StringDef_bound_set::TAO_ServerRequestInfo_CORBA_StringDef_bound_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::StringDef *tao_impl,
     const ::CORBA::ULong & bound
     ACE_ENV_ARG_DECL_NOT_USED
@@ -14304,7 +14179,7 @@ POA_CORBA::_TAO_StringDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -14374,7 +14249,7 @@ POA_CORBA::_TAO_StringDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_StringDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -14508,9 +14383,9 @@ void POA_CORBA::StringDef::_get_bound_skel (
   CORBA::ULong _tao_retval = 0;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -14653,9 +14528,9 @@ void POA_CORBA::StringDef::_set_bound_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -14766,7 +14641,7 @@ void POA_CORBA::StringDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::StringDef *_tao_impl =
-    (POA_CORBA::StringDef *) _tao_servant;
+    static_cast<POA_CORBA::StringDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -14796,7 +14671,7 @@ void POA_CORBA::StringDef::_non_existent_skel (
   )
 {
   POA_CORBA::StringDef *_tao_impl =
-    (POA_CORBA::StringDef *) _tao_servant;
+    static_cast<POA_CORBA::StringDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -14829,7 +14704,7 @@ void POA_CORBA::StringDef::_interface_skel (
     }
   
   POA_CORBA::StringDef *_tao_impl =
-    (POA_CORBA::StringDef *) _tao_servant;
+    static_cast<POA_CORBA::StringDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -14860,7 +14735,7 @@ void POA_CORBA::StringDef::_component_skel (
   )
 {
   POA_CORBA::StringDef *_tao_impl =
-    (POA_CORBA::StringDef *) _tao_object_reference;
+    static_cast<POA_CORBA::StringDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -14880,31 +14755,25 @@ CORBA::Boolean POA_CORBA::StringDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/StringDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::StringDef::_downcast (
@@ -14944,7 +14813,7 @@ const char* POA_CORBA::StringDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::StringDef::_dispatch (
     TAO_ServerRequest &req,
@@ -14959,7 +14828,7 @@ void POA_CORBA::StringDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::StringDef *
 POA_CORBA::StringDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -14970,22 +14839,14 @@ POA_CORBA::StringDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -15012,7 +14873,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_WstringDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_WstringDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_WstringDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -15146,7 +15007,7 @@ class TAO_ServerRequestInfo_CORBA_WstringDef_bound_get : public TAO_ServerReques
 public:
   TAO_ServerRequestInfo_CORBA_WstringDef_bound_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::WstringDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -15199,7 +15060,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::TAO_ServerRequestInfo_CORBA_WstringDef_bound_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::WstringDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -15289,7 +15150,7 @@ class TAO_ServerRequestInfo_CORBA_WstringDef_bound_set : public TAO_ServerReques
 public:
   TAO_ServerRequestInfo_CORBA_WstringDef_bound_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::WstringDef *tao_impl,
       const ::CORBA::ULong & bound
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -15341,7 +15202,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::TAO_ServerRequestInfo_CORBA_WstringDef_bound_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::WstringDef *tao_impl,
     const ::CORBA::ULong & bound
     ACE_ENV_ARG_DECL_NOT_USED
@@ -15476,7 +15337,7 @@ POA_CORBA::_TAO_WstringDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -15546,7 +15407,7 @@ POA_CORBA::_TAO_WstringDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_WstringDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -15680,9 +15541,9 @@ void POA_CORBA::WstringDef::_get_bound_skel (
   CORBA::ULong _tao_retval = 0;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -15825,9 +15686,9 @@ void POA_CORBA::WstringDef::_set_bound_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -15938,7 +15799,7 @@ void POA_CORBA::WstringDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::WstringDef *_tao_impl =
-    (POA_CORBA::WstringDef *) _tao_servant;
+    static_cast<POA_CORBA::WstringDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -15968,7 +15829,7 @@ void POA_CORBA::WstringDef::_non_existent_skel (
   )
 {
   POA_CORBA::WstringDef *_tao_impl =
-    (POA_CORBA::WstringDef *) _tao_servant;
+    static_cast<POA_CORBA::WstringDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -16001,7 +15862,7 @@ void POA_CORBA::WstringDef::_interface_skel (
     }
   
   POA_CORBA::WstringDef *_tao_impl =
-    (POA_CORBA::WstringDef *) _tao_servant;
+    static_cast<POA_CORBA::WstringDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -16032,7 +15893,7 @@ void POA_CORBA::WstringDef::_component_skel (
   )
 {
   POA_CORBA::WstringDef *_tao_impl =
-    (POA_CORBA::WstringDef *) _tao_object_reference;
+    static_cast<POA_CORBA::WstringDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -16052,31 +15913,25 @@ CORBA::Boolean POA_CORBA::WstringDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/WstringDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::WstringDef::_downcast (
@@ -16116,7 +15971,7 @@ const char* POA_CORBA::WstringDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::WstringDef::_dispatch (
     TAO_ServerRequest &req,
@@ -16131,7 +15986,7 @@ void POA_CORBA::WstringDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::WstringDef *
 POA_CORBA::WstringDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -16142,22 +15997,14 @@ POA_CORBA::WstringDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -16184,7 +16031,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_SequenceDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_SequenceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_SequenceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -16321,7 +16168,7 @@ class TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::SequenceDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -16374,7 +16221,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::SequenceDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -16464,7 +16311,7 @@ class TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::SequenceDef *tao_impl,
       const ::CORBA::ULong & bound
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -16516,7 +16363,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::SequenceDef *tao_impl,
     const ::CORBA::ULong & bound
     ACE_ENV_ARG_DECL_NOT_USED
@@ -16605,7 +16452,7 @@ class TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get : public TAO_Serv
 public:
   TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::SequenceDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -16658,7 +16505,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::SequenceDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -16748,7 +16595,7 @@ class TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get : public TAO_
 public:
   TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::SequenceDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -16801,7 +16648,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::SequenceDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -16891,7 +16738,7 @@ class TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set : public TAO_
 public:
   TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::SequenceDef *tao_impl,
       ::CORBA::IDLType_ptr element_type_def
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -16943,7 +16790,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::SequenceDef *tao_impl,
     ::CORBA::IDLType_ptr element_type_def
     ACE_ENV_ARG_DECL_NOT_USED
@@ -17078,7 +16925,7 @@ POA_CORBA::_TAO_SequenceDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -17148,7 +16995,7 @@ POA_CORBA::_TAO_SequenceDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -17360,9 +17207,9 @@ void POA_CORBA::SequenceDef::_get_bound_skel (
   CORBA::ULong _tao_retval = 0;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -17505,9 +17352,9 @@ void POA_CORBA::SequenceDef::_set_bound_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -17623,9 +17470,9 @@ void POA_CORBA::SequenceDef::_get_element_type_skel (
   CORBA::TypeCode_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -17758,9 +17605,9 @@ void POA_CORBA::SequenceDef::_get_element_type_def_skel (
   ::CORBA::IDLType_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -17904,9 +17751,9 @@ void POA_CORBA::SequenceDef::_set_element_type_def_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -18017,7 +17864,7 @@ void POA_CORBA::SequenceDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::SequenceDef *_tao_impl =
-    (POA_CORBA::SequenceDef *) _tao_servant;
+    static_cast<POA_CORBA::SequenceDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -18047,7 +17894,7 @@ void POA_CORBA::SequenceDef::_non_existent_skel (
   )
 {
   POA_CORBA::SequenceDef *_tao_impl =
-    (POA_CORBA::SequenceDef *) _tao_servant;
+    static_cast<POA_CORBA::SequenceDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -18080,7 +17927,7 @@ void POA_CORBA::SequenceDef::_interface_skel (
     }
   
   POA_CORBA::SequenceDef *_tao_impl =
-    (POA_CORBA::SequenceDef *) _tao_servant;
+    static_cast<POA_CORBA::SequenceDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -18111,7 +17958,7 @@ void POA_CORBA::SequenceDef::_component_skel (
   )
 {
   POA_CORBA::SequenceDef *_tao_impl =
-    (POA_CORBA::SequenceDef *) _tao_object_reference;
+    static_cast<POA_CORBA::SequenceDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -18131,31 +17978,25 @@ CORBA::Boolean POA_CORBA::SequenceDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/SequenceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::SequenceDef::_downcast (
@@ -18195,7 +18036,7 @@ const char* POA_CORBA::SequenceDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::SequenceDef::_dispatch (
     TAO_ServerRequest &req,
@@ -18210,7 +18051,7 @@ void POA_CORBA::SequenceDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::SequenceDef *
 POA_CORBA::SequenceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -18221,22 +18062,14 @@ POA_CORBA::SequenceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -18263,7 +18096,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_ArrayDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_ArrayDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ArrayDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -18400,7 +18233,7 @@ class TAO_ServerRequestInfo_CORBA_ArrayDef_length_get : public TAO_ServerRequest
 public:
   TAO_ServerRequestInfo_CORBA_ArrayDef_length_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ArrayDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -18453,7 +18286,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::TAO_ServerRequestInfo_CORBA_ArrayDef_length_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ArrayDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -18543,7 +18376,7 @@ class TAO_ServerRequestInfo_CORBA_ArrayDef_length_set : public TAO_ServerRequest
 public:
   TAO_ServerRequestInfo_CORBA_ArrayDef_length_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ArrayDef *tao_impl,
       const ::CORBA::ULong & length
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -18595,7 +18428,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::TAO_ServerRequestInfo_CORBA_ArrayDef_length_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ArrayDef *tao_impl,
     const ::CORBA::ULong & length
     ACE_ENV_ARG_DECL_NOT_USED
@@ -18684,7 +18517,7 @@ class TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get : public TAO_ServerR
 public:
   TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ArrayDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -18737,7 +18570,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ArrayDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -18827,7 +18660,7 @@ class TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get : public TAO_Ser
 public:
   TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ArrayDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -18880,7 +18713,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ArrayDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -18970,7 +18803,7 @@ class TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set : public TAO_Ser
 public:
   TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ArrayDef *tao_impl,
       ::CORBA::IDLType_ptr element_type_def
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -19022,7 +18855,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ArrayDef *tao_impl,
     ::CORBA::IDLType_ptr element_type_def
     ACE_ENV_ARG_DECL_NOT_USED
@@ -19157,7 +18990,7 @@ POA_CORBA::_TAO_ArrayDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -19227,7 +19060,7 @@ POA_CORBA::_TAO_ArrayDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -19439,9 +19272,9 @@ void POA_CORBA::ArrayDef::_get_length_skel (
   CORBA::ULong _tao_retval = 0;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -19584,9 +19417,9 @@ void POA_CORBA::ArrayDef::_set_length_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -19702,9 +19535,9 @@ void POA_CORBA::ArrayDef::_get_element_type_skel (
   CORBA::TypeCode_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -19837,9 +19670,9 @@ void POA_CORBA::ArrayDef::_get_element_type_def_skel (
   ::CORBA::IDLType_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -19983,9 +19816,9 @@ void POA_CORBA::ArrayDef::_set_element_type_def_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -20096,7 +19929,7 @@ void POA_CORBA::ArrayDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::ArrayDef *_tao_impl =
-    (POA_CORBA::ArrayDef *) _tao_servant;
+    static_cast<POA_CORBA::ArrayDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -20126,7 +19959,7 @@ void POA_CORBA::ArrayDef::_non_existent_skel (
   )
 {
   POA_CORBA::ArrayDef *_tao_impl =
-    (POA_CORBA::ArrayDef *) _tao_servant;
+    static_cast<POA_CORBA::ArrayDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -20159,7 +19992,7 @@ void POA_CORBA::ArrayDef::_interface_skel (
     }
   
   POA_CORBA::ArrayDef *_tao_impl =
-    (POA_CORBA::ArrayDef *) _tao_servant;
+    static_cast<POA_CORBA::ArrayDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -20190,7 +20023,7 @@ void POA_CORBA::ArrayDef::_component_skel (
   )
 {
   POA_CORBA::ArrayDef *_tao_impl =
-    (POA_CORBA::ArrayDef *) _tao_object_reference;
+    static_cast<POA_CORBA::ArrayDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -20210,31 +20043,25 @@ CORBA::Boolean POA_CORBA::ArrayDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ArrayDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::ArrayDef::_downcast (
@@ -20274,7 +20101,7 @@ const char* POA_CORBA::ArrayDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::ArrayDef::_dispatch (
     TAO_ServerRequest &req,
@@ -20289,7 +20116,7 @@ void POA_CORBA::ArrayDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::ArrayDef *
 POA_CORBA::ArrayDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -20300,22 +20127,14 @@ POA_CORBA::ArrayDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -20342,7 +20161,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_ExceptionDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_ExceptionDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -20508,7 +20327,7 @@ class TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ExceptionDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -20561,7 +20380,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ExceptionDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -20651,7 +20470,7 @@ class TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get : public TAO_ServerRe
 public:
   TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ExceptionDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -20704,7 +20523,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ExceptionDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -20794,7 +20613,7 @@ class TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set : public TAO_ServerRe
 public:
   TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ExceptionDef *tao_impl,
       const ::CORBA::StructMemberSeq & members
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -20846,7 +20665,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ExceptionDef *tao_impl,
     const ::CORBA::StructMemberSeq & members
     ACE_ENV_ARG_DECL_NOT_USED
@@ -20981,7 +20800,7 @@ POA_CORBA::_TAO_ExceptionDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -21051,7 +20870,7 @@ POA_CORBA::_TAO_ExceptionDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -21212,9 +21031,9 @@ void POA_CORBA::ExceptionDef::_get_type_skel (
   CORBA::TypeCode_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -21347,9 +21166,9 @@ void POA_CORBA::ExceptionDef::_get_members_skel (
   ::CORBA::StructMemberSeq_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -21493,9 +21312,9 @@ void POA_CORBA::ExceptionDef::_set_members_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -21606,7 +21425,7 @@ void POA_CORBA::ExceptionDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::ExceptionDef *_tao_impl =
-    (POA_CORBA::ExceptionDef *) _tao_servant;
+    static_cast<POA_CORBA::ExceptionDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -21636,7 +21455,7 @@ void POA_CORBA::ExceptionDef::_non_existent_skel (
   )
 {
   POA_CORBA::ExceptionDef *_tao_impl =
-    (POA_CORBA::ExceptionDef *) _tao_servant;
+    static_cast<POA_CORBA::ExceptionDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -21669,7 +21488,7 @@ void POA_CORBA::ExceptionDef::_interface_skel (
     }
   
   POA_CORBA::ExceptionDef *_tao_impl =
-    (POA_CORBA::ExceptionDef *) _tao_servant;
+    static_cast<POA_CORBA::ExceptionDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -21700,7 +21519,7 @@ void POA_CORBA::ExceptionDef::_component_skel (
   )
 {
   POA_CORBA::ExceptionDef *_tao_impl =
-    (POA_CORBA::ExceptionDef *) _tao_object_reference;
+    static_cast<POA_CORBA::ExceptionDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -21720,35 +21539,29 @@ CORBA::Boolean POA_CORBA::ExceptionDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ExceptionDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::ExceptionDef::_downcast (
@@ -21794,7 +21607,7 @@ const char* POA_CORBA::ExceptionDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::ExceptionDef::_dispatch (
     TAO_ServerRequest &req,
@@ -21809,7 +21622,7 @@ void POA_CORBA::ExceptionDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::ExceptionDef *
 POA_CORBA::ExceptionDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -21820,22 +21633,14 @@ POA_CORBA::ExceptionDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -21862,7 +21667,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_AttributeDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_AttributeDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_AttributeDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -22010,7 +21815,7 @@ class TAO_ServerRequestInfo_CORBA_AttributeDef_type_get : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_AttributeDef_type_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::AttributeDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -22063,7 +21868,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::TAO_ServerRequestInfo_CORBA_AttributeDef_type_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::AttributeDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -22153,7 +21958,7 @@ class TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get : public TAO_ServerR
 public:
   TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::AttributeDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -22206,7 +22011,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::AttributeDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -22296,7 +22101,7 @@ class TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set : public TAO_ServerR
 public:
   TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::AttributeDef *tao_impl,
       ::CORBA::IDLType_ptr type_def
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -22348,7 +22153,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::AttributeDef *tao_impl,
     ::CORBA::IDLType_ptr type_def
     ACE_ENV_ARG_DECL_NOT_USED
@@ -22437,7 +22242,7 @@ class TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::AttributeDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -22490,7 +22295,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::AttributeDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -22580,7 +22385,7 @@ class TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::AttributeDef *tao_impl,
       ::CORBA::AttributeMode & mode
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -22632,7 +22437,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::AttributeDef *tao_impl,
     ::CORBA::AttributeMode & mode
     ACE_ENV_ARG_DECL_NOT_USED
@@ -22767,7 +22572,7 @@ POA_CORBA::_TAO_AttributeDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -22837,7 +22642,7 @@ POA_CORBA::_TAO_AttributeDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -23049,9 +22854,9 @@ void POA_CORBA::AttributeDef::_get_type_skel (
   CORBA::TypeCode_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -23184,9 +22989,9 @@ void POA_CORBA::AttributeDef::_get_type_def_skel (
   ::CORBA::IDLType_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -23330,9 +23135,9 @@ void POA_CORBA::AttributeDef::_set_type_def_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -23448,9 +23253,9 @@ void POA_CORBA::AttributeDef::_get_mode_skel (
   ::CORBA::AttributeMode _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -23593,9 +23398,9 @@ void POA_CORBA::AttributeDef::_set_mode_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -23706,7 +23511,7 @@ void POA_CORBA::AttributeDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::AttributeDef *_tao_impl =
-    (POA_CORBA::AttributeDef *) _tao_servant;
+    static_cast<POA_CORBA::AttributeDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -23736,7 +23541,7 @@ void POA_CORBA::AttributeDef::_non_existent_skel (
   )
 {
   POA_CORBA::AttributeDef *_tao_impl =
-    (POA_CORBA::AttributeDef *) _tao_servant;
+    static_cast<POA_CORBA::AttributeDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -23769,7 +23574,7 @@ void POA_CORBA::AttributeDef::_interface_skel (
     }
   
   POA_CORBA::AttributeDef *_tao_impl =
-    (POA_CORBA::AttributeDef *) _tao_servant;
+    static_cast<POA_CORBA::AttributeDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -23800,7 +23605,7 @@ void POA_CORBA::AttributeDef::_component_skel (
   )
 {
   POA_CORBA::AttributeDef *_tao_impl =
-    (POA_CORBA::AttributeDef *) _tao_object_reference;
+    static_cast<POA_CORBA::AttributeDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -23820,31 +23625,25 @@ CORBA::Boolean POA_CORBA::AttributeDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/AttributeDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::AttributeDef::_downcast (
@@ -23884,7 +23683,7 @@ const char* POA_CORBA::AttributeDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::AttributeDef::_dispatch (
     TAO_ServerRequest &req,
@@ -23899,7 +23698,7 @@ void POA_CORBA::AttributeDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::AttributeDef *
 POA_CORBA::AttributeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -23910,22 +23709,14 @@ POA_CORBA::AttributeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -23952,7 +23743,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_ExtAttributeDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_ExtAttributeDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ExtAttributeDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -24105,7 +23896,7 @@ class TAO_ServerRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get : public TA
 public:
   TAO_ServerRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ExtAttributeDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -24158,7 +23949,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get::TAO_ServerRequestInfo_CORBA_ExtAttributeDef_get_exceptions_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ExtAttributeDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -24248,7 +24039,7 @@ class TAO_ServerRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set : public TA
 public:
   TAO_ServerRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ExtAttributeDef *tao_impl,
       const ::CORBA::ExcDescriptionSeq & get_exceptions
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -24300,7 +24091,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set::TAO_ServerRequestInfo_CORBA_ExtAttributeDef_get_exceptions_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ExtAttributeDef *tao_impl,
     const ::CORBA::ExcDescriptionSeq & get_exceptions
     ACE_ENV_ARG_DECL_NOT_USED
@@ -24389,7 +24180,7 @@ class TAO_ServerRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get : public TA
 public:
   TAO_ServerRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ExtAttributeDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -24442,7 +24233,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get::TAO_ServerRequestInfo_CORBA_ExtAttributeDef_set_exceptions_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ExtAttributeDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -24532,7 +24323,7 @@ class TAO_ServerRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set : public TA
 public:
   TAO_ServerRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ExtAttributeDef *tao_impl,
       const ::CORBA::ExcDescriptionSeq & set_exceptions
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -24584,7 +24375,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set::TAO_ServerRequestInfo_CORBA_ExtAttributeDef_set_exceptions_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ExtAttributeDef *tao_impl,
     const ::CORBA::ExcDescriptionSeq & set_exceptions
     ACE_ENV_ARG_DECL_NOT_USED
@@ -24673,7 +24464,7 @@ class TAO_ServerRequestInfo_CORBA_ExtAttributeDef_describe_attribute : public TA
 public:
   TAO_ServerRequestInfo_CORBA_ExtAttributeDef_describe_attribute (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ExtAttributeDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -24726,7 +24517,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ExtAttributeDef_describe_attribute::TAO_ServerRequestInfo_CORBA_ExtAttributeDef_describe_attribute (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ExtAttributeDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -24862,7 +24653,7 @@ POA_CORBA::_TAO_ExtAttributeDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -24932,7 +24723,7 @@ POA_CORBA::_TAO_ExtAttributeDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -25145,9 +24936,9 @@ void POA_CORBA::ExtAttributeDef::_get_get_exceptions_skel (
   ::CORBA::ExcDescriptionSeq_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -25291,9 +25082,9 @@ void POA_CORBA::ExtAttributeDef::_set_get_exceptions_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -25409,9 +25200,9 @@ void POA_CORBA::ExtAttributeDef::_get_set_exceptions_skel (
   ::CORBA::ExcDescriptionSeq_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -25555,9 +25346,9 @@ void POA_CORBA::ExtAttributeDef::_set_set_exceptions_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -25673,9 +25464,9 @@ void POA_CORBA::ExtAttributeDef::describe_attribute_skel (
   ::CORBA::ExtAttributeDescription_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -25803,7 +25594,7 @@ void POA_CORBA::ExtAttributeDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::ExtAttributeDef *_tao_impl =
-    (POA_CORBA::ExtAttributeDef *) _tao_servant;
+    static_cast<POA_CORBA::ExtAttributeDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -25833,7 +25624,7 @@ void POA_CORBA::ExtAttributeDef::_non_existent_skel (
   )
 {
   POA_CORBA::ExtAttributeDef *_tao_impl =
-    (POA_CORBA::ExtAttributeDef *) _tao_servant;
+    static_cast<POA_CORBA::ExtAttributeDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -25866,7 +25657,7 @@ void POA_CORBA::ExtAttributeDef::_interface_skel (
     }
   
   POA_CORBA::ExtAttributeDef *_tao_impl =
-    (POA_CORBA::ExtAttributeDef *) _tao_servant;
+    static_cast<POA_CORBA::ExtAttributeDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -25897,7 +25688,7 @@ void POA_CORBA::ExtAttributeDef::_component_skel (
   )
 {
   POA_CORBA::ExtAttributeDef *_tao_impl =
-    (POA_CORBA::ExtAttributeDef *) _tao_object_reference;
+    static_cast<POA_CORBA::ExtAttributeDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -25917,35 +25708,29 @@ CORBA::Boolean POA_CORBA::ExtAttributeDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/AttributeDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ExtAttributeDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::ExtAttributeDef::_downcast (
@@ -25991,7 +25776,7 @@ const char* POA_CORBA::ExtAttributeDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::ExtAttributeDef::_dispatch (
     TAO_ServerRequest &req,
@@ -26006,7 +25791,7 @@ void POA_CORBA::ExtAttributeDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::ExtAttributeDef *
 POA_CORBA::ExtAttributeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -26017,22 +25802,14 @@ POA_CORBA::ExtAttributeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -26059,7 +25836,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_OperationDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_OperationDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_OperationDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -26266,7 +26043,7 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_result_get : public TAO_ServerReq
 public:
   TAO_ServerRequestInfo_CORBA_OperationDef_result_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::OperationDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -26319,7 +26096,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_OperationDef_result_get::TAO_ServerRequestInfo_CORBA_OperationDef_result_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::OperationDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -26409,7 +26186,7 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get : public TAO_Serve
 public:
   TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::OperationDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -26462,7 +26239,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::OperationDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -26552,7 +26329,7 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set : public TAO_Serve
 public:
   TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::OperationDef *tao_impl,
       ::CORBA::IDLType_ptr result_def
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -26604,7 +26381,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::OperationDef *tao_impl,
     ::CORBA::IDLType_ptr result_def
     ACE_ENV_ARG_DECL_NOT_USED
@@ -26693,7 +26470,7 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_params_get : public TAO_ServerReq
 public:
   TAO_ServerRequestInfo_CORBA_OperationDef_params_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::OperationDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -26746,7 +26523,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_OperationDef_params_get::TAO_ServerRequestInfo_CORBA_OperationDef_params_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::OperationDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -26836,7 +26613,7 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_params_set : public TAO_ServerReq
 public:
   TAO_ServerRequestInfo_CORBA_OperationDef_params_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::OperationDef *tao_impl,
       const ::CORBA::ParDescriptionSeq & params
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -26888,7 +26665,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_OperationDef_params_set::TAO_ServerRequestInfo_CORBA_OperationDef_params_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::OperationDef *tao_impl,
     const ::CORBA::ParDescriptionSeq & params
     ACE_ENV_ARG_DECL_NOT_USED
@@ -26977,7 +26754,7 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_mode_get : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_OperationDef_mode_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::OperationDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -27030,7 +26807,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::TAO_ServerRequestInfo_CORBA_OperationDef_mode_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::OperationDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -27120,7 +26897,7 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_mode_set : public TAO_ServerReque
 public:
   TAO_ServerRequestInfo_CORBA_OperationDef_mode_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::OperationDef *tao_impl,
       ::CORBA::OperationMode & mode
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -27172,7 +26949,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::TAO_ServerRequestInfo_CORBA_OperationDef_mode_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::OperationDef *tao_impl,
     ::CORBA::OperationMode & mode
     ACE_ENV_ARG_DECL_NOT_USED
@@ -27261,7 +27038,7 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get : public TAO_ServerR
 public:
   TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::OperationDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -27314,7 +27091,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::OperationDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -27404,7 +27181,7 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set : public TAO_ServerR
 public:
   TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::OperationDef *tao_impl,
       const ::CORBA::ContextIdSeq & contexts
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -27456,7 +27233,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::OperationDef *tao_impl,
     const ::CORBA::ContextIdSeq & contexts
     ACE_ENV_ARG_DECL_NOT_USED
@@ -27545,7 +27322,7 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get : public TAO_Serve
 public:
   TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::OperationDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -27598,7 +27375,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::OperationDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -27688,7 +27465,7 @@ class TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set : public TAO_Serve
 public:
   TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::OperationDef *tao_impl,
       const ::CORBA::ExceptionDefSeq & exceptions
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -27740,7 +27517,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::OperationDef *tao_impl,
     const ::CORBA::ExceptionDefSeq & exceptions
     ACE_ENV_ARG_DECL_NOT_USED
@@ -27875,7 +27652,7 @@ POA_CORBA::_TAO_OperationDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -27945,7 +27722,7 @@ POA_CORBA::_TAO_OperationDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_OperationDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -28313,9 +28090,9 @@ void POA_CORBA::OperationDef::_get_result_skel (
   CORBA::TypeCode_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -28448,9 +28225,9 @@ void POA_CORBA::OperationDef::_get_result_def_skel (
   ::CORBA::IDLType_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -28594,9 +28371,9 @@ void POA_CORBA::OperationDef::_set_result_def_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -28712,9 +28489,9 @@ void POA_CORBA::OperationDef::_get_params_skel (
   ::CORBA::ParDescriptionSeq_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -28858,9 +28635,9 @@ void POA_CORBA::OperationDef::_set_params_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -28976,9 +28753,9 @@ void POA_CORBA::OperationDef::_get_mode_skel (
   ::CORBA::OperationMode _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -29121,9 +28898,9 @@ void POA_CORBA::OperationDef::_set_mode_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -29239,9 +29016,9 @@ void POA_CORBA::OperationDef::_get_contexts_skel (
   ::CORBA::ContextIdSeq_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -29385,9 +29162,9 @@ void POA_CORBA::OperationDef::_set_contexts_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -29503,9 +29280,9 @@ void POA_CORBA::OperationDef::_get_exceptions_skel (
   ::CORBA::ExceptionDefSeq_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -29649,9 +29426,9 @@ void POA_CORBA::OperationDef::_set_exceptions_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -29762,7 +29539,7 @@ void POA_CORBA::OperationDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::OperationDef *_tao_impl =
-    (POA_CORBA::OperationDef *) _tao_servant;
+    static_cast<POA_CORBA::OperationDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -29792,7 +29569,7 @@ void POA_CORBA::OperationDef::_non_existent_skel (
   )
 {
   POA_CORBA::OperationDef *_tao_impl =
-    (POA_CORBA::OperationDef *) _tao_servant;
+    static_cast<POA_CORBA::OperationDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -29825,7 +29602,7 @@ void POA_CORBA::OperationDef::_interface_skel (
     }
   
   POA_CORBA::OperationDef *_tao_impl =
-    (POA_CORBA::OperationDef *) _tao_servant;
+    static_cast<POA_CORBA::OperationDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -29856,7 +29633,7 @@ void POA_CORBA::OperationDef::_component_skel (
   )
 {
   POA_CORBA::OperationDef *_tao_impl =
-    (POA_CORBA::OperationDef *) _tao_object_reference;
+    static_cast<POA_CORBA::OperationDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -29876,31 +29653,25 @@ CORBA::Boolean POA_CORBA::OperationDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/OperationDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::OperationDef::_downcast (
@@ -29940,7 +29711,7 @@ const char* POA_CORBA::OperationDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::OperationDef::_dispatch (
     TAO_ServerRequest &req,
@@ -29955,7 +29726,7 @@ void POA_CORBA::OperationDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::OperationDef *
 POA_CORBA::OperationDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -29966,22 +29737,14 @@ POA_CORBA::OperationDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -30008,7 +29771,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_InterfaceDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_InterfaceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -30179,7 +29942,7 @@ class TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get : public TAO_
 public:
   TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::InterfaceDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -30232,7 +29995,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::InterfaceDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -30322,7 +30085,7 @@ class TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set : public TAO_
 public:
   TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::InterfaceDef *tao_impl,
       const ::CORBA::InterfaceDefSeq & base_interfaces
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -30374,7 +30137,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::InterfaceDef *tao_impl,
     const ::CORBA::InterfaceDefSeq & base_interfaces
     ACE_ENV_ARG_DECL_NOT_USED
@@ -30463,7 +30226,7 @@ class TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a : public TAO_ServerRequestIn
 public:
   TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::InterfaceDef *tao_impl,
       const char * interface_id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -30518,7 +30281,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::InterfaceDef *tao_impl,
     const char * interface_id
     ACE_ENV_ARG_DECL_NOT_USED
@@ -30618,7 +30381,7 @@ class TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface : public TAO_S
 public:
   TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::InterfaceDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -30671,7 +30434,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::InterfaceDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -30761,7 +30524,7 @@ class TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute : public TAO_Ser
 public:
   TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::InterfaceDef *tao_impl,
       const char * id,
       const char * name,
@@ -30824,7 +30587,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::InterfaceDef *tao_impl,
     const char * id,
     const char * name,
@@ -30948,7 +30711,7 @@ class TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation : public TAO_Ser
 public:
   TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::InterfaceDef *tao_impl,
       const char * id,
       const char * name,
@@ -31017,7 +30780,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::InterfaceDef *tao_impl,
     const char * id,
     const char * name,
@@ -31205,7 +30968,7 @@ POA_CORBA::_TAO_InterfaceDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -31275,7 +31038,7 @@ POA_CORBA::_TAO_InterfaceDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -31529,9 +31292,9 @@ void POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
   ::CORBA::InterfaceDefSeq_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -31675,9 +31438,9 @@ void POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -31803,9 +31566,9 @@ void POA_CORBA::InterfaceDef::is_a_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -31940,9 +31703,9 @@ void POA_CORBA::InterfaceDef::describe_interface_skel (
   ::CORBA::InterfaceDef::FullInterfaceDescription_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -32093,9 +31856,9 @@ void POA_CORBA::InterfaceDef::create_attribute_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -32271,9 +32034,9 @@ void POA_CORBA::InterfaceDef::create_operation_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -32432,7 +32195,7 @@ void POA_CORBA::InterfaceDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::InterfaceDef *_tao_impl =
-    (POA_CORBA::InterfaceDef *) _tao_servant;
+    static_cast<POA_CORBA::InterfaceDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -32462,7 +32225,7 @@ void POA_CORBA::InterfaceDef::_non_existent_skel (
   )
 {
   POA_CORBA::InterfaceDef *_tao_impl =
-    (POA_CORBA::InterfaceDef *) _tao_servant;
+    static_cast<POA_CORBA::InterfaceDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -32495,7 +32258,7 @@ void POA_CORBA::InterfaceDef::_interface_skel (
     }
   
   POA_CORBA::InterfaceDef *_tao_impl =
-    (POA_CORBA::InterfaceDef *) _tao_servant;
+    static_cast<POA_CORBA::InterfaceDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -32526,7 +32289,7 @@ void POA_CORBA::InterfaceDef::_component_skel (
   )
 {
   POA_CORBA::InterfaceDef *_tao_impl =
-    (POA_CORBA::InterfaceDef *) _tao_object_reference;
+    static_cast<POA_CORBA::InterfaceDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -32546,39 +32309,33 @@ CORBA::Boolean POA_CORBA::InterfaceDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/InterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::InterfaceDef::_downcast (
@@ -32630,7 +32387,7 @@ const char* POA_CORBA::InterfaceDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::InterfaceDef::_dispatch (
     TAO_ServerRequest &req,
@@ -32645,7 +32402,7 @@ void POA_CORBA::InterfaceDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::InterfaceDef *
 POA_CORBA::InterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -32656,22 +32413,14 @@ POA_CORBA::InterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -32698,7 +32447,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_InterfaceAttrExtension_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_InterfaceAttrExtension_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_InterfaceAttrExtension_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -32811,7 +32560,7 @@ class TAO_ServerRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface
 public:
   TAO_ServerRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::InterfaceAttrExtension *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -32864,7 +32613,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface::TAO_ServerRequestInfo_CORBA_InterfaceAttrExtension_describe_ext_interface (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::InterfaceAttrExtension *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -32954,7 +32703,7 @@ class TAO_ServerRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute :
 public:
   TAO_ServerRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::InterfaceAttrExtension *tao_impl,
       const char * id,
       const char * name,
@@ -33021,7 +32770,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute::TAO_ServerRequestInfo_CORBA_InterfaceAttrExtension_create_ext_attribute (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::InterfaceAttrExtension *tao_impl,
     const char * id,
     const char * name,
@@ -33203,7 +32952,7 @@ POA_CORBA::_TAO_InterfaceAttrExtension_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -33273,7 +33022,7 @@ POA_CORBA::_TAO_InterfaceAttrExtension_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -33412,9 +33161,9 @@ void POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
   ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -33569,9 +33318,9 @@ void POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -33726,7 +33475,7 @@ void POA_CORBA::InterfaceAttrExtension::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::InterfaceAttrExtension *_tao_impl =
-    (POA_CORBA::InterfaceAttrExtension *) _tao_servant;
+    static_cast<POA_CORBA::InterfaceAttrExtension *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -33756,7 +33505,7 @@ void POA_CORBA::InterfaceAttrExtension::_non_existent_skel (
   )
 {
   POA_CORBA::InterfaceAttrExtension *_tao_impl =
-    (POA_CORBA::InterfaceAttrExtension *) _tao_servant;
+    static_cast<POA_CORBA::InterfaceAttrExtension *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -33789,7 +33538,7 @@ void POA_CORBA::InterfaceAttrExtension::_interface_skel (
     }
   
   POA_CORBA::InterfaceAttrExtension *_tao_impl =
-    (POA_CORBA::InterfaceAttrExtension *) _tao_servant;
+    static_cast<POA_CORBA::InterfaceAttrExtension *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -33820,7 +33569,7 @@ void POA_CORBA::InterfaceAttrExtension::_component_skel (
   )
 {
   POA_CORBA::InterfaceAttrExtension *_tao_impl =
-    (POA_CORBA::InterfaceAttrExtension *) _tao_object_reference;
+    static_cast<POA_CORBA::InterfaceAttrExtension *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -33840,23 +33589,17 @@ CORBA::Boolean POA_CORBA::InterfaceAttrExtension::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::InterfaceAttrExtension::_downcast (
@@ -33884,7 +33627,7 @@ const char* POA_CORBA::InterfaceAttrExtension::_interface_repository_id (void) c
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::InterfaceAttrExtension::_dispatch (
     TAO_ServerRequest &req,
@@ -33899,7 +33642,7 @@ void POA_CORBA::InterfaceAttrExtension::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::InterfaceAttrExtension *
 POA_CORBA::InterfaceAttrExtension::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -33910,22 +33653,14 @@ POA_CORBA::InterfaceAttrExtension::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -33952,7 +33687,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_ExtInterfaceDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_ExtInterfaceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ExtInterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -34171,7 +33906,7 @@ POA_CORBA::_TAO_ExtInterfaceDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -34241,7 +33976,7 @@ POA_CORBA::_TAO_ExtInterfaceDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -34322,7 +34057,7 @@ void POA_CORBA::ExtInterfaceDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::ExtInterfaceDef *_tao_impl =
-    (POA_CORBA::ExtInterfaceDef *) _tao_servant;
+    static_cast<POA_CORBA::ExtInterfaceDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -34352,7 +34087,7 @@ void POA_CORBA::ExtInterfaceDef::_non_existent_skel (
   )
 {
   POA_CORBA::ExtInterfaceDef *_tao_impl =
-    (POA_CORBA::ExtInterfaceDef *) _tao_servant;
+    static_cast<POA_CORBA::ExtInterfaceDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -34385,7 +34120,7 @@ void POA_CORBA::ExtInterfaceDef::_interface_skel (
     }
   
   POA_CORBA::ExtInterfaceDef *_tao_impl =
-    (POA_CORBA::ExtInterfaceDef *) _tao_servant;
+    static_cast<POA_CORBA::ExtInterfaceDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -34416,7 +34151,7 @@ void POA_CORBA::ExtInterfaceDef::_component_skel (
   )
 {
   POA_CORBA::ExtInterfaceDef *_tao_impl =
-    (POA_CORBA::ExtInterfaceDef *) _tao_object_reference;
+    static_cast<POA_CORBA::ExtInterfaceDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -34436,47 +34171,41 @@ CORBA::Boolean POA_CORBA::ExtInterfaceDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/InterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ExtInterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::ExtInterfaceDef::_downcast (
@@ -34540,7 +34269,7 @@ const char* POA_CORBA::ExtInterfaceDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::ExtInterfaceDef::_dispatch (
     TAO_ServerRequest &req,
@@ -34555,7 +34284,7 @@ void POA_CORBA::ExtInterfaceDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::ExtInterfaceDef *
 POA_CORBA::ExtInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -34566,22 +34295,14 @@ POA_CORBA::ExtInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -34608,7 +34329,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_AbstractInterfaceDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_AbstractInterfaceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -34825,7 +34546,7 @@ POA_CORBA::_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -34895,7 +34616,7 @@ POA_CORBA::_TAO_AbstractInterfaceDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -34975,7 +34696,7 @@ void POA_CORBA::AbstractInterfaceDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::AbstractInterfaceDef *_tao_impl =
-    (POA_CORBA::AbstractInterfaceDef *) _tao_servant;
+    static_cast<POA_CORBA::AbstractInterfaceDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -35005,7 +34726,7 @@ void POA_CORBA::AbstractInterfaceDef::_non_existent_skel (
   )
 {
   POA_CORBA::AbstractInterfaceDef *_tao_impl =
-    (POA_CORBA::AbstractInterfaceDef *) _tao_servant;
+    static_cast<POA_CORBA::AbstractInterfaceDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -35038,7 +34759,7 @@ void POA_CORBA::AbstractInterfaceDef::_interface_skel (
     }
   
   POA_CORBA::AbstractInterfaceDef *_tao_impl =
-    (POA_CORBA::AbstractInterfaceDef *) _tao_servant;
+    static_cast<POA_CORBA::AbstractInterfaceDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -35069,7 +34790,7 @@ void POA_CORBA::AbstractInterfaceDef::_component_skel (
   )
 {
   POA_CORBA::AbstractInterfaceDef *_tao_impl =
-    (POA_CORBA::AbstractInterfaceDef *) _tao_object_reference;
+    static_cast<POA_CORBA::AbstractInterfaceDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -35089,43 +34810,37 @@ CORBA::Boolean POA_CORBA::AbstractInterfaceDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/InterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::AbstractInterfaceDef::_downcast (
@@ -35183,7 +34898,7 @@ const char* POA_CORBA::AbstractInterfaceDef::_interface_repository_id (void) con
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::AbstractInterfaceDef::_dispatch (
     TAO_ServerRequest &req,
@@ -35198,7 +34913,7 @@ void POA_CORBA::AbstractInterfaceDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::AbstractInterfaceDef *
 POA_CORBA::AbstractInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -35209,22 +34924,14 @@ POA_CORBA::AbstractInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -35251,7 +34958,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_ExtAbstractInterfaceDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_ExtAbstractInterfaceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ExtAbstractInterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -35470,7 +35177,7 @@ POA_CORBA::_TAO_ExtAbstractInterfaceDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -35540,7 +35247,7 @@ POA_CORBA::_TAO_ExtAbstractInterfaceDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -35622,7 +35329,7 @@ void POA_CORBA::ExtAbstractInterfaceDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::ExtAbstractInterfaceDef *_tao_impl =
-    (POA_CORBA::ExtAbstractInterfaceDef *) _tao_servant;
+    static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -35652,7 +35359,7 @@ void POA_CORBA::ExtAbstractInterfaceDef::_non_existent_skel (
   )
 {
   POA_CORBA::ExtAbstractInterfaceDef *_tao_impl =
-    (POA_CORBA::ExtAbstractInterfaceDef *) _tao_servant;
+    static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -35685,7 +35392,7 @@ void POA_CORBA::ExtAbstractInterfaceDef::_interface_skel (
     }
   
   POA_CORBA::ExtAbstractInterfaceDef *_tao_impl =
-    (POA_CORBA::ExtAbstractInterfaceDef *) _tao_servant;
+    static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -35716,7 +35423,7 @@ void POA_CORBA::ExtAbstractInterfaceDef::_component_skel (
   )
 {
   POA_CORBA::ExtAbstractInterfaceDef *_tao_impl =
-    (POA_CORBA::ExtAbstractInterfaceDef *) _tao_object_reference;
+    static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -35736,51 +35443,45 @@ CORBA::Boolean POA_CORBA::ExtAbstractInterfaceDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/InterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ExtAbstractInterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::ExtAbstractInterfaceDef::_downcast (
@@ -35850,7 +35551,7 @@ const char* POA_CORBA::ExtAbstractInterfaceDef::_interface_repository_id (void)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::ExtAbstractInterfaceDef::_dispatch (
     TAO_ServerRequest &req,
@@ -35865,7 +35566,7 @@ void POA_CORBA::ExtAbstractInterfaceDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::ExtAbstractInterfaceDef *
 POA_CORBA::ExtAbstractInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -35876,22 +35577,14 @@ POA_CORBA::ExtAbstractInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -35918,7 +35611,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_LocalInterfaceDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_LocalInterfaceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -36135,7 +35828,7 @@ POA_CORBA::_TAO_LocalInterfaceDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -36205,7 +35898,7 @@ POA_CORBA::_TAO_LocalInterfaceDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -36285,7 +35978,7 @@ void POA_CORBA::LocalInterfaceDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::LocalInterfaceDef *_tao_impl =
-    (POA_CORBA::LocalInterfaceDef *) _tao_servant;
+    static_cast<POA_CORBA::LocalInterfaceDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -36315,7 +36008,7 @@ void POA_CORBA::LocalInterfaceDef::_non_existent_skel (
   )
 {
   POA_CORBA::LocalInterfaceDef *_tao_impl =
-    (POA_CORBA::LocalInterfaceDef *) _tao_servant;
+    static_cast<POA_CORBA::LocalInterfaceDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -36348,7 +36041,7 @@ void POA_CORBA::LocalInterfaceDef::_interface_skel (
     }
   
   POA_CORBA::LocalInterfaceDef *_tao_impl =
-    (POA_CORBA::LocalInterfaceDef *) _tao_servant;
+    static_cast<POA_CORBA::LocalInterfaceDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -36379,7 +36072,7 @@ void POA_CORBA::LocalInterfaceDef::_component_skel (
   )
 {
   POA_CORBA::LocalInterfaceDef *_tao_impl =
-    (POA_CORBA::LocalInterfaceDef *) _tao_object_reference;
+    static_cast<POA_CORBA::LocalInterfaceDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -36399,43 +36092,37 @@ CORBA::Boolean POA_CORBA::LocalInterfaceDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/InterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalInterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::LocalInterfaceDef::_downcast (
@@ -36493,7 +36180,7 @@ const char* POA_CORBA::LocalInterfaceDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::LocalInterfaceDef::_dispatch (
     TAO_ServerRequest &req,
@@ -36508,7 +36195,7 @@ void POA_CORBA::LocalInterfaceDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::LocalInterfaceDef *
 POA_CORBA::LocalInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -36519,22 +36206,14 @@ POA_CORBA::LocalInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -36561,7 +36240,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_ExtLocalInterfaceDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_ExtLocalInterfaceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ExtLocalInterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -36780,7 +36459,7 @@ POA_CORBA::_TAO_ExtLocalInterfaceDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -36850,7 +36529,7 @@ POA_CORBA::_TAO_ExtLocalInterfaceDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -36932,7 +36611,7 @@ void POA_CORBA::ExtLocalInterfaceDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::ExtLocalInterfaceDef *_tao_impl =
-    (POA_CORBA::ExtLocalInterfaceDef *) _tao_servant;
+    static_cast<POA_CORBA::ExtLocalInterfaceDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -36962,7 +36641,7 @@ void POA_CORBA::ExtLocalInterfaceDef::_non_existent_skel (
   )
 {
   POA_CORBA::ExtLocalInterfaceDef *_tao_impl =
-    (POA_CORBA::ExtLocalInterfaceDef *) _tao_servant;
+    static_cast<POA_CORBA::ExtLocalInterfaceDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -36995,7 +36674,7 @@ void POA_CORBA::ExtLocalInterfaceDef::_interface_skel (
     }
   
   POA_CORBA::ExtLocalInterfaceDef *_tao_impl =
-    (POA_CORBA::ExtLocalInterfaceDef *) _tao_servant;
+    static_cast<POA_CORBA::ExtLocalInterfaceDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -37026,7 +36705,7 @@ void POA_CORBA::ExtLocalInterfaceDef::_component_skel (
   )
 {
   POA_CORBA::ExtLocalInterfaceDef *_tao_impl =
-    (POA_CORBA::ExtLocalInterfaceDef *) _tao_object_reference;
+    static_cast<POA_CORBA::ExtLocalInterfaceDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -37046,51 +36725,45 @@ CORBA::Boolean POA_CORBA::ExtLocalInterfaceDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/InterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalInterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ExtLocalInterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::ExtLocalInterfaceDef::_downcast (
@@ -37160,7 +36833,7 @@ const char* POA_CORBA::ExtLocalInterfaceDef::_interface_repository_id (void) con
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::ExtLocalInterfaceDef::_dispatch (
     TAO_ServerRequest &req,
@@ -37175,7 +36848,7 @@ void POA_CORBA::ExtLocalInterfaceDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::ExtLocalInterfaceDef *
 POA_CORBA::ExtLocalInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -37186,22 +36859,14 @@ POA_CORBA::ExtLocalInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h
index e7ce65c380a..06d29cb6ef1 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h
@@ -28,12 +28,11 @@
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:390
 
-#ifndef _TAO_IDL_SERVER_IFR_BASICS_H_
-#define _TAO_IDL_SERVER_IFR_BASICS_H_
+#ifndef _TAO_IDL_ORIG_IFR_BASICS_H_
+#define _TAO_IDL_ORIG_IFR_BASICS_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ParameterModeS.h"
 #include "tao/IFR_Client/IFR_BasicC.h"
 #include "IFR_BaseS.h"
 
@@ -16316,6 +16315,7 @@ namespace POA_CORBA
 // be\be_codegen.cpp:997
 
 #include "IFR_BasicS_T.h"
+
 #if defined (__ACE_INLINE__)
 #include "IFR_BasicS.inl"
 #endif /* defined INLINE */
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp
index a39452faa2a..b306a172bc0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp
@@ -28,8 +28,8 @@
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:683
 
-#ifndef _TAO_IDL_SERVER_IFR_BASICS_T_CPP_
-#define _TAO_IDL_SERVER_IFR_BASICS_T_CPP_
+#ifndef _TAO_IDL_ORIG_IFR_BASICS_T_CPP_
+#define _TAO_IDL_ORIG_IFR_BASICS_T_CPP_
 
 #include "IFR_BasicS_T.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h
index f7440300c4b..888e59361a0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h
@@ -28,8 +28,8 @@
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:546
 
-#ifndef _TAO_IDL_SERVER_IFR_BASICS_T_H_
-#define _TAO_IDL_SERVER_IFR_BASICS_T_H_
+#ifndef _TAO_IDL_ORIG_IFR_BASICS_T_H_
+#define _TAO_IDL_ORIG_IFR_BASICS_T_H_
 
 #include /**/ "ace/pre.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
index 766daf322ca..2c07eab9f55 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
@@ -29,12 +29,13 @@
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:609
 
-#ifndef _TAO_IDL_SERVER_IFR_COMPONENTSS_CPP_
-#define _TAO_IDL_SERVER_IFR_COMPONENTSS_CPP_
+#ifndef _TAO_IDL_ORIG_IFR_COMPONENTSS_CPP_
+#define _TAO_IDL_ORIG_IFR_COMPONENTSS_CPP_
 
 
 #include "IFR_ComponentsS.h"
-#include "tao/PortableServer/Object_Adapter.h"
+#include "tao/PortableServer/Servant_Upcall.h"
+#include "tao/PortableServer/ForwardRequestC.h"
 #include "tao/PortableServer/Operation_Table.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/ORB_Core.h"
@@ -70,20 +71,20 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:574
+  // be\be_visitor_arg_traits.cpp:624
 
 #if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_SS_)
 #define _CORBA_DEFINITIONKIND__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::DefinitionKind>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::DefinitionKind>
     : public
         Basic_Arg_Traits_T<
             CORBA::DefinitionKind
@@ -162,13 +163,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_)
 #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::InterfaceDefSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::InterfaceDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDefSeq,
@@ -198,13 +199,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_SS_)
 #define _CORBA_VALUEDEFSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::ValueDefSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::ValueDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ValueDefSeq,
@@ -217,13 +218,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_SS_)
 #define _CORBA_INITIALIZERSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::InitializerSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::InitializerSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InitializerSeq,
@@ -236,13 +237,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_SS_)
 #define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::ExtInitializerSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExtInitializerSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExtInitializerSeq,
@@ -255,13 +256,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_SS_)
 #define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::ExceptionDefSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExceptionDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExceptionDefSeq,
@@ -274,13 +275,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:574
+  // be\be_visitor_arg_traits.cpp:624
 
 #if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_SS_)
 #define _CORBA_OPERATIONMODE__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::OperationMode>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::OperationMode>
     : public
         Basic_Arg_Traits_T<
             CORBA::OperationMode
@@ -291,13 +292,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_SS_)
 #define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::ParDescriptionSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::ParDescriptionSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ParDescriptionSeq,
@@ -310,13 +311,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_SS_)
 #define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::ContextIdSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::ContextIdSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ContextIdSeq,
@@ -514,7 +515,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_ComponentIR_EventDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_ComponentIR_EventDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_EventDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -749,7 +750,7 @@ POA_CORBA::ComponentIR::_TAO_EventDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -819,7 +820,7 @@ POA_CORBA::ComponentIR::_TAO_EventDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -900,7 +901,7 @@ void POA_CORBA::ComponentIR::EventDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::ComponentIR::EventDef *_tao_impl =
-    (POA_CORBA::ComponentIR::EventDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::EventDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -930,7 +931,7 @@ void POA_CORBA::ComponentIR::EventDef::_non_existent_skel (
   )
 {
   POA_CORBA::ComponentIR::EventDef *_tao_impl =
-    (POA_CORBA::ComponentIR::EventDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::EventDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -963,7 +964,7 @@ void POA_CORBA::ComponentIR::EventDef::_interface_skel (
     }
   
   POA_CORBA::ComponentIR::EventDef *_tao_impl =
-    (POA_CORBA::ComponentIR::EventDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::EventDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -994,7 +995,7 @@ void POA_CORBA::ComponentIR::EventDef::_component_skel (
   )
 {
   POA_CORBA::ComponentIR::EventDef *_tao_impl =
-    (POA_CORBA::ComponentIR::EventDef *) _tao_object_reference;
+    static_cast<POA_CORBA::ComponentIR::EventDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -1014,47 +1015,41 @@ CORBA::Boolean POA_CORBA::ComponentIR::EventDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ValueDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ExtValueDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/EventDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::ComponentIR::EventDef::_downcast (
@@ -1118,7 +1113,7 @@ const char* POA_CORBA::ComponentIR::EventDef::_interface_repository_id (void) co
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::ComponentIR::EventDef::_dispatch (
     TAO_ServerRequest &req,
@@ -1133,7 +1128,7 @@ void POA_CORBA::ComponentIR::EventDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::ComponentIR::EventDef *
 POA_CORBA::ComponentIR::EventDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -1144,22 +1139,14 @@ POA_CORBA::ComponentIR::EventDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -1186,7 +1173,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_ComponentIR_Container_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_ComponentIR_Container_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_Container_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -1340,7 +1327,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_component : publi
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_component (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::Container *tao_impl,
       const char * id,
       const char * name,
@@ -1403,7 +1390,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_component::TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_component (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::Container *tao_impl,
     const char * id,
     const char * name,
@@ -1527,7 +1514,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_home : public TAO
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_home (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::Container *tao_impl,
       const char * id,
       const char * name,
@@ -1594,7 +1581,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_home::TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_home (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::Container *tao_impl,
     const char * id,
     const char * name,
@@ -1730,7 +1717,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_event : public TA
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_event (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::Container *tao_impl,
       const char * id,
       const char * name,
@@ -1803,7 +1790,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_event::TAO_ServerRequestInfo_CORBA_ComponentIR_Container_create_event (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::Container *tao_impl,
     const char * id,
     const char * name,
@@ -2003,7 +1990,7 @@ POA_CORBA::ComponentIR::_TAO_Container_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -2073,7 +2060,7 @@ POA_CORBA::ComponentIR::_TAO_Container_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -2273,9 +2260,9 @@ void POA_CORBA::ComponentIR::Container::create_component_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -2449,9 +2436,9 @@ void POA_CORBA::ComponentIR::Container::create_home_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -2639,9 +2626,9 @@ void POA_CORBA::ComponentIR::Container::create_event_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -2808,7 +2795,7 @@ void POA_CORBA::ComponentIR::Container::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::ComponentIR::Container *_tao_impl =
-    (POA_CORBA::ComponentIR::Container *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::Container *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -2838,7 +2825,7 @@ void POA_CORBA::ComponentIR::Container::_non_existent_skel (
   )
 {
   POA_CORBA::ComponentIR::Container *_tao_impl =
-    (POA_CORBA::ComponentIR::Container *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::Container *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -2871,7 +2858,7 @@ void POA_CORBA::ComponentIR::Container::_interface_skel (
     }
   
   POA_CORBA::ComponentIR::Container *_tao_impl =
-    (POA_CORBA::ComponentIR::Container *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::Container *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -2902,7 +2889,7 @@ void POA_CORBA::ComponentIR::Container::_component_skel (
   )
 {
   POA_CORBA::ComponentIR::Container *_tao_impl =
-    (POA_CORBA::ComponentIR::Container *) _tao_object_reference;
+    static_cast<POA_CORBA::ComponentIR::Container *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -2922,31 +2909,25 @@ CORBA::Boolean POA_CORBA::ComponentIR::Container::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::ComponentIR::Container::_downcast (
@@ -2986,7 +2967,7 @@ const char* POA_CORBA::ComponentIR::Container::_interface_repository_id (void) c
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::ComponentIR::Container::_dispatch (
     TAO_ServerRequest &req,
@@ -3001,7 +2982,7 @@ void POA_CORBA::ComponentIR::Container::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::ComponentIR::Container *
 POA_CORBA::ComponentIR::Container::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -3012,22 +2993,14 @@ POA_CORBA::ComponentIR::Container::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -3054,7 +3027,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_ComponentIR_ModuleDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_ComponentIR_ModuleDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_ModuleDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -3266,7 +3239,7 @@ POA_CORBA::ComponentIR::_TAO_ModuleDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -3336,7 +3309,7 @@ POA_CORBA::ComponentIR::_TAO_ModuleDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -3416,7 +3389,7 @@ void POA_CORBA::ComponentIR::ModuleDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::ComponentIR::ModuleDef *_tao_impl =
-    (POA_CORBA::ComponentIR::ModuleDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::ModuleDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -3446,7 +3419,7 @@ void POA_CORBA::ComponentIR::ModuleDef::_non_existent_skel (
   )
 {
   POA_CORBA::ComponentIR::ModuleDef *_tao_impl =
-    (POA_CORBA::ComponentIR::ModuleDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::ModuleDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -3479,7 +3452,7 @@ void POA_CORBA::ComponentIR::ModuleDef::_interface_skel (
     }
   
   POA_CORBA::ComponentIR::ModuleDef *_tao_impl =
-    (POA_CORBA::ComponentIR::ModuleDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::ModuleDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -3510,7 +3483,7 @@ void POA_CORBA::ComponentIR::ModuleDef::_component_skel (
   )
 {
   POA_CORBA::ComponentIR::ModuleDef *_tao_impl =
-    (POA_CORBA::ComponentIR::ModuleDef *) _tao_object_reference;
+    static_cast<POA_CORBA::ComponentIR::ModuleDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -3530,43 +3503,37 @@ CORBA::Boolean POA_CORBA::ComponentIR::ModuleDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ModuleDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/ModuleDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::ComponentIR::ModuleDef::_downcast (
@@ -3624,7 +3591,7 @@ const char* POA_CORBA::ComponentIR::ModuleDef::_interface_repository_id (void) c
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::ComponentIR::ModuleDef::_dispatch (
     TAO_ServerRequest &req,
@@ -3639,7 +3606,7 @@ void POA_CORBA::ComponentIR::ModuleDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::ComponentIR::ModuleDef *
 POA_CORBA::ComponentIR::ModuleDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -3650,22 +3617,14 @@ POA_CORBA::ComponentIR::ModuleDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -3692,7 +3651,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_ComponentIR_Repository_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_ComponentIR_Repository_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_Repository_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -3903,7 +3862,7 @@ POA_CORBA::ComponentIR::_TAO_Repository_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -3973,7 +3932,7 @@ POA_CORBA::ComponentIR::_TAO_Repository_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -4052,7 +4011,7 @@ void POA_CORBA::ComponentIR::Repository::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::ComponentIR::Repository *_tao_impl =
-    (POA_CORBA::ComponentIR::Repository *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::Repository *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -4082,7 +4041,7 @@ void POA_CORBA::ComponentIR::Repository::_non_existent_skel (
   )
 {
   POA_CORBA::ComponentIR::Repository *_tao_impl =
-    (POA_CORBA::ComponentIR::Repository *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::Repository *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -4115,7 +4074,7 @@ void POA_CORBA::ComponentIR::Repository::_interface_skel (
     }
   
   POA_CORBA::ComponentIR::Repository *_tao_impl =
-    (POA_CORBA::ComponentIR::Repository *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::Repository *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -4146,7 +4105,7 @@ void POA_CORBA::ComponentIR::Repository::_component_skel (
   )
 {
   POA_CORBA::ComponentIR::Repository *_tao_impl =
-    (POA_CORBA::ComponentIR::Repository *) _tao_object_reference;
+    static_cast<POA_CORBA::ComponentIR::Repository *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -4166,39 +4125,33 @@ CORBA::Boolean POA_CORBA::ComponentIR::Repository::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Repository:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/Repository:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::ComponentIR::Repository::_downcast (
@@ -4250,7 +4203,7 @@ const char* POA_CORBA::ComponentIR::Repository::_interface_repository_id (void)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::ComponentIR::Repository::_dispatch (
     TAO_ServerRequest &req,
@@ -4265,7 +4218,7 @@ void POA_CORBA::ComponentIR::Repository::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::ComponentIR::Repository *
 POA_CORBA::ComponentIR::Repository::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -4276,22 +4229,14 @@ POA_CORBA::ComponentIR::Repository::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -4318,7 +4263,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_ComponentIR_ProvidesDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_ComponentIR_ProvidesDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_ProvidesDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -4463,7 +4408,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get : p
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::ProvidesDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -4516,7 +4461,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get::TAO_ServerRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::ProvidesDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -4606,7 +4551,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set : p
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::ProvidesDef *tao_impl,
       ::CORBA::InterfaceDef_ptr interface_type
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -4658,7 +4603,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set::TAO_ServerRequestInfo_CORBA_ComponentIR_ProvidesDef_interface_type_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::ProvidesDef *tao_impl,
     ::CORBA::InterfaceDef_ptr interface_type
     ACE_ENV_ARG_DECL_NOT_USED
@@ -4793,7 +4738,7 @@ POA_CORBA::ComponentIR::_TAO_ProvidesDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -4863,7 +4808,7 @@ POA_CORBA::ComponentIR::_TAO_ProvidesDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -4997,9 +4942,9 @@ void POA_CORBA::ComponentIR::ProvidesDef::_get_interface_type_skel (
   ::CORBA::InterfaceDef_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -5143,9 +5088,9 @@ void POA_CORBA::ComponentIR::ProvidesDef::_set_interface_type_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -5256,7 +5201,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::ComponentIR::ProvidesDef *_tao_impl =
-    (POA_CORBA::ComponentIR::ProvidesDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -5286,7 +5231,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_non_existent_skel (
   )
 {
   POA_CORBA::ComponentIR::ProvidesDef *_tao_impl =
-    (POA_CORBA::ComponentIR::ProvidesDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -5319,7 +5264,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_interface_skel (
     }
   
   POA_CORBA::ComponentIR::ProvidesDef *_tao_impl =
-    (POA_CORBA::ComponentIR::ProvidesDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -5350,7 +5295,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_component_skel (
   )
 {
   POA_CORBA::ComponentIR::ProvidesDef *_tao_impl =
-    (POA_CORBA::ComponentIR::ProvidesDef *) _tao_object_reference;
+    static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -5370,31 +5315,25 @@ CORBA::Boolean POA_CORBA::ComponentIR::ProvidesDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/ProvidesDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::ComponentIR::ProvidesDef::_downcast (
@@ -5434,7 +5373,7 @@ const char* POA_CORBA::ComponentIR::ProvidesDef::_interface_repository_id (void)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::ComponentIR::ProvidesDef::_dispatch (
     TAO_ServerRequest &req,
@@ -5449,7 +5388,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::ComponentIR::ProvidesDef *
 POA_CORBA::ComponentIR::ProvidesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -5460,22 +5399,14 @@ POA_CORBA::ComponentIR::ProvidesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -5502,7 +5433,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_ComponentIR_UsesDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_ComponentIR_UsesDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_UsesDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -5649,7 +5580,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get : publi
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::UsesDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -5702,7 +5633,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get::TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::UsesDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -5792,7 +5723,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set : publi
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::UsesDef *tao_impl,
       ::CORBA::InterfaceDef_ptr interface_type
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -5844,7 +5775,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set::TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_interface_type_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::UsesDef *tao_impl,
     ::CORBA::InterfaceDef_ptr interface_type
     ACE_ENV_ARG_DECL_NOT_USED
@@ -5933,7 +5864,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get : public T
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::UsesDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -5986,7 +5917,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get::TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::UsesDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -6076,7 +6007,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set : public T
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::UsesDef *tao_impl,
       const ::CORBA::Boolean & is_multiple
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -6128,7 +6059,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set::TAO_ServerRequestInfo_CORBA_ComponentIR_UsesDef_is_multiple_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::UsesDef *tao_impl,
     const ::CORBA::Boolean & is_multiple
     ACE_ENV_ARG_DECL_NOT_USED
@@ -6263,7 +6194,7 @@ POA_CORBA::ComponentIR::_TAO_UsesDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -6333,7 +6264,7 @@ POA_CORBA::ComponentIR::_TAO_UsesDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -6519,9 +6450,9 @@ void POA_CORBA::ComponentIR::UsesDef::_get_interface_type_skel (
   ::CORBA::InterfaceDef_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -6665,9 +6596,9 @@ void POA_CORBA::ComponentIR::UsesDef::_set_interface_type_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -6783,9 +6714,9 @@ void POA_CORBA::ComponentIR::UsesDef::_get_is_multiple_skel (
   CORBA::Boolean _tao_retval = 0;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -6928,9 +6859,9 @@ void POA_CORBA::ComponentIR::UsesDef::_set_is_multiple_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -7041,7 +6972,7 @@ void POA_CORBA::ComponentIR::UsesDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::ComponentIR::UsesDef *_tao_impl =
-    (POA_CORBA::ComponentIR::UsesDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::UsesDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -7071,7 +7002,7 @@ void POA_CORBA::ComponentIR::UsesDef::_non_existent_skel (
   )
 {
   POA_CORBA::ComponentIR::UsesDef *_tao_impl =
-    (POA_CORBA::ComponentIR::UsesDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::UsesDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -7104,7 +7035,7 @@ void POA_CORBA::ComponentIR::UsesDef::_interface_skel (
     }
   
   POA_CORBA::ComponentIR::UsesDef *_tao_impl =
-    (POA_CORBA::ComponentIR::UsesDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::UsesDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -7135,7 +7066,7 @@ void POA_CORBA::ComponentIR::UsesDef::_component_skel (
   )
 {
   POA_CORBA::ComponentIR::UsesDef *_tao_impl =
-    (POA_CORBA::ComponentIR::UsesDef *) _tao_object_reference;
+    static_cast<POA_CORBA::ComponentIR::UsesDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -7155,31 +7086,25 @@ CORBA::Boolean POA_CORBA::ComponentIR::UsesDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/UsesDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::ComponentIR::UsesDef::_downcast (
@@ -7219,7 +7144,7 @@ const char* POA_CORBA::ComponentIR::UsesDef::_interface_repository_id (void) con
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::ComponentIR::UsesDef::_dispatch (
     TAO_ServerRequest &req,
@@ -7234,7 +7159,7 @@ void POA_CORBA::ComponentIR::UsesDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::ComponentIR::UsesDef *
 POA_CORBA::ComponentIR::UsesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -7245,22 +7170,14 @@ POA_CORBA::ComponentIR::UsesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -7287,7 +7204,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_ComponentIR_EventPortDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_ComponentIR_EventPortDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_EventPortDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -7433,7 +7350,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_event_get : public TA
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_event_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::EventPortDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -7486,7 +7403,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_event_get::TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_event_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::EventPortDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -7576,7 +7493,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_event_set : public TA
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_event_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::EventPortDef *tao_impl,
       ::CORBA::ComponentIR::EventDef_ptr event
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -7628,7 +7545,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_event_set::TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_event_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::EventPortDef *tao_impl,
     ::CORBA::ComponentIR::EventDef_ptr event
     ACE_ENV_ARG_DECL_NOT_USED
@@ -7717,7 +7634,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_is_a : public TAO_Ser
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_is_a (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::EventPortDef *tao_impl,
       const char * event_id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -7772,7 +7689,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_is_a::TAO_ServerRequestInfo_CORBA_ComponentIR_EventPortDef_is_a (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::EventPortDef *tao_impl,
     const char * event_id
     ACE_ENV_ARG_DECL_NOT_USED
@@ -7918,7 +7835,7 @@ POA_CORBA::ComponentIR::_TAO_EventPortDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -7988,7 +7905,7 @@ POA_CORBA::ComponentIR::_TAO_EventPortDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -8149,9 +8066,9 @@ void POA_CORBA::ComponentIR::EventPortDef::_get_event_skel (
   ::CORBA::ComponentIR::EventDef_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -8295,9 +8212,9 @@ void POA_CORBA::ComponentIR::EventPortDef::_set_event_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -8423,9 +8340,9 @@ void POA_CORBA::ComponentIR::EventPortDef::is_a_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -8555,7 +8472,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::ComponentIR::EventPortDef *_tao_impl =
-    (POA_CORBA::ComponentIR::EventPortDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::EventPortDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -8585,7 +8502,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_non_existent_skel (
   )
 {
   POA_CORBA::ComponentIR::EventPortDef *_tao_impl =
-    (POA_CORBA::ComponentIR::EventPortDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::EventPortDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -8618,7 +8535,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_interface_skel (
     }
   
   POA_CORBA::ComponentIR::EventPortDef *_tao_impl =
-    (POA_CORBA::ComponentIR::EventPortDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::EventPortDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -8649,7 +8566,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_component_skel (
   )
 {
   POA_CORBA::ComponentIR::EventPortDef *_tao_impl =
-    (POA_CORBA::ComponentIR::EventPortDef *) _tao_object_reference;
+    static_cast<POA_CORBA::ComponentIR::EventPortDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -8669,31 +8586,25 @@ CORBA::Boolean POA_CORBA::ComponentIR::EventPortDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::ComponentIR::EventPortDef::_downcast (
@@ -8733,7 +8644,7 @@ const char* POA_CORBA::ComponentIR::EventPortDef::_interface_repository_id (void
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::ComponentIR::EventPortDef::_dispatch (
     TAO_ServerRequest &req,
@@ -8748,7 +8659,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::ComponentIR::EventPortDef *
 POA_CORBA::ComponentIR::EventPortDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -8759,22 +8670,14 @@ POA_CORBA::ComponentIR::EventPortDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -8801,7 +8704,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_ComponentIR_EmitsDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_ComponentIR_EmitsDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_EmitsDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -8993,7 +8896,7 @@ POA_CORBA::ComponentIR::_TAO_EmitsDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -9063,7 +8966,7 @@ POA_CORBA::ComponentIR::_TAO_EmitsDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -9141,7 +9044,7 @@ void POA_CORBA::ComponentIR::EmitsDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::ComponentIR::EmitsDef *_tao_impl =
-    (POA_CORBA::ComponentIR::EmitsDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::EmitsDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -9171,7 +9074,7 @@ void POA_CORBA::ComponentIR::EmitsDef::_non_existent_skel (
   )
 {
   POA_CORBA::ComponentIR::EmitsDef *_tao_impl =
-    (POA_CORBA::ComponentIR::EmitsDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::EmitsDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -9204,7 +9107,7 @@ void POA_CORBA::ComponentIR::EmitsDef::_interface_skel (
     }
   
   POA_CORBA::ComponentIR::EmitsDef *_tao_impl =
-    (POA_CORBA::ComponentIR::EmitsDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::EmitsDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -9235,7 +9138,7 @@ void POA_CORBA::ComponentIR::EmitsDef::_component_skel (
   )
 {
   POA_CORBA::ComponentIR::EmitsDef *_tao_impl =
-    (POA_CORBA::ComponentIR::EmitsDef *) _tao_object_reference;
+    static_cast<POA_CORBA::ComponentIR::EmitsDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -9255,35 +9158,29 @@ CORBA::Boolean POA_CORBA::ComponentIR::EmitsDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/EmitsDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::ComponentIR::EmitsDef::_downcast (
@@ -9329,7 +9226,7 @@ const char* POA_CORBA::ComponentIR::EmitsDef::_interface_repository_id (void) co
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::ComponentIR::EmitsDef::_dispatch (
     TAO_ServerRequest &req,
@@ -9344,7 +9241,7 @@ void POA_CORBA::ComponentIR::EmitsDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::ComponentIR::EmitsDef *
 POA_CORBA::ComponentIR::EmitsDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -9355,22 +9252,14 @@ POA_CORBA::ComponentIR::EmitsDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -9397,7 +9286,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_ComponentIR_PublishesDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_ComponentIR_PublishesDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_PublishesDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -9589,7 +9478,7 @@ POA_CORBA::ComponentIR::_TAO_PublishesDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -9659,7 +9548,7 @@ POA_CORBA::ComponentIR::_TAO_PublishesDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -9737,7 +9626,7 @@ void POA_CORBA::ComponentIR::PublishesDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::ComponentIR::PublishesDef *_tao_impl =
-    (POA_CORBA::ComponentIR::PublishesDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::PublishesDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -9767,7 +9656,7 @@ void POA_CORBA::ComponentIR::PublishesDef::_non_existent_skel (
   )
 {
   POA_CORBA::ComponentIR::PublishesDef *_tao_impl =
-    (POA_CORBA::ComponentIR::PublishesDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::PublishesDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -9800,7 +9689,7 @@ void POA_CORBA::ComponentIR::PublishesDef::_interface_skel (
     }
   
   POA_CORBA::ComponentIR::PublishesDef *_tao_impl =
-    (POA_CORBA::ComponentIR::PublishesDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::PublishesDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -9831,7 +9720,7 @@ void POA_CORBA::ComponentIR::PublishesDef::_component_skel (
   )
 {
   POA_CORBA::ComponentIR::PublishesDef *_tao_impl =
-    (POA_CORBA::ComponentIR::PublishesDef *) _tao_object_reference;
+    static_cast<POA_CORBA::ComponentIR::PublishesDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -9851,35 +9740,29 @@ CORBA::Boolean POA_CORBA::ComponentIR::PublishesDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/PublishesDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::ComponentIR::PublishesDef::_downcast (
@@ -9925,7 +9808,7 @@ const char* POA_CORBA::ComponentIR::PublishesDef::_interface_repository_id (void
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::ComponentIR::PublishesDef::_dispatch (
     TAO_ServerRequest &req,
@@ -9940,7 +9823,7 @@ void POA_CORBA::ComponentIR::PublishesDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::ComponentIR::PublishesDef *
 POA_CORBA::ComponentIR::PublishesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -9951,22 +9834,14 @@ POA_CORBA::ComponentIR::PublishesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -9993,7 +9868,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_ComponentIR_ConsumesDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_ComponentIR_ConsumesDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_ConsumesDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -10185,7 +10060,7 @@ POA_CORBA::ComponentIR::_TAO_ConsumesDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -10255,7 +10130,7 @@ POA_CORBA::ComponentIR::_TAO_ConsumesDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -10333,7 +10208,7 @@ void POA_CORBA::ComponentIR::ConsumesDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::ComponentIR::ConsumesDef *_tao_impl =
-    (POA_CORBA::ComponentIR::ConsumesDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -10363,7 +10238,7 @@ void POA_CORBA::ComponentIR::ConsumesDef::_non_existent_skel (
   )
 {
   POA_CORBA::ComponentIR::ConsumesDef *_tao_impl =
-    (POA_CORBA::ComponentIR::ConsumesDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -10396,7 +10271,7 @@ void POA_CORBA::ComponentIR::ConsumesDef::_interface_skel (
     }
   
   POA_CORBA::ComponentIR::ConsumesDef *_tao_impl =
-    (POA_CORBA::ComponentIR::ConsumesDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -10427,7 +10302,7 @@ void POA_CORBA::ComponentIR::ConsumesDef::_component_skel (
   )
 {
   POA_CORBA::ComponentIR::ConsumesDef *_tao_impl =
-    (POA_CORBA::ComponentIR::ConsumesDef *) _tao_object_reference;
+    static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -10447,35 +10322,29 @@ CORBA::Boolean POA_CORBA::ComponentIR::ConsumesDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/ConsumesDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::ComponentIR::ConsumesDef::_downcast (
@@ -10521,7 +10390,7 @@ const char* POA_CORBA::ComponentIR::ConsumesDef::_interface_repository_id (void)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::ComponentIR::ConsumesDef::_dispatch (
     TAO_ServerRequest &req,
@@ -10536,7 +10405,7 @@ void POA_CORBA::ComponentIR::ConsumesDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::ComponentIR::ConsumesDef *
 POA_CORBA::ComponentIR::ConsumesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -10547,22 +10416,14 @@ POA_CORBA::ComponentIR::ConsumesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -10589,7 +10450,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_ComponentIR_ComponentDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_ComponentIR_ComponentDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_ComponentDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -10772,7 +10633,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get :
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::ComponentDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -10825,7 +10686,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get::TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::ComponentDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -10915,7 +10776,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set :
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::ComponentDef *tao_impl,
       ::CORBA::ComponentIR::ComponentDef_ptr base_component
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -10967,7 +10828,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set::TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_base_component_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::ComponentDef *tao_impl,
     ::CORBA::ComponentIR::ComponentDef_ptr base_component
     ACE_ENV_ARG_DECL_NOT_USED
@@ -11056,7 +10917,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::ComponentDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -11109,7 +10970,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get::TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::ComponentDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -11199,7 +11060,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::ComponentDef *tao_impl,
       const ::CORBA::InterfaceDefSeq & supported_interfaces
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -11251,7 +11112,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set::TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_supported_interfaces_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::ComponentDef *tao_impl,
     const ::CORBA::InterfaceDefSeq & supported_interfaces
     ACE_ENV_ARG_DECL_NOT_USED
@@ -11340,7 +11201,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides : pub
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::ComponentDef *tao_impl,
       const char * id,
       const char * name,
@@ -11401,7 +11262,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides::TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_provides (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::ComponentDef *tao_impl,
     const char * id,
     const char * name,
@@ -11519,7 +11380,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses : public
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::ComponentDef *tao_impl,
       const char * id,
       const char * name,
@@ -11582,7 +11443,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses::TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_uses (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::ComponentDef *tao_impl,
     const char * id,
     const char * name,
@@ -11706,7 +11567,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits : public
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::ComponentDef *tao_impl,
       const char * id,
       const char * name,
@@ -11767,7 +11628,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits::TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_emits (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::ComponentDef *tao_impl,
     const char * id,
     const char * name,
@@ -11885,7 +11746,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes : pu
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::ComponentDef *tao_impl,
       const char * id,
       const char * name,
@@ -11946,7 +11807,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes::TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_publishes (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::ComponentDef *tao_impl,
     const char * id,
     const char * name,
@@ -12064,7 +11925,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes : pub
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::ComponentDef *tao_impl,
       const char * id,
       const char * name,
@@ -12125,7 +11986,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes::TAO_ServerRequestInfo_CORBA_ComponentIR_ComponentDef_create_consumes (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::ComponentDef *tao_impl,
     const char * id,
     const char * name,
@@ -12289,7 +12150,7 @@ POA_CORBA::ComponentIR::_TAO_ComponentDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -12359,7 +12220,7 @@ POA_CORBA::ComponentIR::_TAO_ComponentDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -12701,9 +12562,9 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_base_component_skel (
   ::CORBA::ComponentIR::ComponentDef_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -12847,9 +12708,9 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_base_component_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -12965,9 +12826,9 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_supported_interfaces_skel (
   ::CORBA::InterfaceDefSeq_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -13111,9 +12972,9 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_supported_interfaces_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -13245,9 +13106,9 @@ void POA_CORBA::ComponentIR::ComponentDef::create_provides_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -13413,9 +13274,9 @@ void POA_CORBA::ComponentIR::ComponentDef::create_uses_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -13583,9 +13444,9 @@ void POA_CORBA::ComponentIR::ComponentDef::create_emits_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -13749,9 +13610,9 @@ void POA_CORBA::ComponentIR::ComponentDef::create_publishes_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -13915,9 +13776,9 @@ void POA_CORBA::ComponentIR::ComponentDef::create_consumes_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -14060,7 +13921,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
-    (POA_CORBA::ComponentIR::ComponentDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::ComponentDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -14090,7 +13951,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_non_existent_skel (
   )
 {
   POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
-    (POA_CORBA::ComponentIR::ComponentDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::ComponentDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -14123,7 +13984,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_interface_skel (
     }
   
   POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
-    (POA_CORBA::ComponentIR::ComponentDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::ComponentDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -14154,7 +14015,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_component_skel (
   )
 {
   POA_CORBA::ComponentIR::ComponentDef *_tao_impl =
-    (POA_CORBA::ComponentIR::ComponentDef *) _tao_object_reference;
+    static_cast<POA_CORBA::ComponentIR::ComponentDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -14174,51 +14035,45 @@ CORBA::Boolean POA_CORBA::ComponentIR::ComponentDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/InterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ExtInterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::ComponentIR::ComponentDef::_downcast (
@@ -14288,7 +14143,7 @@ const char* POA_CORBA::ComponentIR::ComponentDef::_interface_repository_id (void
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::ComponentIR::ComponentDef::_dispatch (
     TAO_ServerRequest &req,
@@ -14303,7 +14158,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::ComponentIR::ComponentDef *
 POA_CORBA::ComponentIR::ComponentDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -14314,22 +14169,14 @@ POA_CORBA::ComponentIR::ComponentDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -14356,7 +14203,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_ComponentIR_FactoryDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_ComponentIR_FactoryDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_FactoryDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -14609,7 +14456,7 @@ POA_CORBA::ComponentIR::_TAO_FactoryDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -14679,7 +14526,7 @@ POA_CORBA::ComponentIR::_TAO_FactoryDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -14757,7 +14604,7 @@ void POA_CORBA::ComponentIR::FactoryDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::ComponentIR::FactoryDef *_tao_impl =
-    (POA_CORBA::ComponentIR::FactoryDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::FactoryDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -14787,7 +14634,7 @@ void POA_CORBA::ComponentIR::FactoryDef::_non_existent_skel (
   )
 {
   POA_CORBA::ComponentIR::FactoryDef *_tao_impl =
-    (POA_CORBA::ComponentIR::FactoryDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::FactoryDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -14820,7 +14667,7 @@ void POA_CORBA::ComponentIR::FactoryDef::_interface_skel (
     }
   
   POA_CORBA::ComponentIR::FactoryDef *_tao_impl =
-    (POA_CORBA::ComponentIR::FactoryDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::FactoryDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -14851,7 +14698,7 @@ void POA_CORBA::ComponentIR::FactoryDef::_component_skel (
   )
 {
   POA_CORBA::ComponentIR::FactoryDef *_tao_impl =
-    (POA_CORBA::ComponentIR::FactoryDef *) _tao_object_reference;
+    static_cast<POA_CORBA::ComponentIR::FactoryDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -14871,35 +14718,29 @@ CORBA::Boolean POA_CORBA::ComponentIR::FactoryDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/OperationDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/FactoryDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::ComponentIR::FactoryDef::_downcast (
@@ -14945,7 +14786,7 @@ const char* POA_CORBA::ComponentIR::FactoryDef::_interface_repository_id (void)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::ComponentIR::FactoryDef::_dispatch (
     TAO_ServerRequest &req,
@@ -14960,7 +14801,7 @@ void POA_CORBA::ComponentIR::FactoryDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::ComponentIR::FactoryDef *
 POA_CORBA::ComponentIR::FactoryDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -14971,22 +14812,14 @@ POA_CORBA::ComponentIR::FactoryDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -15013,7 +14846,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_ComponentIR_FinderDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_ComponentIR_FinderDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_FinderDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -15266,7 +15099,7 @@ POA_CORBA::ComponentIR::_TAO_FinderDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -15336,7 +15169,7 @@ POA_CORBA::ComponentIR::_TAO_FinderDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -15414,7 +15247,7 @@ void POA_CORBA::ComponentIR::FinderDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::ComponentIR::FinderDef *_tao_impl =
-    (POA_CORBA::ComponentIR::FinderDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::FinderDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -15444,7 +15277,7 @@ void POA_CORBA::ComponentIR::FinderDef::_non_existent_skel (
   )
 {
   POA_CORBA::ComponentIR::FinderDef *_tao_impl =
-    (POA_CORBA::ComponentIR::FinderDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::FinderDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -15477,7 +15310,7 @@ void POA_CORBA::ComponentIR::FinderDef::_interface_skel (
     }
   
   POA_CORBA::ComponentIR::FinderDef *_tao_impl =
-    (POA_CORBA::ComponentIR::FinderDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::FinderDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -15508,7 +15341,7 @@ void POA_CORBA::ComponentIR::FinderDef::_component_skel (
   )
 {
   POA_CORBA::ComponentIR::FinderDef *_tao_impl =
-    (POA_CORBA::ComponentIR::FinderDef *) _tao_object_reference;
+    static_cast<POA_CORBA::ComponentIR::FinderDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -15528,35 +15361,29 @@ CORBA::Boolean POA_CORBA::ComponentIR::FinderDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/OperationDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/FinderDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::ComponentIR::FinderDef::_downcast (
@@ -15602,7 +15429,7 @@ const char* POA_CORBA::ComponentIR::FinderDef::_interface_repository_id (void) c
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::ComponentIR::FinderDef::_dispatch (
     TAO_ServerRequest &req,
@@ -15617,7 +15444,7 @@ void POA_CORBA::ComponentIR::FinderDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::ComponentIR::FinderDef *
 POA_CORBA::ComponentIR::FinderDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -15628,22 +15455,14 @@ POA_CORBA::ComponentIR::FinderDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -15670,7 +15489,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_ComponentIR_HomeDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_ComponentIR_HomeDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_HomeDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -15855,7 +15674,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get : public TAO
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::HomeDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -15908,7 +15727,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_base_home_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::HomeDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -15998,7 +15817,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set : public TAO
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::HomeDef *tao_impl,
       ::CORBA::ComponentIR::HomeDef_ptr base_home
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -16050,7 +15869,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_base_home_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::HomeDef *tao_impl,
     ::CORBA::ComponentIR::HomeDef_ptr base_home
     ACE_ENV_ARG_DECL_NOT_USED
@@ -16139,7 +15958,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get :
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::HomeDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -16192,7 +16011,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::HomeDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -16282,7 +16101,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set :
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::HomeDef *tao_impl,
       const ::CORBA::InterfaceDefSeq & supported_interfaces
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -16334,7 +16153,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_supported_interfaces_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::HomeDef *tao_impl,
     const ::CORBA::InterfaceDefSeq & supported_interfaces
     ACE_ENV_ARG_DECL_NOT_USED
@@ -16423,7 +16242,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get : pu
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::HomeDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -16476,7 +16295,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::HomeDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -16566,7 +16385,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set : pu
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::HomeDef *tao_impl,
       ::CORBA::ComponentIR::ComponentDef_ptr managed_component
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -16618,7 +16437,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_managed_component_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::HomeDef *tao_impl,
     ::CORBA::ComponentIR::ComponentDef_ptr managed_component
     ACE_ENV_ARG_DECL_NOT_USED
@@ -16707,7 +16526,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get : public T
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::HomeDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -16760,7 +16579,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::HomeDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -16850,7 +16669,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set : public T
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::HomeDef *tao_impl,
       ::CORBA::ValueDef_ptr primary_key
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -16902,7 +16721,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_primary_key_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::HomeDef *tao_impl,
     ::CORBA::ValueDef_ptr primary_key
     ACE_ENV_ARG_DECL_NOT_USED
@@ -16991,7 +16810,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_create_factory : public TA
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_create_factory (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::HomeDef *tao_impl,
       const char * id,
       const char * name,
@@ -17054,7 +16873,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_create_factory::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_create_factory (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::HomeDef *tao_impl,
     const char * id,
     const char * name,
@@ -17178,7 +16997,7 @@ class TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_create_finder : public TAO
 public:
   TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_create_finder (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ComponentIR::HomeDef *tao_impl,
       const char * id,
       const char * name,
@@ -17241,7 +17060,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_create_finder::TAO_ServerRequestInfo_CORBA_ComponentIR_HomeDef_create_finder (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ComponentIR::HomeDef *tao_impl,
     const char * id,
     const char * name,
@@ -17411,7 +17230,7 @@ POA_CORBA::ComponentIR::_TAO_HomeDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -17481,7 +17300,7 @@ POA_CORBA::ComponentIR::_TAO_HomeDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -17838,9 +17657,9 @@ void POA_CORBA::ComponentIR::HomeDef::_get_base_home_skel (
   ::CORBA::ComponentIR::HomeDef_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -17984,9 +17803,9 @@ void POA_CORBA::ComponentIR::HomeDef::_set_base_home_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -18102,9 +17921,9 @@ void POA_CORBA::ComponentIR::HomeDef::_get_supported_interfaces_skel (
   ::CORBA::InterfaceDefSeq_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -18248,9 +18067,9 @@ void POA_CORBA::ComponentIR::HomeDef::_set_supported_interfaces_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -18366,9 +18185,9 @@ void POA_CORBA::ComponentIR::HomeDef::_get_managed_component_skel (
   ::CORBA::ComponentIR::ComponentDef_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -18512,9 +18331,9 @@ void POA_CORBA::ComponentIR::HomeDef::_set_managed_component_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -18630,9 +18449,9 @@ void POA_CORBA::ComponentIR::HomeDef::_get_primary_key_skel (
   ::CORBA::ValueDef_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -18776,9 +18595,9 @@ void POA_CORBA::ComponentIR::HomeDef::_set_primary_key_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -18912,9 +18731,9 @@ void POA_CORBA::ComponentIR::HomeDef::create_factory_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -19084,9 +18903,9 @@ void POA_CORBA::ComponentIR::HomeDef::create_finder_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -19233,7 +19052,7 @@ void POA_CORBA::ComponentIR::HomeDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::ComponentIR::HomeDef *_tao_impl =
-    (POA_CORBA::ComponentIR::HomeDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::HomeDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -19263,7 +19082,7 @@ void POA_CORBA::ComponentIR::HomeDef::_non_existent_skel (
   )
 {
   POA_CORBA::ComponentIR::HomeDef *_tao_impl =
-    (POA_CORBA::ComponentIR::HomeDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::HomeDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -19296,7 +19115,7 @@ void POA_CORBA::ComponentIR::HomeDef::_interface_skel (
     }
   
   POA_CORBA::ComponentIR::HomeDef *_tao_impl =
-    (POA_CORBA::ComponentIR::HomeDef *) _tao_servant;
+    static_cast<POA_CORBA::ComponentIR::HomeDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -19327,7 +19146,7 @@ void POA_CORBA::ComponentIR::HomeDef::_component_skel (
   )
 {
   POA_CORBA::ComponentIR::HomeDef *_tao_impl =
-    (POA_CORBA::ComponentIR::HomeDef *) _tao_object_reference;
+    static_cast<POA_CORBA::ComponentIR::HomeDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -19347,51 +19166,45 @@ CORBA::Boolean POA_CORBA::ComponentIR::HomeDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/InterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ExtInterfaceDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::ComponentIR::HomeDef::_downcast (
@@ -19461,7 +19274,7 @@ const char* POA_CORBA::ComponentIR::HomeDef::_interface_repository_id (void) con
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::ComponentIR::HomeDef::_dispatch (
     TAO_ServerRequest &req,
@@ -19476,7 +19289,7 @@ void POA_CORBA::ComponentIR::HomeDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::ComponentIR::HomeDef *
 POA_CORBA::ComponentIR::HomeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -19487,22 +19300,14 @@ POA_CORBA::ComponentIR::HomeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h
index 2b58ba3c950..f6b37b1b4c6 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h
@@ -28,8 +28,8 @@
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:390
 
-#ifndef _TAO_IDL_SERVER_IFR_COMPONENTSS_H_
-#define _TAO_IDL_SERVER_IFR_COMPONENTSS_H_
+#ifndef _TAO_IDL_ORIG_IFR_COMPONENTSS_H_
+#define _TAO_IDL_ORIG_IFR_COMPONENTSS_H_
 
 #include /**/ "ace/pre.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp
index d20a648982b..0652c1dcafc 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp
@@ -28,8 +28,8 @@
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:683
 
-#ifndef _TAO_IDL_SERVER_IFR_COMPONENTSS_T_CPP_
-#define _TAO_IDL_SERVER_IFR_COMPONENTSS_T_CPP_
+#ifndef _TAO_IDL_ORIG_IFR_COMPONENTSS_T_CPP_
+#define _TAO_IDL_ORIG_IFR_COMPONENTSS_T_CPP_
 
 #include "IFR_ComponentsS_T.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h
index 37921e2eb38..1de0d707030 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h
@@ -28,8 +28,8 @@
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:546
 
-#ifndef _TAO_IDL_SERVER_IFR_COMPONENTSS_T_H_
-#define _TAO_IDL_SERVER_IFR_COMPONENTSS_T_H_
+#ifndef _TAO_IDL_ORIG_IFR_COMPONENTSS_T_H_
+#define _TAO_IDL_ORIG_IFR_COMPONENTSS_T_H_
 
 #include /**/ "ace/pre.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
index b2fa906c681..dfc62782a32 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
@@ -29,12 +29,13 @@
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:609
 
-#ifndef _TAO_IDL_SERVER_IFR_EXTENDEDS_CPP_
-#define _TAO_IDL_SERVER_IFR_EXTENDEDS_CPP_
+#ifndef _TAO_IDL_ORIG_IFR_EXTENDEDS_CPP_
+#define _TAO_IDL_ORIG_IFR_EXTENDEDS_CPP_
 
 
 #include "IFR_ExtendedS.h"
-#include "tao/PortableServer/Object_Adapter.h"
+#include "tao/PortableServer/Servant_Upcall.h"
+#include "tao/PortableServer/ForwardRequestC.h"
 #include "tao/PortableServer/Operation_Table.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/ORB_Core.h"
@@ -70,20 +71,20 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:574
+  // be\be_visitor_arg_traits.cpp:624
 
 #if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_SS_)
 #define _CORBA_DEFINITIONKIND__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::DefinitionKind>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::DefinitionKind>
     : public
         Basic_Arg_Traits_T<
             CORBA::DefinitionKind
@@ -145,13 +146,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_)
 #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::InterfaceDefSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::InterfaceDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDefSeq,
@@ -181,13 +182,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:612
+  // be\be_visitor_arg_traits.cpp:662
 
 #if !defined (_CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_SS_)
 #define _CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::ValueDef::FullValueDescription>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::ValueDef::FullValueDescription>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ValueDef::FullValueDescription,
@@ -200,13 +201,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_SS_)
 #define _CORBA_INITIALIZERSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::InitializerSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::InitializerSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InitializerSeq,
@@ -219,13 +220,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_SS_)
 #define _CORBA_VALUEDEFSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::ValueDefSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::ValueDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ValueDefSeq,
@@ -238,13 +239,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:612
+  // be\be_visitor_arg_traits.cpp:662
 
 #if !defined (_CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_SS_)
 #define _CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::ExtValueDef::ExtFullValueDescription>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExtValueDef::ExtFullValueDescription>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExtValueDef::ExtFullValueDescription,
@@ -257,13 +258,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_SS_)
 #define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::ExtInitializerSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExtInitializerSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExtInitializerSeq,
@@ -276,13 +277,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_SS_)
 #define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::ExceptionDefSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExceptionDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExceptionDefSeq,
@@ -295,13 +296,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:574
+  // be\be_visitor_arg_traits.cpp:624
 
 #if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_SS_)
 #define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::AttributeMode>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::AttributeMode>
     : public
         Basic_Arg_Traits_T<
             CORBA::AttributeMode
@@ -346,13 +347,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:574
+  // be\be_visitor_arg_traits.cpp:624
 
 #if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_SS_)
 #define _CORBA_OPERATIONMODE__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::OperationMode>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::OperationMode>
     : public
         Basic_Arg_Traits_T<
             CORBA::OperationMode
@@ -363,13 +364,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_SS_)
 #define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::ParDescriptionSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::ParDescriptionSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ParDescriptionSeq,
@@ -382,13 +383,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_SS_)
 #define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class  Arg_Traits<CORBA::ContextIdSeq>
+  class TAO_IFR_Client_Export Arg_Traits<CORBA::ContextIdSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ContextIdSeq,
@@ -450,7 +451,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_FixedDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_FixedDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_FixedDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -586,7 +587,7 @@ class TAO_ServerRequestInfo_CORBA_FixedDef_digits_get : public TAO_ServerRequest
 public:
   TAO_ServerRequestInfo_CORBA_FixedDef_digits_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::FixedDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -639,7 +640,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::TAO_ServerRequestInfo_CORBA_FixedDef_digits_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::FixedDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -729,7 +730,7 @@ class TAO_ServerRequestInfo_CORBA_FixedDef_digits_set : public TAO_ServerRequest
 public:
   TAO_ServerRequestInfo_CORBA_FixedDef_digits_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::FixedDef *tao_impl,
       const ::CORBA::UShort & digits
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -781,7 +782,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::TAO_ServerRequestInfo_CORBA_FixedDef_digits_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::FixedDef *tao_impl,
     const ::CORBA::UShort & digits
     ACE_ENV_ARG_DECL_NOT_USED
@@ -870,7 +871,7 @@ class TAO_ServerRequestInfo_CORBA_FixedDef_scale_get : public TAO_ServerRequestI
 public:
   TAO_ServerRequestInfo_CORBA_FixedDef_scale_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::FixedDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -923,7 +924,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::TAO_ServerRequestInfo_CORBA_FixedDef_scale_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::FixedDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -1013,7 +1014,7 @@ class TAO_ServerRequestInfo_CORBA_FixedDef_scale_set : public TAO_ServerRequestI
 public:
   TAO_ServerRequestInfo_CORBA_FixedDef_scale_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::FixedDef *tao_impl,
       const ::CORBA::Short & scale
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1065,7 +1066,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::TAO_ServerRequestInfo_CORBA_FixedDef_scale_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::FixedDef *tao_impl,
     const ::CORBA::Short & scale
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1200,7 +1201,7 @@ POA_CORBA::_TAO_FixedDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -1270,7 +1271,7 @@ POA_CORBA::_TAO_FixedDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_FixedDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -1456,9 +1457,9 @@ void POA_CORBA::FixedDef::_get_digits_skel (
   CORBA::UShort _tao_retval = 0;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -1601,9 +1602,9 @@ void POA_CORBA::FixedDef::_set_digits_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -1719,9 +1720,9 @@ void POA_CORBA::FixedDef::_get_scale_skel (
   CORBA::Short _tao_retval = 0;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -1864,9 +1865,9 @@ void POA_CORBA::FixedDef::_set_scale_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -1977,7 +1978,7 @@ void POA_CORBA::FixedDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::FixedDef *_tao_impl =
-    (POA_CORBA::FixedDef *) _tao_servant;
+    static_cast<POA_CORBA::FixedDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -2007,7 +2008,7 @@ void POA_CORBA::FixedDef::_non_existent_skel (
   )
 {
   POA_CORBA::FixedDef *_tao_impl =
-    (POA_CORBA::FixedDef *) _tao_servant;
+    static_cast<POA_CORBA::FixedDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -2040,7 +2041,7 @@ void POA_CORBA::FixedDef::_interface_skel (
     }
   
   POA_CORBA::FixedDef *_tao_impl =
-    (POA_CORBA::FixedDef *) _tao_servant;
+    static_cast<POA_CORBA::FixedDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -2071,7 +2072,7 @@ void POA_CORBA::FixedDef::_component_skel (
   )
 {
   POA_CORBA::FixedDef *_tao_impl =
-    (POA_CORBA::FixedDef *) _tao_object_reference;
+    static_cast<POA_CORBA::FixedDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -2091,31 +2092,25 @@ CORBA::Boolean POA_CORBA::FixedDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/FixedDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::FixedDef::_downcast (
@@ -2155,7 +2150,7 @@ const char* POA_CORBA::FixedDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::FixedDef::_dispatch (
     TAO_ServerRequest &req,
@@ -2170,7 +2165,7 @@ void POA_CORBA::FixedDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::FixedDef *
 POA_CORBA::FixedDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -2181,22 +2176,14 @@ POA_CORBA::FixedDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -2223,7 +2210,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_ValueMemberDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_ValueMemberDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -2371,7 +2358,7 @@ class TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get : public TAO_ServerReq
 public:
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueMemberDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -2424,7 +2411,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueMemberDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -2514,7 +2501,7 @@ class TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get : public TAO_Serve
 public:
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueMemberDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -2567,7 +2554,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueMemberDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -2657,7 +2644,7 @@ class TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set : public TAO_Serve
 public:
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueMemberDef *tao_impl,
       ::CORBA::IDLType_ptr type_def
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2709,7 +2696,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueMemberDef *tao_impl,
     ::CORBA::IDLType_ptr type_def
     ACE_ENV_ARG_DECL_NOT_USED
@@ -2798,7 +2785,7 @@ class TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get : public TAO_ServerR
 public:
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueMemberDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -2851,7 +2838,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueMemberDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -2941,7 +2928,7 @@ class TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set : public TAO_ServerR
 public:
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueMemberDef *tao_impl,
       const ::CORBA::Visibility & access
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2993,7 +2980,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueMemberDef *tao_impl,
     const ::CORBA::Visibility & access
     ACE_ENV_ARG_DECL_NOT_USED
@@ -3128,7 +3115,7 @@ POA_CORBA::_TAO_ValueMemberDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -3198,7 +3185,7 @@ POA_CORBA::_TAO_ValueMemberDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -3410,9 +3397,9 @@ void POA_CORBA::ValueMemberDef::_get_type_skel (
   CORBA::TypeCode_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -3545,9 +3532,9 @@ void POA_CORBA::ValueMemberDef::_get_type_def_skel (
   ::CORBA::IDLType_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -3691,9 +3678,9 @@ void POA_CORBA::ValueMemberDef::_set_type_def_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -3809,9 +3796,9 @@ void POA_CORBA::ValueMemberDef::_get_access_skel (
   CORBA::Visibility _tao_retval = 0;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -3954,9 +3941,9 @@ void POA_CORBA::ValueMemberDef::_set_access_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -4067,7 +4054,7 @@ void POA_CORBA::ValueMemberDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::ValueMemberDef *_tao_impl =
-    (POA_CORBA::ValueMemberDef *) _tao_servant;
+    static_cast<POA_CORBA::ValueMemberDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -4097,7 +4084,7 @@ void POA_CORBA::ValueMemberDef::_non_existent_skel (
   )
 {
   POA_CORBA::ValueMemberDef *_tao_impl =
-    (POA_CORBA::ValueMemberDef *) _tao_servant;
+    static_cast<POA_CORBA::ValueMemberDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -4130,7 +4117,7 @@ void POA_CORBA::ValueMemberDef::_interface_skel (
     }
   
   POA_CORBA::ValueMemberDef *_tao_impl =
-    (POA_CORBA::ValueMemberDef *) _tao_servant;
+    static_cast<POA_CORBA::ValueMemberDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -4161,7 +4148,7 @@ void POA_CORBA::ValueMemberDef::_component_skel (
   )
 {
   POA_CORBA::ValueMemberDef *_tao_impl =
-    (POA_CORBA::ValueMemberDef *) _tao_object_reference;
+    static_cast<POA_CORBA::ValueMemberDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -4181,31 +4168,25 @@ CORBA::Boolean POA_CORBA::ValueMemberDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ValueMemberDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::ValueMemberDef::_downcast (
@@ -4245,7 +4226,7 @@ const char* POA_CORBA::ValueMemberDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::ValueMemberDef::_dispatch (
     TAO_ServerRequest &req,
@@ -4260,7 +4241,7 @@ void POA_CORBA::ValueMemberDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::ValueMemberDef *
 POA_CORBA::ValueMemberDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -4271,22 +4252,14 @@ POA_CORBA::ValueMemberDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -4313,7 +4286,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_ValueDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_ValueDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ValueDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -4498,7 +4471,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get : public TAO
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -4551,7 +4524,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -4641,7 +4614,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set : public TAO
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueDef *tao_impl,
       const ::CORBA::InterfaceDefSeq & supported_interfaces
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -4693,7 +4666,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueDef *tao_impl,
     const ::CORBA::InterfaceDefSeq & supported_interfaces
     ACE_ENV_ARG_DECL_NOT_USED
@@ -4782,7 +4755,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get : public TAO_ServerR
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -4835,7 +4808,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -4925,7 +4898,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set : public TAO_ServerR
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueDef *tao_impl,
       const ::CORBA::InitializerSeq & initializers
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -4977,7 +4950,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueDef *tao_impl,
     const ::CORBA::InitializerSeq & initializers
     ACE_ENV_ARG_DECL_NOT_USED
@@ -5066,7 +5039,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get : public TAO_ServerReq
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -5119,7 +5092,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -5209,7 +5182,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set : public TAO_ServerReq
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueDef *tao_impl,
       ::CORBA::ValueDef_ptr base_value
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -5261,7 +5234,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueDef *tao_impl,
     ::CORBA::ValueDef_ptr base_value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -5350,7 +5323,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get : public TAO
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -5403,7 +5376,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -5493,7 +5466,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set : public TAO
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueDef *tao_impl,
       const ::CORBA::ValueDefSeq & abstract_base_values
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -5545,7 +5518,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueDef *tao_impl,
     const ::CORBA::ValueDefSeq & abstract_base_values
     ACE_ENV_ARG_DECL_NOT_USED
@@ -5634,7 +5607,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get : public TAO_ServerRe
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -5687,7 +5660,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -5777,7 +5750,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set : public TAO_ServerRe
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueDef *tao_impl,
       const ::CORBA::Boolean & is_abstract
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -5829,7 +5802,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueDef *tao_impl,
     const ::CORBA::Boolean & is_abstract
     ACE_ENV_ARG_DECL_NOT_USED
@@ -5918,7 +5891,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get : public TAO_ServerRequ
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -5971,7 +5944,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -6061,7 +6034,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set : public TAO_ServerRequ
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueDef *tao_impl,
       const ::CORBA::Boolean & is_custom
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -6113,7 +6086,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueDef *tao_impl,
     const ::CORBA::Boolean & is_custom
     ACE_ENV_ARG_DECL_NOT_USED
@@ -6202,7 +6175,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get : public TAO_Serve
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -6255,7 +6228,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -6345,7 +6318,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set : public TAO_Serve
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueDef *tao_impl,
       const ::CORBA::Boolean & is_truncatable
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -6397,7 +6370,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueDef *tao_impl,
     const ::CORBA::Boolean & is_truncatable
     ACE_ENV_ARG_DECL_NOT_USED
@@ -6486,7 +6459,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_is_a : public TAO_ServerRequestInfo
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_is_a (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueDef *tao_impl,
       const char * id
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -6541,7 +6514,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ValueDef_is_a::TAO_ServerRequestInfo_CORBA_ValueDef_is_a (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueDef *tao_impl,
     const char * id
     ACE_ENV_ARG_DECL_NOT_USED
@@ -6641,7 +6614,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_describe_value : public TAO_ServerReq
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_describe_value (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -6694,7 +6667,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::TAO_ServerRequestInfo_CORBA_ValueDef_describe_value (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -6784,7 +6757,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member : public TAO_Serv
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueDef *tao_impl,
       const char * id,
       const char * name,
@@ -6847,7 +6820,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueDef *tao_impl,
     const char * id,
     const char * name,
@@ -6971,7 +6944,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute : public TAO_ServerR
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueDef *tao_impl,
       const char * id,
       const char * name,
@@ -7034,7 +7007,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueDef *tao_impl,
     const char * id,
     const char * name,
@@ -7158,7 +7131,7 @@ class TAO_ServerRequestInfo_CORBA_ValueDef_create_operation : public TAO_ServerR
 public:
   TAO_ServerRequestInfo_CORBA_ValueDef_create_operation (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueDef *tao_impl,
       const char * id,
       const char * name,
@@ -7227,7 +7200,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::TAO_ServerRequestInfo_CORBA_ValueDef_create_operation (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueDef *tao_impl,
     const char * id,
     const char * name,
@@ -7415,7 +7388,7 @@ POA_CORBA::_TAO_ValueDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -7485,7 +7458,7 @@ POA_CORBA::_TAO_ValueDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ValueDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -8082,9 +8055,9 @@ void POA_CORBA::ValueDef::_get_supported_interfaces_skel (
   ::CORBA::InterfaceDefSeq_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -8228,9 +8201,9 @@ void POA_CORBA::ValueDef::_set_supported_interfaces_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -8346,9 +8319,9 @@ void POA_CORBA::ValueDef::_get_initializers_skel (
   ::CORBA::InitializerSeq_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -8492,9 +8465,9 @@ void POA_CORBA::ValueDef::_set_initializers_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -8610,9 +8583,9 @@ void POA_CORBA::ValueDef::_get_base_value_skel (
   ::CORBA::ValueDef_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -8756,9 +8729,9 @@ void POA_CORBA::ValueDef::_set_base_value_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -8874,9 +8847,9 @@ void POA_CORBA::ValueDef::_get_abstract_base_values_skel (
   ::CORBA::ValueDefSeq_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -9020,9 +8993,9 @@ void POA_CORBA::ValueDef::_set_abstract_base_values_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -9138,9 +9111,9 @@ void POA_CORBA::ValueDef::_get_is_abstract_skel (
   CORBA::Boolean _tao_retval = 0;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -9283,9 +9256,9 @@ void POA_CORBA::ValueDef::_set_is_abstract_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -9401,9 +9374,9 @@ void POA_CORBA::ValueDef::_get_is_custom_skel (
   CORBA::Boolean _tao_retval = 0;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -9546,9 +9519,9 @@ void POA_CORBA::ValueDef::_set_is_custom_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -9664,9 +9637,9 @@ void POA_CORBA::ValueDef::_get_is_truncatable_skel (
   CORBA::Boolean _tao_retval = 0;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -9809,9 +9782,9 @@ void POA_CORBA::ValueDef::_set_is_truncatable_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -9937,9 +9910,9 @@ void POA_CORBA::ValueDef::is_a_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -10074,9 +10047,9 @@ void POA_CORBA::ValueDef::describe_value_skel (
   ::CORBA::ValueDef::FullValueDescription_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -10227,9 +10200,9 @@ void POA_CORBA::ValueDef::create_value_member_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -10399,9 +10372,9 @@ void POA_CORBA::ValueDef::create_attribute_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -10577,9 +10550,9 @@ void POA_CORBA::ValueDef::create_operation_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -10738,7 +10711,7 @@ void POA_CORBA::ValueDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::ValueDef *_tao_impl =
-    (POA_CORBA::ValueDef *) _tao_servant;
+    static_cast<POA_CORBA::ValueDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -10768,7 +10741,7 @@ void POA_CORBA::ValueDef::_non_existent_skel (
   )
 {
   POA_CORBA::ValueDef *_tao_impl =
-    (POA_CORBA::ValueDef *) _tao_servant;
+    static_cast<POA_CORBA::ValueDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -10801,7 +10774,7 @@ void POA_CORBA::ValueDef::_interface_skel (
     }
   
   POA_CORBA::ValueDef *_tao_impl =
-    (POA_CORBA::ValueDef *) _tao_servant;
+    static_cast<POA_CORBA::ValueDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -10832,7 +10805,7 @@ void POA_CORBA::ValueDef::_component_skel (
   )
 {
   POA_CORBA::ValueDef *_tao_impl =
-    (POA_CORBA::ValueDef *) _tao_object_reference;
+    static_cast<POA_CORBA::ValueDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -10852,39 +10825,33 @@ CORBA::Boolean POA_CORBA::ValueDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ValueDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::ValueDef::_downcast (
@@ -10936,7 +10903,7 @@ const char* POA_CORBA::ValueDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::ValueDef::_dispatch (
     TAO_ServerRequest &req,
@@ -10951,7 +10918,7 @@ void POA_CORBA::ValueDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::ValueDef *
 POA_CORBA::ValueDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -10962,22 +10929,14 @@ POA_CORBA::ValueDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -11004,7 +10963,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_ExtValueDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_ExtValueDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ExtValueDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -11193,7 +11152,7 @@ class TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_get : public TAO_
 public:
   TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ExtValueDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -11246,7 +11205,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_get::TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ExtValueDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -11336,7 +11295,7 @@ class TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_set : public TAO_
 public:
   TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ExtValueDef *tao_impl,
       const ::CORBA::ExtInitializerSeq & ext_initializers
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -11388,7 +11347,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_set::TAO_ServerRequestInfo_CORBA_ExtValueDef_ext_initializers_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ExtValueDef *tao_impl,
     const ::CORBA::ExtInitializerSeq & ext_initializers
     ACE_ENV_ARG_DECL_NOT_USED
@@ -11477,7 +11436,7 @@ class TAO_ServerRequestInfo_CORBA_ExtValueDef_describe_ext_value : public TAO_Se
 public:
   TAO_ServerRequestInfo_CORBA_ExtValueDef_describe_ext_value (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ExtValueDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -11530,7 +11489,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ExtValueDef_describe_ext_value::TAO_ServerRequestInfo_CORBA_ExtValueDef_describe_ext_value (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ExtValueDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -11620,7 +11579,7 @@ class TAO_ServerRequestInfo_CORBA_ExtValueDef_create_ext_attribute : public TAO_
 public:
   TAO_ServerRequestInfo_CORBA_ExtValueDef_create_ext_attribute (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ExtValueDef *tao_impl,
       const char * id,
       const char * name,
@@ -11687,7 +11646,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ExtValueDef_create_ext_attribute::TAO_ServerRequestInfo_CORBA_ExtValueDef_create_ext_attribute (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ExtValueDef *tao_impl,
     const char * id,
     const char * name,
@@ -11869,7 +11828,7 @@ POA_CORBA::_TAO_ExtValueDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -11939,7 +11898,7 @@ POA_CORBA::_TAO_ExtValueDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -12135,9 +12094,9 @@ void POA_CORBA::ExtValueDef::_get_ext_initializers_skel (
   ::CORBA::ExtInitializerSeq_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -12281,9 +12240,9 @@ void POA_CORBA::ExtValueDef::_set_ext_initializers_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -12399,9 +12358,9 @@ void POA_CORBA::ExtValueDef::describe_ext_value_skel (
   ::CORBA::ExtValueDef::ExtFullValueDescription_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -12556,9 +12515,9 @@ void POA_CORBA::ExtValueDef::create_ext_attribute_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -12713,7 +12672,7 @@ void POA_CORBA::ExtValueDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::ExtValueDef *_tao_impl =
-    (POA_CORBA::ExtValueDef *) _tao_servant;
+    static_cast<POA_CORBA::ExtValueDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -12743,7 +12702,7 @@ void POA_CORBA::ExtValueDef::_non_existent_skel (
   )
 {
   POA_CORBA::ExtValueDef *_tao_impl =
-    (POA_CORBA::ExtValueDef *) _tao_servant;
+    static_cast<POA_CORBA::ExtValueDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -12776,7 +12735,7 @@ void POA_CORBA::ExtValueDef::_interface_skel (
     }
   
   POA_CORBA::ExtValueDef *_tao_impl =
-    (POA_CORBA::ExtValueDef *) _tao_servant;
+    static_cast<POA_CORBA::ExtValueDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -12807,7 +12766,7 @@ void POA_CORBA::ExtValueDef::_component_skel (
   )
 {
   POA_CORBA::ExtValueDef *_tao_impl =
-    (POA_CORBA::ExtValueDef *) _tao_object_reference;
+    static_cast<POA_CORBA::ExtValueDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -12827,43 +12786,37 @@ CORBA::Boolean POA_CORBA::ExtValueDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Container:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ValueDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ExtValueDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::ExtValueDef::_downcast (
@@ -12921,7 +12874,7 @@ const char* POA_CORBA::ExtValueDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::ExtValueDef::_dispatch (
     TAO_ServerRequest &req,
@@ -12936,7 +12889,7 @@ void POA_CORBA::ExtValueDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::ExtValueDef *
 POA_CORBA::ExtValueDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -12947,22 +12900,14 @@ POA_CORBA::ExtValueDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -12989,7 +12934,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_ValueBoxDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_ValueBoxDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -13135,7 +13080,7 @@ class TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get : public TAO
 public:
   TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueBoxDef *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -13188,7 +13133,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueBoxDef *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -13278,7 +13223,7 @@ class TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set : public TAO
 public:
   TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ValueBoxDef *tao_impl,
       ::CORBA::IDLType_ptr original_type_def
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -13330,7 +13275,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ValueBoxDef *tao_impl,
     ::CORBA::IDLType_ptr original_type_def
     ACE_ENV_ARG_DECL_NOT_USED
@@ -13465,7 +13410,7 @@ POA_CORBA::_TAO_ValueBoxDef_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -13535,7 +13480,7 @@ POA_CORBA::_TAO_ValueBoxDef_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -13671,9 +13616,9 @@ void POA_CORBA::ValueBoxDef::_get_original_type_def_skel (
   ::CORBA::IDLType_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -13817,9 +13762,9 @@ void POA_CORBA::ValueBoxDef::_set_original_type_def_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -13930,7 +13875,7 @@ void POA_CORBA::ValueBoxDef::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::ValueBoxDef *_tao_impl =
-    (POA_CORBA::ValueBoxDef *) _tao_servant;
+    static_cast<POA_CORBA::ValueBoxDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -13960,7 +13905,7 @@ void POA_CORBA::ValueBoxDef::_non_existent_skel (
   )
 {
   POA_CORBA::ValueBoxDef *_tao_impl =
-    (POA_CORBA::ValueBoxDef *) _tao_servant;
+    static_cast<POA_CORBA::ValueBoxDef *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -13993,7 +13938,7 @@ void POA_CORBA::ValueBoxDef::_interface_skel (
     }
   
   POA_CORBA::ValueBoxDef *_tao_impl =
-    (POA_CORBA::ValueBoxDef *) _tao_servant;
+    static_cast<POA_CORBA::ValueBoxDef *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -14024,7 +13969,7 @@ void POA_CORBA::ValueBoxDef::_component_skel (
   )
 {
   POA_CORBA::ValueBoxDef *_tao_impl =
-    (POA_CORBA::ValueBoxDef *) _tao_object_reference;
+    static_cast<POA_CORBA::ValueBoxDef *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -14044,39 +13989,33 @@ CORBA::Boolean POA_CORBA::ValueBoxDef::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IRObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Contained:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/IDLType:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/TypedefDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ValueBoxDef:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::ValueBoxDef::_downcast (
@@ -14128,7 +14067,7 @@ const char* POA_CORBA::ValueBoxDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::ValueBoxDef::_dispatch (
     TAO_ServerRequest &req,
@@ -14143,7 +14082,7 @@ void POA_CORBA::ValueBoxDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::ValueBoxDef *
 POA_CORBA::ValueBoxDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -14154,22 +14093,14 @@ POA_CORBA::ValueBoxDef::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h
index 2672e99b595..9887369feba 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h
@@ -28,8 +28,8 @@
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:390
 
-#ifndef _TAO_IDL_SERVER_IFR_EXTENDEDS_H_
-#define _TAO_IDL_SERVER_IFR_EXTENDEDS_H_
+#ifndef _TAO_IDL_ORIG_IFR_EXTENDEDS_H_
+#define _TAO_IDL_ORIG_IFR_EXTENDEDS_H_
 
 #include /**/ "ace/pre.h"
 
@@ -58,101 +58,101 @@
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_sh.cpp:87
-  
+
   class FixedDef;
   typedef FixedDef *FixedDef_ptr;
-  
+
   class _TAO_FixedDef_ThruPOA_Proxy_Impl;
   class _TAO_FixedDef_Strategized_Proxy_Broker;
-  
+
   class  FixedDef
     : public virtual POA_CORBA::IDLType
   {
   protected:
     FixedDef (void);
-  
+
   public:
     // Useful for template programming.
     typedef ::CORBA::FixedDef _stub_type;
     typedef ::CORBA::FixedDef_ptr _stub_ptr_type;
     typedef ::CORBA::FixedDef_var _stub_var_type;
-    
+
     FixedDef (const FixedDef& rhs);
     virtual ~FixedDef (void);
-    
+
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void* _downcast (
         const char* logical_type_id
       );
-    
+
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _component_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     ::CORBA::FixedDef *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual CORBA::UShort digits (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _get_digits_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual void digits (
         ::CORBA::UShort digits
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -160,34 +160,34 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _set_digits_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual CORBA::Short scale (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _get_scale_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual void scale (
         ::CORBA::Short scale
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -195,7 +195,7 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _set_scale_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp
index 4036f1695cf..a4e0504caff 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp
@@ -28,8 +28,8 @@
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:683
 
-#ifndef _TAO_IDL_SERVER_IFR_EXTENDEDS_T_CPP_
-#define _TAO_IDL_SERVER_IFR_EXTENDEDS_T_CPP_
+#ifndef _TAO_IDL_ORIG_IFR_EXTENDEDS_T_CPP_
+#define _TAO_IDL_ORIG_IFR_EXTENDEDS_T_CPP_
 
 #include "IFR_ExtendedS_T.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h
index a956b073838..6f768189445 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h
@@ -28,8 +28,8 @@
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:546
 
-#ifndef _TAO_IDL_SERVER_IFR_EXTENDEDS_T_H_
-#define _TAO_IDL_SERVER_IFR_EXTENDEDS_T_H_
+#ifndef _TAO_IDL_ORIG_IFR_EXTENDEDS_T_H_
+#define _TAO_IDL_ORIG_IFR_EXTENDEDS_T_H_
 
 #include /**/ "ace/pre.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
index 504f63da55f..22ea6ddc455 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
@@ -11,9 +11,10 @@
 #include "tao/IORTable/IORTable.h"
 #include "tao/ORB_Core.h"
 #include "tao/default_ports.h"
-#include "tao/PortableServer/POA.h"
+#include "tao/PortableServer/Root_POA.h"
 #include "tao/Stub.h"
 #include "tao/Profile.h"
+#include "tao/ValueModifierC.h"
 #include "ace/Auto_Ptr.h"
 
 ACE_RCSID (IFR_Service,
@@ -259,7 +260,7 @@ TAO_IFR_Server::open_config (ACE_ENV_SINGLE_ARG_DECL)
             {
               delete heap;
               heap = 0;
-            
+
               ACE_ERROR_RETURN ((
                   LM_ERROR,
                   ACE_TEXT ("Error:: Opening persistent heap file '%s'\n"),
@@ -1175,8 +1176,8 @@ TAO_IFR_Service_Utils::reference_to_path (CORBA::IRObject_ptr obj)
   PortableServer::ObjectId object_id;
   TAO::ObjectKey object_key =
     obj->_stubobj ()->profile_in_use ()->object_key ();
-  int status = TAO_POA::parse_ir_object_key (object_key,
-                                             object_id);
+  int status = TAO_Root_POA::parse_ir_object_key (object_key,
+                                                  object_id);
   if (status != 0)
     {
       ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
index e55e9ed930f..b59da5db26e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
@@ -24,7 +24,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/PortableServerC.h"
+#include "tao/PortableServer/PortableServer.h"
 #include "tao/ORB.h"
 #include "tao/IFR_Client/IFR_BasicC.h"
 #include "ifr_service_export.h"
@@ -58,37 +58,37 @@ public:
   /// Destructor.
 
 protected:
-  
-  int create_poa (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   /// Two persistent POAs, one using a servant locator.
+  int create_poa (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
-  int open_config (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   /// Open an ACE_Configuration of the appropriate type.
+  int open_config (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
-  int create_repository (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   /// Create and initialize the repository.
+  int create_repository (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
-  int init_multicast_server (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   /// Enable the Interface Repository to answer multicast requests
   /// for its IOR.
+  int init_multicast_server (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
-  CORBA::ORB_var orb_;
   /// Reference to our ORB.
+  CORBA::ORB_var orb_;
 
-  PortableServer::POA_ptr root_poa_;
   /// Root POA reference.
+  PortableServer::POA_ptr root_poa_;
 
-  PortableServer::POA_ptr repo_poa_;
   /// The Repository's POA reference.
+  PortableServer::POA_ptr repo_poa_;
 
-  TAO_IOR_Multicast *ior_multicast_;
   /// Event handler that responds to multicast requests.
+  TAO_IOR_Multicast *ior_multicast_;
 
-  ACE_Configuration *config_;
   /// Database for the IFR.
+  ACE_Configuration *config_;
 
-  CORBA::String_var ifr_ior_;
   /// Interface Repository's IOR.
+  CORBA::String_var ifr_ior_;
 };
 
 class TAO_IFR_Service_Utils
@@ -97,53 +97,54 @@ public:
   TAO_IFR_Service_Utils (void);
 
   ~TAO_IFR_Service_Utils (void);
-  
+
   typedef int (*name_clash_checker)(const char *);
 
-  static char *int_to_string (CORBA::ULong number);
   /// Convert the hex form of an 4-byte unsigned int to a string.
+  static char *int_to_string (CORBA::ULong number);
 
   /// The error-checking methods below all return void because
   /// they throw a spec-defined exception for every error case
   /// (specifically one of the BAD_PARAM minor versions).
 
+  /// Checks for illegal member type in given container type.
   static void valid_container (CORBA::DefinitionKind container_kind,
                                CORBA::DefinitionKind contained_kind
                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  /// Checks for illegal member type in given container type.
 
+  /// Wrapper for id_exists() and name_exists().
   static void pre_exist (const char *id,
                          name_clash_checker checker,
                          ACE_Configuration_Section_Key &key,
                          TAO_Repository_i *repo,
                          CORBA::DefinitionKind kind
                          ACE_ENV_ARG_DECL);
-  /// Wrapper for id_exists() and name_exists().
 
+  /// Checks for a global repository id clash.
   static void id_exists (const char *id,
                          TAO_Repository_i *repo
                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  /// Checks for a global repository id clash.
 
+  /// Checks for a local name clash.
   static void name_exists (name_clash_checker checker,
                            ACE_Configuration_Section_Key &key,
                            TAO_Repository_i *repo,
                            CORBA::DefinitionKind kind
                            ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  /// Checks for a local name clash.
 
+  /// Used by interfaces and components to check for name clashes
+  /// in the attributes, operations, or component ports subsections.
   static void check_subsection (name_clash_checker checker,
                                 const char *sub_section,
                                 ACE_Configuration *config,
                                 ACE_Configuration_Section_Key &key
                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  /// Used by interfaces and components to check for name clashes
-  /// in the attributes, operations, or component ports subsections.
 
+  /// Top-level method which calls all the above error-checking methods.
   static void valid_creation (CORBA::DefinitionKind container_kind,
                               CORBA::DefinitionKind contained_kind,
                               const char *id,
@@ -151,8 +152,8 @@ public:
                               ACE_Configuration_Section_Key &key,
                               TAO_Repository_i *repo
                               ACE_ENV_ARG_DECL);
-  /// Top-level method which calls all the above error-checking methods.
 
+  /// Code common to the creation of an entry for any non-anonymous type.
   static ACE_TString create_common (
       CORBA::DefinitionKind container_kind,
       CORBA::DefinitionKind contained_kind,
@@ -166,84 +167,83 @@ public:
       const char *sub_section_name
       ACE_ENV_ARG_DECL
     );
-  /// Code common to the creation of an entry for any non-anonymous type.
-  
+
+  /// Common to Container::create_value() and ValueDef::supported_interfaces(),
+  /// Container::create_component() and Component::supported_interfaces().
   static void set_supported_interfaces (
       const CORBA::InterfaceDefSeq &supported_interfaces,
       ACE_Configuration *config,
       ACE_Configuration_Section_Key &key
     );
-  /// Common to Container::create_value() and ValueDef::supported_interfaces(),
-  /// Container::create_component() and Component::supported_interfaces().
 
+  /// Common code for operations, attributes, and valuetype initializers.
   static void set_exceptions (ACE_Configuration *config,
                               ACE_Configuration_Section_Key &key,
                               const char *sub_section,
                               const CORBA::ExceptionDefSeq &exceptions);
-  /// Common code for operations, attributes, and valuetype initializers.
 
+  /// Implemented here to avoid recursion in the servant classes.
   static CORBA::TypeCode_ptr gen_valuetype_tc_r (
       ACE_Configuration_Section_Key &,
       TAO_Repository_i *
       ACE_ENV_ARG_DECL
     );
-  /// Implemented here to avoid recursion in the servant classes.
 
+  /// Called from the above function.
   static void fill_valuemember_seq (CORBA::ValueMemberSeq &,
                                     ACE_Configuration_Section_Key &,
                                     TAO_Repository_i *
                                     ACE_ENV_ARG_DECL);
-  /// Called from the above function.
 
-  static char *reference_to_path (CORBA::IRObject_ptr obj);
   /// Converison from IR Object reference to key location path.
+  static char *reference_to_path (CORBA::IRObject_ptr obj);
 
+  /// Conversion from key location path to CORBA::DefinitionKind.
   static CORBA::DefinitionKind path_to_def_kind (ACE_TString &path,
                                                  TAO_Repository_i *repo);
-  /// Conversion from key location path to CORBA::DefinitionKind.
 
+  /// Conversion from IR Object reference to CORBA::DefinitionKind.
   static CORBA::DefinitionKind reference_to_def_kind (
       CORBA::IRObject_ptr obj,
       TAO_Repository_i *repo
     );
-  /// Conversion from IR Object reference to CORBA::DefinitionKind.
 
+  /// Converion from key location path to IDLType.
   static TAO_IDLType_i *path_to_idltype (ACE_TString &path,
                                          TAO_Repository_i *repo);
-  /// Converion from key location path to IDLType.
 
+  /// Converion from key location path to IDLType.
   static TAO_Contained_i *path_to_contained (ACE_TString &path,
                                              TAO_Repository_i *repo);
-  /// Converion from key location path to IDLType.
 
+  /// Converion from key location path to IDLType.
   static TAO_Container_i *path_to_container (ACE_TString &path,
                                              TAO_Repository_i *repo);
-  /// Converion from key location path to IDLType.
 
+  /// Conversion from key location path to IR Object reference.
   static CORBA::Object_ptr path_to_ir_object (ACE_TString &path,
                                               TAO_Repository_i *repo
                                               ACE_ENV_ARG_DECL);
-  /// Conversion from key location path to IR Object reference.
 
+  /// Can be called from the above method or directly from a derived class.
   static CORBA::Object_ptr create_objref (CORBA::DefinitionKind def_kind,
                                           const char *obj_id,
                                           TAO_Repository_i *repo
                                           ACE_ENV_ARG_DECL);
-  /// Can be called from the above method or directly from a derived class.
 
-  static char *oid_to_string (PortableServer::ObjectId &oid);
   /// Copy and octet sequence to a string..
+  static char *oid_to_string (PortableServer::ObjectId &oid);
 
 public:
-  static ACE_Configuration_Section_Key tmp_key_;
   /// To hold a key created by one method for another method to use.
   /// Calls to this class will be made after an IFR lock (if any)
   /// has been acquired, so thread safety is not an issue with this
   /// static variable.
-  
-  static TAO_Repository_i *repo_;
-  /// Needed by TAO_InterfaceDef_i::name_clash, probably can be used 
+  static ACE_Configuration_Section_Key tmp_key_;
+
+  /// Needed by TAO_InterfaceDef_i::name_clash, probably can be used
   /// all over the place now that it's here.
+  static TAO_Repository_i *repo_;
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
index f5d6b529406..c598742583f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
@@ -6,7 +6,8 @@
 #include "Contained_i.h"
 #include "IFR_Service_Utils.h"
 
-#include "tao/PortableServer/POA.h"
+#include "tao/PortableServer/Root_POA.h"
+#include "tao/PortableServer/POA_Current_Impl.h"
 #include "tao/TSS_Resources.h"
 
 
@@ -44,12 +45,13 @@ void
 TAO_IRObject_i::update_key (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  TAO_POA_Current_Impl *pc_impl =
-    static_cast<TAO_POA_Current_Impl *> (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
+  TAO::Portable_Server::POA_Current_Impl *pc_impl =
+    static_cast <TAO::Portable_Server::POA_Current_Impl *>
+                     (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
 
   PortableServer::ObjectId object_id;
-  int status = TAO_POA::parse_ir_object_key (pc_impl->object_key (),
-                                             object_id);
+  int status = TAO_Root_POA::parse_ir_object_key (pc_impl->object_key (),
+                                                  object_id);
   if (status != 0)
     {
       ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
index f8f8126a2d9..75a6396abf2 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
@@ -37,6 +37,7 @@
 #include "IFR_macro.h"
 #include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h"
 #include "tao/CORBA_String.h"
+#include "tao/PortableServer/PS_CurrentC.h"
 
 class IFR_Servant_Factory;
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
index e3c8ec41e17..3f2be9cd0f3 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp
@@ -66,7 +66,7 @@ TAO_LB_CPU_Load_Average_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL)
                     CosLoadBalancing::Location (this->location_),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
@@ -121,7 +121,7 @@ TAO_LB_CPU_Load_Average_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
   if (s == 0)
     ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
                         CORBA::SystemException::_tao_minor_code (
-                          TAO_DEFAULT_MINOR_CODE,
+                          TAO::VMCID,
                           errno),
                         CORBA::COMPLETED_NO),
                       0);
@@ -216,7 +216,7 @@ TAO_LB_CPU_Load_Average_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
                     CosLoadBalancing::LoadList (1),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
index 6548995ed0d..24c8216a382 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp
@@ -116,7 +116,7 @@ TAO_LB_CPU_Utilization_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL)
                     CosLoadBalancing::Location (this->location_),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
@@ -140,7 +140,7 @@ TAO_LB_CPU_Utilization_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
                     CosLoadBalancing::LoadList (1),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
index 809fe06b706..57e266921c3 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
@@ -32,7 +32,7 @@ TAO_LB_ClientComponent::register_orb_initializer (void)
                         TAO_LB_ClientORBInitializer,
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
index 0a62009089e..4ab071fd528 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
@@ -26,7 +26,7 @@ TAO_LB_ClientORBInitializer::post_init (
                     TAO_LB_ClientRequestInterceptor,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
index 052001b11fa..fcba172bb61 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
@@ -108,7 +108,7 @@ TAO_LB_Component::register_orb_initializer (
                                                location),
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
index c97b9d804db..5a5e40d8275 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
@@ -79,7 +79,7 @@ TAO_LB_IORInterceptor::components_established (
                                                    this->lm_.in ()),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
index 5a2131175f4..7c65cc62d62 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
@@ -67,7 +67,7 @@ TAO_LB_LeastLoaded::get_properties (ACE_ENV_SINGLE_ARG_DECL)
                     CosLoadBalancing::Properties (this->properties_),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
index 3bca0f64e9a..7c265729e45 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
@@ -65,7 +65,7 @@ TAO_LB_LoadAverage::get_properties (ACE_ENV_SINGLE_ARG_DECL)
                     CosLoadBalancing::Properties (this->properties_),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
index 93e336d1f16..d30a2b159f1 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
@@ -148,7 +148,7 @@ TAO_LB_LoadManager::get_loads (const PortableGroup::Location & the_location
                     CosLoadBalancing::LoadList,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
@@ -882,7 +882,7 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
                         TAO_LB_MemberLocator (this),
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
       ACE_CHECK;
@@ -987,7 +987,7 @@ TAO_LB_LoadManager::init (ACE_Reactor * reactor,
                         TAO_LB_LoadAlert_Handler,
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
       ACE_CHECK;
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
index cfc89538248..2b07ac94a75 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
@@ -66,7 +66,7 @@ TAO_LB_LoadMinimum::get_properties (ACE_ENV_SINGLE_ARG_DECL)
                     CosLoadBalancing::Properties (this->properties_),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h
index cf1b3530fcc..ccdc9af7247 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h
@@ -22,13 +22,12 @@
 #   pragma once
 # endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/PortableServerC.h"
+#include "tao/PortableServer/ServantLocatorC.h"
 #include "tao/LocalObject.h"
 
 // Forward declarations.
 class TAO_LB_LoadManager;
 
-
 /**
  * @class TAO_LB_MemberLocator
  *
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
index 245fc0552b1..035486af6d3 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
@@ -58,7 +58,7 @@ TAO_LB_ORBInitializer::post_init (
                                            this->load_alert_),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
@@ -76,7 +76,7 @@ TAO_LB_ORBInitializer::post_init (
                     TAO_LB_ServerRequestInterceptor (this->load_alert_),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
index b73c9045283..ff1f158b0e3 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
@@ -42,7 +42,7 @@ TAO_LB_Random::get_properties (ACE_ENV_SINGLE_ARG_DECL)
                     CosLoadBalancing::Properties,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (props);
@@ -146,7 +146,7 @@ TAO_LB_Random::_tao_next_member (
 
   // Prevent integer arithmetic overflow.
   const CORBA::Float flen = static_cast<CORBA::Float> (len);
-                                  
+
   const CORBA::ULong i =
     static_cast<CORBA::ULong> (flen * ACE_OS::rand () / (RAND_MAX + 1.0));
 
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
index 6e8c1db4288..28507f0b1d6 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
@@ -41,7 +41,7 @@ TAO_LB_RoundRobin::get_properties (ACE_ENV_SINGLE_ARG_DECL)
                     CosLoadBalancing::Properties,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (props);
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
index 4ba07961c82..e2bce0b2951 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
@@ -1,5 +1,6 @@
 /* -*- C++ -*- */
 // $Id$
+
 // ============================================================================
 //
 // = LIBRARY
@@ -18,6 +19,7 @@
 #include /**/ "ace/pre.h"
 
 #include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/ServantActivatorC.h"
 #include "tao/LocalObject.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
index 1b350eced06..524bdb9821a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
@@ -268,7 +268,7 @@ TAO_Notify_Consumer::dispatch_request (TAO_Notify_Method_Request_Event * request
         }
         break;
 
-      case TAO_DEFAULT_MINOR_CODE:
+      case TAO::VMCID:
       default:
         switch (ex.minor () & BITS_5_THRU_12_MASK)
           {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
index 91a23f48ff6..0c24d0b14af 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
@@ -4,7 +4,7 @@
 
 #include "Service.h"
 #include "ace/Dynamic_Service.h"
-#include "tao/PortableServer/POA.h"
+#include "tao/PortableServer/Root_POA.h"
 #include "tao/ORB_Core.h"
 
 CosNotifyChannelAdmin::EventChannelFactory_ptr
@@ -20,7 +20,7 @@ TAO_Notify_EventChannelFactory_i::create (PortableServer::POA_ptr default_POA AC
     return notify_factory._retn ();
   }
 
-  TAO_POA *poa = default_POA->_tao_poa_downcast();
+  TAO_Root_POA *poa = dynamic_cast <TAO_Root_POA*>(default_POA);
 
   if (poa == 0)
     return notify_factory._retn ();
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.idl b/TAO/orbsvcs/orbsvcs/PortableGroup.idl
index ba592f8abcd..310952a767a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup.idl
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup.idl
@@ -11,6 +11,7 @@
 #ifndef _PORTABLEGROUP_IDL_
 #define _PORTABLEGROUP_IDL_
 
+#include "tao/PortableServer/PortableServer_include.pidl"
 #include "CosNaming.idl"
 #include "tao/IOP.pidl"
 #include "tao/GIOP.pidl"
@@ -299,8 +300,24 @@ module PortableGroup
         in boolean is_primary);
   };
 
+  exception NotAGroupObject {};
+  typedef sequence <PortableServer::ObjectId> IDs;
 
+  local interface GOA : PortableServer::POA {
+    PortableServer::ObjectId create_id_for_reference(in Object the_ref)
+      raises (NotAGroupObject);
 
+    IDs reference_to_ids(in Object the_ref)
+      raises (NotAGroupObject);
+
+    void associate_reference_with_id (in Object ref,
+                                      in PortableServer::ObjectId oid)
+      raises (NotAGroupObject);
+
+    void disassociate_reference_with_id (in Object ref,
+                                         in PortableServer::ObjectId oid)
+      raises (NotAGroupObject);
+  };
 }; // end PortableGroup
 
 #endif  /* _PORTABLEGROUP_IDL_ */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
new file mode 100644
index 00000000000..f05d0f582f8
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
@@ -0,0 +1,713 @@
+#include "GOA.h"
+
+ACE_RCSID (PortableGroup,
+           GOA,
+           "$Id$")
+
+#include "tao/ORB_Core.h"
+#include "tao/ORB.h"
+#include "tao/Stub.h"
+#include "tao/Tagged_Components.h"
+#include "tao/Profile.h"
+#include "tao/CDR.h"
+
+#include "ace/Auto_Ptr.h"
+
+#include "PortableGroup_Acceptor_Registry.h"
+#include "PortableGroup_Request_Dispatcher.h"
+
+PortableServer::ObjectId *
+TAO_GOA::create_id_for_reference (CORBA::Object_ptr the_ref
+                                  ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      PortableGroup::NotAGroupObject
+    ))
+{
+  // Get the RepositoryId from the Group reference so
+  // we know what kind of reference to make.
+  const char* repository_id = the_ref->_stubobj ()->type_id.in ();
+
+  // Create a temporary object reference and then get the
+  // ObjectId out of it.
+  CORBA::Object_var obj_ref = this->create_reference (repository_id
+                                                      ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  PortableServer::ObjectId_var obj_id = this->reference_to_id (obj_ref.in ()
+                                                                ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  // Associate the object reference with the group reference.
+  this->associate_group_with_ref (the_ref,
+                                  obj_ref.in ()
+                                  ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  return obj_id._retn ();
+}
+
+PortableGroup::IDs *
+TAO_GOA::reference_to_ids (CORBA::Object_ptr the_ref
+                           ACE_ENV_ARG_DECL_NOT_USED)
+    ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      PortableGroup::NotAGroupObject
+    ))
+{
+  ACE_UNUSED_ARG (the_ref);
+
+  return 0;
+}
+
+void
+TAO_GOA::associate_reference_with_id (CORBA::Object_ptr ref,
+                                      const PortableServer::ObjectId & oid
+                                      ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      PortableGroup::NotAGroupObject
+    ))
+{
+  // Create a reference for the specified ObjectId, since
+  // it is much easier to extract the object key from the
+  // reference.
+  CORBA::Object_var obj_ref = this->id_to_reference (oid
+                                                     ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // Associate the object reference with the group reference.
+  this->associate_group_with_ref (ref,
+                                  obj_ref.in ()
+                                  ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+void
+TAO_GOA::disassociate_reference_with_id (CORBA::Object_ptr ref,
+                                         const PortableServer::ObjectId & oid
+                                         ACE_ENV_ARG_DECL_NOT_USED)
+    ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      PortableGroup::NotAGroupObject
+    ))
+{
+  ACE_UNUSED_ARG (ref);
+  ACE_UNUSED_ARG (oid);
+}
+
+
+TAO_GOA::TAO_GOA (const TAO_Root_POA::String &name,
+                        TAO_POA_Manager &poa_manager,
+                        const TAO_POA_Policy_Set &policies,
+                        TAO_Root_POA *parent,
+                        ACE_Lock &lock,
+                        TAO_SYNCH_MUTEX &thread_lock,
+                        TAO_ORB_Core &orb_core,
+                        TAO_Object_Adapter *object_adapter
+                        ACE_ENV_ARG_DECL)
+  : TAO_Regular_POA (name,
+             poa_manager,
+             policies,
+             parent,
+             lock,
+             thread_lock,
+             orb_core,
+             object_adapter
+             ACE_ENV_ARG_PARAMETER)
+{
+}
+
+TAO_GOA::~TAO_GOA (void)
+{
+}
+
+TAO_Root_POA *
+TAO_GOA::new_POA (const String &name,
+                     TAO_POA_Manager &poa_manager,
+                     const TAO_POA_Policy_Set &policies,
+                     TAO_Root_POA *parent,
+                     ACE_Lock &lock,
+                     TAO_SYNCH_MUTEX &thread_lock,
+                     TAO_ORB_Core &orb_core,
+                     TAO_Object_Adapter *object_adapter
+                     ACE_ENV_ARG_DECL)
+{
+  TAO_GOA *poa;
+
+  ACE_NEW_THROW_EX (poa,
+                    TAO_GOA (name,
+                                poa_manager,
+                                policies,
+                                parent,
+                                lock,
+                                thread_lock,
+                                orb_core,
+                                object_adapter
+                                ACE_ENV_ARG_PARAMETER),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (0);
+
+  return poa;
+}
+
+// Standard POA interfaces
+PortableServer::POA_ptr
+TAO_GOA::create_POA (const char *adapter_name,
+                        PortableServer::POAManager_ptr poa_manager,
+                        const CORBA::PolicyList &policies
+                        ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::AdapterAlreadyExists,
+                   PortableServer::POA::InvalidPolicy))
+{
+  PortableServer::POA_ptr poa = this->TAO_Regular_POA::create_POA (adapter_name,
+                                                           poa_manager,
+                                                           policies
+                                                           ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (poa);
+  return poa;
+}
+
+PortableServer::POA_ptr
+TAO_GOA::find_POA (const char *adapter_name,
+                      CORBA::Boolean activate_it
+                      ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::AdapterNonExistent))
+{
+  PortableServer::POA_ptr poa = this->TAO_Regular_POA::find_POA (adapter_name,
+                                                         activate_it
+                                                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (poa);
+  return poa;
+}
+
+void
+TAO_GOA::destroy (CORBA::Boolean etherealize_objects,
+                     CORBA::Boolean wait_for_completion
+                     ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->TAO_Regular_POA::destroy (etherealize_objects,
+                          wait_for_completion
+                          ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+PortableServer::ThreadPolicy_ptr
+TAO_GOA::create_thread_policy (PortableServer::ThreadPolicyValue value
+                                  ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  PortableServer::ThreadPolicy_ptr policy =
+    this->TAO_Regular_POA::create_thread_policy (value
+                                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (policy);
+  return policy;
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+PortableServer::LifespanPolicy_ptr
+TAO_GOA::create_lifespan_policy (PortableServer::LifespanPolicyValue value
+                                    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  PortableServer::LifespanPolicy_ptr policy =
+    this->TAO_Regular_POA::create_lifespan_policy (value
+                                           ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (policy);
+  return policy;
+}
+
+PortableServer::IdUniquenessPolicy_ptr
+TAO_GOA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value
+                                         ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  PortableServer::IdUniquenessPolicy_ptr policy =
+    this->TAO_Regular_POA::create_id_uniqueness_policy (value
+                                                ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (policy);
+  return policy;
+}
+
+
+PortableServer::IdAssignmentPolicy_ptr
+TAO_GOA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value
+                                         ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  PortableServer::IdAssignmentPolicy_ptr policy =
+    this->TAO_Regular_POA::create_id_assignment_policy (value
+                                                ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (policy);
+  return policy;
+}
+
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+PortableServer::ImplicitActivationPolicy_ptr
+TAO_GOA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value
+                                               ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  PortableServer::ImplicitActivationPolicy_ptr policy =
+    this->TAO_Regular_POA::create_implicit_activation_policy (value
+                                                      ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (policy);
+  return policy;
+}
+
+PortableServer::ServantRetentionPolicy_ptr
+TAO_GOA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value
+                                             ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  PortableServer::ServantRetentionPolicy_ptr policy =
+    this->TAO_Regular_POA::create_servant_retention_policy (value
+                                                    ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (policy);
+  return policy;
+}
+
+
+PortableServer::RequestProcessingPolicy_ptr
+TAO_GOA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value
+                                              ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  PortableServer::RequestProcessingPolicy_ptr policy =
+    this->TAO_Regular_POA::create_request_processing_policy (value
+                                                     ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (policy);
+  return policy;
+}
+
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+char *
+TAO_GOA::the_name (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  char * name =
+    this->TAO_Regular_POA::the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (name);
+  return name;
+}
+
+PortableServer::POA_ptr
+TAO_GOA::the_parent (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  PortableServer::POA_ptr parent =
+    this->TAO_Regular_POA::the_parent (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (parent);
+  return parent;
+}
+
+PortableServer::POAList *
+TAO_GOA::the_children (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  PortableServer::POAList *children =
+    this->TAO_Regular_POA::the_children (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (children);
+  return children;
+}
+
+PortableServer::POAManager_ptr
+TAO_GOA::the_POAManager (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  PortableServer::POAManager_ptr poa_manager =
+    this->TAO_Regular_POA::the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (poa_manager);
+  return poa_manager;
+}
+
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+PortableServer::AdapterActivator_ptr
+TAO_GOA::the_activator (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  PortableServer::AdapterActivator_ptr activator =
+    this->TAO_Regular_POA::the_activator (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (activator);
+  return activator;
+}
+
+void
+TAO_GOA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator
+                           ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  this->TAO_Regular_POA::the_activator (adapter_activator
+                                ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+PortableServer::ServantManager_ptr
+TAO_GOA::get_servant_manager (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::WrongPolicy))
+{
+  PortableServer::ServantManager_ptr servant_manager =
+    this->TAO_Regular_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (servant_manager);
+  return servant_manager;
+}
+
+void
+TAO_GOA::set_servant_manager (PortableServer::ServantManager_ptr imgr
+                                 ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::WrongPolicy))
+{
+  this->TAO_Regular_POA::set_servant_manager (imgr
+                                      ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+PortableServer::Servant
+TAO_GOA::get_servant (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::NoServant,
+                   PortableServer::POA::WrongPolicy))
+{
+  PortableServer::Servant servant =
+    this->TAO_Regular_POA::get_servant (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (servant);
+  return servant;
+}
+
+void
+TAO_GOA::set_servant (PortableServer::Servant servant
+                         ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::WrongPolicy))
+{
+  this->TAO_Regular_POA::set_servant (servant
+                              ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+PortableServer::ObjectId *
+TAO_GOA::activate_object (PortableServer::Servant p_servant
+                             ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ServantAlreadyActive,
+                   PortableServer::POA::WrongPolicy))
+{
+  PortableServer::ObjectId *object_id =
+    this->TAO_Regular_POA::activate_object (p_servant
+                                    ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (object_id);
+  return object_id;
+}
+
+void
+TAO_GOA::activate_object_with_id (const PortableServer::ObjectId &id,
+                                     PortableServer::Servant p_servant
+                                     ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ServantAlreadyActive,
+                   PortableServer::POA::ObjectAlreadyActive,
+                   PortableServer::POA::WrongPolicy))
+{
+  this->TAO_Regular_POA::activate_object_with_id (id,
+                                          p_servant
+                                          ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+void
+TAO_GOA::deactivate_object (const PortableServer::ObjectId &oid
+                               ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ObjectNotActive,
+                   PortableServer::POA::WrongPolicy))
+{
+  this->TAO_Regular_POA::deactivate_object (oid
+                                    ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+CORBA::Object_ptr
+TAO_GOA::create_reference (const char *intf
+                              ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::WrongPolicy))
+{
+  CORBA::Object_ptr obj =
+    this->TAO_Regular_POA::create_reference (intf
+                                     ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (obj);
+  return obj;
+}
+
+CORBA::Object_ptr
+TAO_GOA::create_reference_with_id (const PortableServer::ObjectId &oid,
+                                   const char *intf
+                                   ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  CORBA::Object_ptr obj =
+    this->TAO_Regular_POA::create_reference_with_id (oid,
+                                             intf
+                                             ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (obj);
+  return obj;
+}
+
+PortableServer::ObjectId *
+TAO_GOA::servant_to_id (PortableServer::Servant p_servant
+                           ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ServantNotActive,
+                   PortableServer::POA::WrongPolicy))
+{
+  PortableServer::ObjectId *object_id =
+    this->TAO_Regular_POA::servant_to_id (p_servant
+                                  ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (object_id);
+  return object_id;
+}
+
+CORBA::Object_ptr
+TAO_GOA::servant_to_reference (PortableServer::Servant p_servant
+                                  ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ServantNotActive,
+                   PortableServer::POA::WrongPolicy))
+{
+  CORBA::Object_ptr obj =
+    this->TAO_Regular_POA::servant_to_reference (p_servant
+                                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (obj);
+  return obj;
+}
+
+
+PortableServer::Servant
+TAO_GOA::reference_to_servant (CORBA::Object_ptr reference
+                                  ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ObjectNotActive,
+                   PortableServer::POA::WrongAdapter,
+                   PortableServer::POA::WrongPolicy))
+{
+  PortableServer::Servant servant =
+    this->TAO_Regular_POA::reference_to_servant (reference
+                                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (servant);
+  return servant;
+}
+
+PortableServer::ObjectId *
+TAO_GOA::reference_to_id (CORBA::Object_ptr reference
+                             ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::WrongAdapter,
+                   PortableServer::POA::WrongPolicy))
+{
+  PortableServer::ObjectId *object_id =
+    this->TAO_Regular_POA::reference_to_id (reference
+                                    ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (object_id);
+  return object_id;
+}
+
+PortableServer::Servant
+TAO_GOA::id_to_servant (const PortableServer::ObjectId &oid
+                           ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ObjectNotActive,
+                   PortableServer::POA::WrongPolicy))
+{
+  PortableServer::Servant servant =
+    this->TAO_Regular_POA::id_to_servant (oid
+                                  ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (servant);
+  return servant;
+}
+
+CORBA::Object_ptr
+TAO_GOA::id_to_reference (const PortableServer::ObjectId &oid
+                             ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ObjectNotActive,
+                   PortableServer::POA::WrongPolicy))
+{
+  CORBA::Object_ptr obj =
+    this->TAO_Regular_POA::id_to_reference (oid
+                                    ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (obj);
+  return obj;
+}
+
+CORBA::OctetSeq *
+TAO_GOA::id (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->TAO_Regular_POA::id (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+int
+TAO_GOA::find_group_component (const CORBA::Object_ptr the_ref,
+                               PortableGroup::TagGroupTaggedComponent &group)
+{
+  const TAO_MProfile& profiles = the_ref->_stubobj ()->base_profiles ();
+  const TAO_Profile* profile;
+  CORBA::ULong slot;
+
+  // Iterate through the tagged profiles, and
+  // create acceptors for the multicast ones.
+  slot = 0;
+  while ((profile = profiles.get_profile (slot)))
+    {
+      if (this->find_group_component_in_profile (profile, group) == 0)
+        return 0;
+
+      ++slot;
+    }
+
+  // Not found.
+  return -1;
+}
+
+int
+TAO_GOA::find_group_component_in_profile (const TAO_Profile* profile,
+                                          PortableGroup::TagGroupTaggedComponent &group)
+{
+  // Iterate through the tagged components looking for
+  // group tag.
+  const TAO_Tagged_Components& components = profile->tagged_components ();
+
+  IOP::TaggedComponent tagged_component;
+  tagged_component.tag = IOP::TAG_GROUP;
+
+  // Try to find it.
+  if (components.get_component (tagged_component) == 0)
+    return -1;
+
+  // Found it.
+  const CORBA::Octet *buf =
+    tagged_component.component_data.get_buffer ();
+
+  TAO_InputCDR in_cdr (ACE_reinterpret_cast (const char*, buf),
+                       tagged_component.component_data.length ());
+
+  // Extract the Byte Order.
+  CORBA::Boolean byte_order;
+  if ((in_cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
+    return -1;
+  in_cdr.reset_byte_order (ACE_static_cast(int, byte_order));
+
+  if ((in_cdr >> group) == 0)
+    return -1;
+
+  return 0;
+}
+
+int
+TAO_GOA::create_group_acceptors (CORBA::Object_ptr the_ref,
+                                 TAO_PortableGroup_Acceptor_Registry &acceptor_registry,
+                                 TAO_ORB_Core &orb_core
+                                 ACE_ENV_ARG_DECL)
+{
+  const TAO_MProfile& profiles = the_ref->_stubobj ()->base_profiles ();
+  const TAO_Profile* profile;
+  CORBA::ULong slot;
+  int num = 0;
+
+  // Iterate through the tagged profiles, and
+  // create acceptors for the multicast ones.
+  slot = 0;
+  while ((profile = profiles.get_profile (slot)))
+    {
+      if (profile->supports_multicast ())
+        {
+          acceptor_registry.open (profile,
+                                  orb_core
+                                  ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
+          ++num;
+        }
+
+      ++slot;
+    }
+
+  // Return the number of acceptors registered.
+  return num;
+}
+
+void
+TAO_GOA::associate_group_with_ref (
+      CORBA::Object_ptr group_ref,
+      CORBA::Object_ptr obj_ref
+      ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     PortableGroup::NotAGroupObject))
+{
+  // Find the Group Component so that we can extract the Group ID.
+  PortableGroup::TagGroupTaggedComponent *tmp_group_id;
+  ACE_NEW_THROW_EX (tmp_group_id,
+                    PortableGroup::TagGroupTaggedComponent,
+                    CORBA::NO_MEMORY (
+                      CORBA::SystemException::_tao_minor_code (
+                        TAO::VMCID,
+                        ENOMEM),
+                      CORBA::COMPLETED_NO));
+  ACE_CHECK;
+
+  PortableGroup::TagGroupTaggedComponent_var group_id = tmp_group_id;
+
+  if (this->find_group_component (group_ref, group_id.inout ()) != 0)
+    {
+      // Group component wasn't found.  The group reference
+      // that was passed in must be bogus.
+      ACE_THROW (PortableGroup::NotAGroupObject ());
+    }
+
+  PortableGroup_Request_Dispatcher *rd =
+    dynamic_cast <PortableGroup_Request_Dispatcher*>(
+      this->orb_core_.request_dispatcher());
+
+  // Create the acceptors necessary to receive requests for the
+  // specified group reference.
+  this->create_group_acceptors (group_ref,
+                                rd->acceptor_registry_,
+                                this->orb_core_
+                                ACE_ENV_ARG_PARAMETER);
+
+  ACE_CHECK;
+
+
+  // Add a mapping from GroupId to Object key in the PortableGroup
+  const TAO::ObjectKey &key =
+    obj_ref->_stubobj ()->profile_in_use ()->object_key ();
+  rd->group_map_.add_groupid_objectkey_pair (group_id._retn (),
+                                             key
+                                             ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
new file mode 100644
index 00000000000..b1e08712f4e
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
@@ -0,0 +1,325 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    GOA.h
+ *
+ *  $Id$
+ *
+ *  Header file for Group Object Adapter
+ *
+ *  @author  Several
+ */
+//=============================================================================
+
+#ifndef TAO_GOA_H
+#define TAO_GOA_H
+
+#include /**/ "ace/pre.h"
+
+#include "portablegroup_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/PortableServer/Regular_POA.h"
+#include "orbsvcs/PortableGroupC.h"
+
+// This is to remove "inherits via dominance" warnings from MSVC.
+// MSVC is being a little too paranoid.
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+class TAO_Profile;
+class TAO_PortableGroup_Acceptor_Registry;
+
+/**
+ * @class TAO_GOA
+ *
+ * @brief Implementation of the PortableGroup::GOA interface.
+ *
+ * Implementation of the PortableGroup::GOA interface.
+ */
+class TAO_PortableGroup_Export TAO_GOA :
+    public virtual PortableGroup::GOA,
+    public virtual TAO_Regular_POA
+{
+public:
+  // Methods added by the
+  /// @name MIOP specification methods
+  //@{
+  virtual PortableServer::ObjectId * create_id_for_reference (
+      CORBA::Object_ptr the_ref
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      PortableGroup::NotAGroupObject
+    ));
+
+
+  virtual PortableGroup::IDs * reference_to_ids (
+      CORBA::Object_ptr the_ref
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      PortableGroup::NotAGroupObject
+    ));
+
+  virtual void associate_reference_with_id (
+      CORBA::Object_ptr ref,
+      const PortableServer::ObjectId & oid
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      PortableGroup::NotAGroupObject
+    ));
+
+  virtual void disassociate_reference_with_id (
+      CORBA::Object_ptr ref,
+      const PortableServer::ObjectId & oid
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS
+    )
+    ACE_THROW_SPEC ((
+      CORBA::SystemException,
+      PortableGroup::NotAGroupObject
+    ));
+  //@}
+
+  // Standard POA interface methods
+  PortableServer::POA_ptr create_POA (const char *adapter_name,
+                                      PortableServer::POAManager_ptr poa_manager,
+                                      const CORBA::PolicyList &policies
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     PortableServer::POA::AdapterAlreadyExists,
+                     PortableServer::POA::InvalidPolicy));
+
+  PortableServer::POA_ptr find_POA (const char *adapter_name,
+                                    CORBA::Boolean activate_it
+                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     PortableServer::POA::AdapterNonExistent));
+
+  void destroy (CORBA::Boolean etherealize_objects,
+                CORBA::Boolean wait_for_completion
+                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+  PortableServer::ThreadPolicy_ptr create_thread_policy (PortableServer::ThreadPolicyValue value
+                                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+  PortableServer::LifespanPolicy_ptr create_lifespan_policy (PortableServer::LifespanPolicyValue value
+                                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value
+                                                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value
+                                                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+  PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value
+                                                                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value
+                                                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value
+                                                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+  char * the_name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  PortableServer::POA_ptr the_parent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  PortableServer::POAList *the_children (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  PortableServer::POAManager_ptr the_POAManager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+  PortableServer::AdapterActivator_ptr the_activator (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  void the_activator (PortableServer::AdapterActivator_ptr adapter_activator
+                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  PortableServer::ServantManager_ptr get_servant_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     PortableServer::POA::WrongPolicy));
+
+  void set_servant_manager (PortableServer::ServantManager_ptr imgr
+                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     PortableServer::POA::WrongPolicy));
+
+  PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     PortableServer::POA::NoServant,
+                     PortableServer::POA::WrongPolicy));
+
+  void set_servant (PortableServer::Servant servant
+                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     PortableServer::POA::WrongPolicy));
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+  PortableServer::ObjectId *activate_object (PortableServer::Servant p_servant
+                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     PortableServer::POA::ServantAlreadyActive,
+                     PortableServer::POA::WrongPolicy));
+
+  void activate_object_with_id (const PortableServer::ObjectId &id,
+                                PortableServer::Servant p_servant
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     PortableServer::POA::ServantAlreadyActive,
+                     PortableServer::POA::ObjectAlreadyActive,
+                     PortableServer::POA::WrongPolicy));
+
+  void deactivate_object (const PortableServer::ObjectId &oid
+                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     PortableServer::POA::ObjectNotActive,
+                     PortableServer::POA::WrongPolicy));
+
+  CORBA::Object_ptr create_reference (const char *intf
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     PortableServer::POA::WrongPolicy));
+
+  CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid,
+                                              const char *intf
+                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant
+                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     PortableServer::POA::ServantNotActive,
+                     PortableServer::POA::WrongPolicy));
+
+  CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant
+                                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     PortableServer::POA::ServantNotActive,
+                     PortableServer::POA::WrongPolicy));
+
+  PortableServer::Servant reference_to_servant (CORBA::Object_ptr reference
+                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     PortableServer::POA::ObjectNotActive,
+                     PortableServer::POA::WrongAdapter,
+                     PortableServer::POA::WrongPolicy));
+
+  PortableServer::ObjectId *reference_to_id (CORBA::Object_ptr reference
+                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     PortableServer::POA::WrongAdapter,
+                     PortableServer::POA::WrongPolicy));
+
+  PortableServer::Servant id_to_servant (const PortableServer::ObjectId &oid
+                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     PortableServer::POA::ObjectNotActive,
+                     PortableServer::POA::WrongPolicy));
+
+  CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid
+                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     PortableServer::POA::ObjectNotActive,
+                     PortableServer::POA::WrongPolicy));
+
+  CORBA::OctetSeq *id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+  // End standard POA interface methods.
+
+  TAO_GOA (const String &name,
+           TAO_POA_Manager &poa_manager,
+           const TAO_POA_Policy_Set &policies,
+           TAO_Root_POA *parent,
+           ACE_Lock &lock,
+           TAO_SYNCH_MUTEX &thread_lock,
+           TAO_ORB_Core &orb_core,
+           TAO_Object_Adapter *object_adapter
+           ACE_ENV_ARG_DECL);
+
+  virtual ~TAO_GOA (void);
+
+    // Used to force the initialization of the code.
+    static int Initializer (void);
+
+protected:
+
+  /// Template method for creating new POA's of this type.
+  virtual TAO_Root_POA *new_POA (const String &name,
+                            TAO_POA_Manager &poa_manager,
+                            const TAO_POA_Policy_Set &policies,
+                            TAO_Root_POA *parent,
+                            ACE_Lock &lock,
+                            TAO_SYNCH_MUTEX &thread_lock,
+                            TAO_ORB_Core &orb_core,
+                            TAO_Object_Adapter *object_adapter
+                            ACE_ENV_ARG_DECL);
+
+  int find_group_component (const CORBA::Object_ptr the_ref,
+                            PortableGroup::TagGroupTaggedComponent &group);
+
+  int find_group_component_in_profile (
+      const TAO_Profile* profile,
+      PortableGroup::TagGroupTaggedComponent &group
+    );
+
+  int create_group_acceptors (
+      CORBA::Object_ptr the_ref,
+      TAO_PortableGroup_Acceptor_Registry &acceptor_registry,
+      TAO_ORB_Core &orb_core
+      ACE_ENV_ARG_DECL
+    );
+
+  /// Helper function to associate group references with
+  /// object references.
+  void associate_group_with_ref (
+        CORBA::Object_ptr group_ref,
+        CORBA::Object_ptr obj_ref
+        ACE_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       PortableGroup::NotAGroupObject));
+};
+
+// ****************************************************************
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_GOA_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp
index 41daec0ca8b..8148eff7164 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp
@@ -2,6 +2,7 @@
 #include "UIPMC_Factory.h"
 #include "ace/Service_Config.h"
 #include "PortableGroup_Loader.h"
+#include "PG_Object_Adapter_Factory.h"
 
 ACE_RCSID (PortableGroup,
            UIPMC_Factory,
@@ -12,9 +13,12 @@ namespace TAO
   /*static*/ int
   MIOP_Loader::Initializer (void)
   {
-    /*ACE_Service_Config::process_directive (
+    ACE_Service_Config::process_directive (
       ace_svc_desc_TAO_PortableGroup_Loader);
-    */
+
+    ACE_Service_Config::process_directive (
+      ace_svc_desc_TAO_PG_Object_Adapter_Factory);
+
     return ACE_Service_Config::process_directive (
       ace_svc_desc_TAO_UIPMC_Protocol_Factory);
   }
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
index 1ab07283025..34567542613 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
@@ -9,7 +9,7 @@
 #include "ace/OS_NS_unistd.h"
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/PortableServer/POAManagerC.h"
 #include "PG_Operators.h" // operator == on CosNaming::Name
 
 // Use this macro at the beginning of CORBA methods
@@ -640,7 +640,7 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location (
   // allocate stucture to be returned.
   PortableGroup::FactoryInfos_var result = 0;
   ACE_NEW_THROW_EX (result, ::PortableGroup::FactoryInfos(),
-    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO));
+    CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO));
 
   ACE_CHECK_RETURN (0);
 
@@ -671,7 +671,7 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location (
   METHOD_ENTRY(TAO::PG_FactoryRegistry::list_factories_by_location);
   ::PortableGroup::FactoryInfos_var result;
   ACE_NEW_THROW_EX (result, ::PortableGroup::FactoryInfos(this->registry_.current_size()),
-    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO));
+    CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO));
 
    ACE_CHECK_RETURN (0);
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
index f0da337d804..1a9c5f8b23f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
@@ -165,7 +165,7 @@ TAO_PG_GenericFactory::create_object (
                         PortableGroup::GenericFactory::FactoryCreationId,
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
       ACE_CHECK_RETURN (CORBA::Object::_nil ());
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
index d9f3e51eaea..46e3d06b648 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.h
@@ -23,7 +23,7 @@
 
 #include "ace/Hash_Map_Manager.h"
 #include "portablegroup_export.h"
-#include "tao/PortableServer/PortableServerC.h"
+#include "tao/PortableServer/PortableServer.h"
 #include "orbsvcs/PortableGroupC.h"
 #include "PG_Object_Group_Manipulator.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
index 39b65b8768b..9dbc38d7ad8 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
@@ -204,7 +204,7 @@ TAO_PG_ObjectGroupManager::add_member_i (
                         TAO_PG_ObjectGroup_Array,
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
       ACE_CHECK_RETURN (0);
@@ -260,7 +260,7 @@ TAO_PG_ObjectGroupManager::remove_member (
 
   // Multiple members from different object groups may reside at the
   // same location.  Iterate through the list to attempt to find a
-  // match for the exact object group. 
+  // match for the exact object group.
   size_t to_be_removed = 0;
 
   // get the position of the object group in the object_group_array
@@ -335,7 +335,7 @@ TAO_PG_ObjectGroupManager::locations_of_members (
                     PortableGroup::Locations,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
@@ -514,8 +514,8 @@ TAO_PG_ObjectGroupManager::get_object_group_ref_from_id (
                       this->lock_,
                       PortableGroup::ObjectGroup::_nil ());
 
-    if (this->object_group_map_.find (ACE_U64_TO_U32 (group_id), 
-                                      group_entry) 
+    if (this->object_group_map_.find (ACE_U64_TO_U32 (group_id),
+                                      group_entry)
          != 0)
       {
         ACE_THROW_RETURN (PortableGroup::ObjectGroupNotFound (),
@@ -554,7 +554,7 @@ TAO_PG_ObjectGroupManager::create_object_group (
                     TAO_PG_ObjectGroup_Map_Entry,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
@@ -680,7 +680,7 @@ TAO_PG_ObjectGroupManager::get_properties (
                     PortableGroup::Properties,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp
new file mode 100644
index 00000000000..30727bb8e75
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.cpp
@@ -0,0 +1,46 @@
+// $Id$
+
+#include "PG_Object_Adapter_Factory.h"
+#include "PG_Servant_Dispatcher.h"
+
+#include "tao/PortableServer/Object_Adapter.h"
+#include "tao/ORB_Core.h"
+
+ACE_RCSID (TAO_PortableGroup,
+           PG_Object_Adapter_Factory,
+           "$Id$")
+
+
+TAO_PG_Object_Adapter_Factory::TAO_PG_Object_Adapter_Factory (void)
+{
+}
+
+TAO_Adapter*
+TAO_PG_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core)
+{
+  TAO_Object_Adapter *object_adapter = 0;
+  ACE_NEW_RETURN (object_adapter,
+                  TAO_Object_Adapter (orb_core->server_factory ()->
+                                        active_object_map_creation_parameters (),
+                                      *orb_core),
+                  0);
+
+  // Create and register the RT servant dispatcher.
+  TAO_PG_Servant_Dispatcher *rt_servant_dispatcher;
+  ACE_NEW_RETURN (rt_servant_dispatcher,
+                  TAO_PG_Servant_Dispatcher,
+                  0);
+  object_adapter->servant_dispatcher (rt_servant_dispatcher);
+
+
+  return object_adapter;
+}
+
+ACE_FACTORY_DEFINE (TAO_PortableGroup, TAO_PG_Object_Adapter_Factory)
+ACE_STATIC_SVC_DEFINE (TAO_PG_Object_Adapter_Factory,
+                       ACE_TEXT ("TAO_GOA"),
+                       ACE_SVC_OBJ_T,
+                       &ACE_SVC_NAME (TAO_PG_Object_Adapter_Factory),
+                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+                       0)
+
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h
new file mode 100644
index 00000000000..189d77873a8
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h
@@ -0,0 +1,42 @@
+/* -*- C++ -*- */
+//=============================================================================
+/**
+ *  @file    PG_Object_Adapter_Factory.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen
+ */
+// ===================================================================
+
+#ifndef TAO_PG_OBJECT_ADAPTER_FACTORY_H
+#define TAO_PG_OBJECT_ADAPTER_FACTORY_H
+#include /**/ "ace/pre.h"
+
+#include "portablegroup_export.h"
+
+#include "tao/PortableServer/Object_Adapter_Factory.h"
+#include "tao/orbconf.h"
+
+#include "ace/Service_Config.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+class TAO_PortableGroup_Export TAO_PG_Object_Adapter_Factory : public TAO_Object_Adapter_Factory
+{
+public:
+  /// Constructor
+  TAO_PG_Object_Adapter_Factory (void);
+
+  /// Create adapter.
+  virtual TAO_Adapter *create (TAO_ORB_Core *orb_core);
+};
+
+ACE_STATIC_SVC_DECLARE (TAO_PG_Object_Adapter_Factory)
+ACE_FACTORY_DECLARE (TAO_PortableGroup, TAO_PG_Object_Adapter_Factory)
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_PG_OBJECT_ADAPTER_FACTORY_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
index 825572e1f5c..d00480c4dd4 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.cpp
@@ -6,7 +6,6 @@
 #include "PG_Operators.h" // Borrow operator== on CosNaming::Name
 #include "PG_Utils.h"
 
-#include "tao/PortableServer/ORB_Manager.h"
 #include "tao/debug.h"
 
 #include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
index abab2a89e0a..46d1380f826 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
@@ -70,7 +70,7 @@ TAO_PG_PropertyManager::get_default_properties (
                     PortableGroup::Properties (this->default_properties_),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
@@ -154,7 +154,7 @@ TAO_PG_PropertyManager::get_type_properties (
                     PortableGroup::Properties (props_len),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
@@ -290,7 +290,7 @@ TAO_PG_PropertyManager::get_properties (
                     PortableGroup::Properties (properties_len),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
new file mode 100644
index 00000000000..67958aa2bbf
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
@@ -0,0 +1,63 @@
+// @(#) $Id$
+
+#include "PG_Servant_Dispatcher.h"
+#include "GOA.h"
+
+ACE_RCSID(PortableGroup,
+          PG_Servant_Dispatcher,
+          "$Id$")
+
+TAO_PG_Servant_Dispatcher::~TAO_PG_Servant_Dispatcher (void)
+{
+}
+
+TAO_Root_POA *
+TAO_PG_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
+                                            TAO_POA_Manager &poa_manager,
+                                            const TAO_POA_Policy_Set &policies,
+                                            ACE_Lock &lock,
+                                            TAO_SYNCH_MUTEX &thread_lock,
+                                            TAO_ORB_Core &orb_core,
+                                            TAO_Object_Adapter *object_adapter
+                                            ACE_ENV_ARG_DECL)
+{
+  TAO_Root_POA *poa = 0;
+
+  ACE_NEW_THROW_EX (poa,
+                    TAO_GOA (name,
+                             poa_manager,
+                             policies,
+                             0,
+                             lock,
+                             thread_lock,
+                             orb_core,
+                             object_adapter
+                             ACE_ENV_ARG_PARAMETER),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (0);
+
+  return poa;
+}
+
+void
+TAO_PG_Servant_Dispatcher::pre_invoke_remote_request (TAO_Root_POA &,
+                                                      CORBA::Short,
+                                                      TAO_ServerRequest &,
+                                                      TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &
+                                                      ACE_ENV_ARG_DECL_NOT_USED)
+{
+}
+
+void
+TAO_PG_Servant_Dispatcher::pre_invoke_collocated_request (TAO_Root_POA &,
+                                                          CORBA::Short,
+                                                          TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &
+                                                          ACE_ENV_ARG_DECL_NOT_USED)
+{
+}
+
+void
+TAO_PG_Servant_Dispatcher::post_invoke (TAO_Root_POA &,
+                                        TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &)
+{
+}
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h
new file mode 100644
index 00000000000..2c40bef8cd3
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.h
@@ -0,0 +1,68 @@
+/* -*- C++ -*- */
+
+//=============================================================================
+/**
+ *  @file    PG_Servant_Dispatcher.h
+ *
+ *  $Id$
+ *
+ *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PG_SERVANT_DISPATCHER_H
+#define TAO_PG_SERVANT_DISPATCHER_H
+#include /**/ "ace/pre.h"
+
+#include "portablegroup_export.h"
+#include "tao/PortableServer/Servant_Dispatcher.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+/**
+ * @class TAO_PG_Servant_Dispatcher
+ *
+ * @brief Concrete instantiation of the Servant_Dispatcher strategy.
+ *
+ * This class just calls _dispatch on the servant_upcall.  No extra
+ * processing is done or needed.
+ *
+ */
+class TAO_PortableGroup_Export TAO_PG_Servant_Dispatcher
+  : public TAO_Servant_Dispatcher
+{
+public:
+  virtual ~TAO_PG_Servant_Dispatcher (void);
+
+  /// Pre_invoke remote request.
+  void pre_invoke_remote_request (TAO_Root_POA &poa,
+                                  CORBA::Short servant_priority,
+                                  TAO_ServerRequest &req,
+                                  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
+                                  ACE_ENV_ARG_DECL);
+
+  /// Pre_invoke collocated request.
+  void pre_invoke_collocated_request (TAO_Root_POA &poa,
+                                      CORBA::Short servant_priority,
+                                      TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
+                                      ACE_ENV_ARG_DECL);
+
+  /// Post_invoke request.
+  void post_invoke (TAO_Root_POA &poa,
+                    TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state);
+
+  /// Factory method for creating new POA's.
+  TAO_Root_POA *create_Root_POA (const ACE_CString &name,
+                                 TAO_POA_Manager &poa_manager,
+                                 const TAO_POA_Policy_Set &policies,
+                                 ACE_Lock &lock,
+                                 TAO_SYNCH_MUTEX &thread_lock,
+                                 TAO_ORB_Core &orb_core,
+                                 TAO_Object_Adapter *object_adapter
+                                 ACE_ENV_ARG_DECL);
+};
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PG_SERVANT_DISPATCHER_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp
deleted file mode 100644
index fdde0eed0ce..00000000000
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.cpp
+++ /dev/null
@@ -1,255 +0,0 @@
-#include "POA_Hooks.h"
-#include "PortableGroup_Loader.h"
-#include "PortableGroup_Request_Dispatcher.h"
-
-#include "tao/Stub.h"
-#include "tao/Profile.h"
-#include "tao/ORB_Constants.h"
-#include "tao/CDR.h"
-
-ACE_RCSID (PortableGroup,
-           POA_Hooks,
-           "$Id$")
-
-TAO_POA_Hooks::TAO_POA_Hooks (
-  PortableGroup_Request_Dispatcher &request_dispatcher)
-  : request_dispatcher_ (request_dispatcher)
-{
-}
-
-TAO_POA_Hooks::~TAO_POA_Hooks (void)
-{
-}
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-PortableServer::ObjectId *
-TAO_POA_Hooks::create_id_for_reference (
-    TAO_POA &the_poa,
-    CORBA::Object_ptr the_ref
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableServer::NotAGroupObject
-    ))
-{
-
-  // Get the RepositoryId from the Group reference so
-  // we know what kind of reference to make.
-  const char* repository_id = the_ref->_stubobj ()->type_id.in ();
-
-  // Create a temporary object reference and then get the
-  // ObjectId out of it.
-  CORBA::Object_var obj_ref = the_poa.create_reference (repository_id
-                                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  PortableServer::ObjectId_var obj_id = the_poa.reference_to_id (obj_ref.in ()
-                                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // Associate the object reference with the group reference.
-  this->associate_group_with_ref (the_poa,
-                                  the_ref,
-                                  obj_ref.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return obj_id._retn ();
-}
-
-int
-TAO_POA_Hooks::find_group_component (const CORBA::Object_ptr the_ref,
-                                     PortableGroup::TagGroupTaggedComponent &group)
-{
-  const TAO_MProfile& profiles = the_ref->_stubobj ()->base_profiles ();
-  const TAO_Profile* profile;
-  CORBA::ULong slot;
-
-  // Iterate through the tagged profiles, and
-  // create acceptors for the multicast ones.
-  slot = 0;
-  while ((profile = profiles.get_profile (slot)))
-    {
-      if (this->find_group_component_in_profile (profile, group) == 0)
-        return 0;
-
-      ++slot;
-    }
-
-  // Not found.
-  return -1;
-}
-
-int
-TAO_POA_Hooks::find_group_component_in_profile (const TAO_Profile* profile,
-                                                PortableGroup::TagGroupTaggedComponent &group)
-{
-  // Iterate through the tagged components looking for
-  // group tag.
-  const TAO_Tagged_Components& components = profile->tagged_components ();
-
-  IOP::TaggedComponent tagged_component;
-  tagged_component.tag = IOP::TAG_GROUP;
-
-  // Try to find it.
-  if (components.get_component (tagged_component) == 0)
-    return -1;
-
-  // Found it.
-  const CORBA::Octet *buf =
-    tagged_component.component_data.get_buffer ();
-
-  TAO_InputCDR in_cdr (reinterpret_cast<const char*> (buf),
-                       tagged_component.component_data.length ());
-
-  // Extract the Byte Order.
-  CORBA::Boolean byte_order;
-  if ((in_cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-    return -1;
-  in_cdr.reset_byte_order (static_cast<int> (byte_order));
-
-  if ((in_cdr >> group) == 0)
-    return -1;
-
-  return 0;
-}
-
-int
-TAO_POA_Hooks::create_group_acceptors (CORBA::Object_ptr the_ref,
-                                       TAO_PortableGroup_Acceptor_Registry &acceptor_registry,
-                                       TAO_ORB_Core &orb_core
-                                       ACE_ENV_ARG_DECL)
-{
-  const TAO_MProfile& profiles = the_ref->_stubobj ()->base_profiles ();
-  const TAO_Profile* profile;
-  CORBA::ULong slot;
-  int num = 0;
-
-  // Iterate through the tagged profiles, and
-  // create acceptors for the multicast ones.
-  slot = 0;
-  while ((profile = profiles.get_profile (slot)))
-    {
-      if (profile->supports_multicast ())
-        {
-          acceptor_registry.open (profile,
-                                  orb_core
-                                  ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-          ++num;
-        }
-
-      ++slot;
-    }
-
-  // Return the number of acceptors registered.
-  return num;
-}
-
-
-PortableServer::IDs *
-TAO_POA_Hooks::reference_to_ids (
-  TAO_POA &/*the_poa*/,
-  CORBA::Object_ptr /*the_ref*/
-    ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableServer::NotAGroupObject
-    ))
-{
-
-  return 0;
-}
-
-void
-TAO_POA_Hooks::associate_group_with_ref (
-      TAO_POA &the_poa,
-      CORBA::Object_ptr group_ref,
-      CORBA::Object_ptr obj_ref
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::NotAGroupObject))
-{
-  // Find the Group Component so that we can extract the Group ID.
-  PortableGroup::TagGroupTaggedComponent *tmp_group_id;
-  ACE_NEW_THROW_EX (tmp_group_id,
-                    PortableGroup::TagGroupTaggedComponent,
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK;
-
-  PortableGroup::TagGroupTaggedComponent_var group_id = tmp_group_id;
-
-  if (this->find_group_component (group_ref, group_id.inout ()) != 0)
-    {
-      // Group component wasn't found.  The group reference
-      // that was passed in must be bogus.
-      ACE_THROW (PortableServer::NotAGroupObject ());
-    }
-
-  // Create the acceptors necessary to receive requests for the
-  // specified group reference.
-  this->create_group_acceptors (group_ref,
-                                this->request_dispatcher_.acceptor_registry_,
-                                the_poa.orb_core ()
-                                ACE_ENV_ARG_PARAMETER);
-
-  ACE_CHECK;
-
-
-  // Add a mapping from GroupId to Object key in the PortableGroup
-  const TAO::ObjectKey &key = 
-    obj_ref->_stubobj ()->profile_in_use ()->object_key ();
-  this->request_dispatcher_.group_map_.add_groupid_objectkey_pair (
-                                   group_id._retn (),
-                                   key
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-}
-
-void
-TAO_POA_Hooks::associate_reference_with_id (
-      TAO_POA &the_poa,
-      CORBA::Object_ptr ref,
-      const PortableServer::ObjectId & oid
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableServer::NotAGroupObject
-    ))
-{
-
-  // Create a reference for the specified ObjectId, since
-  // it is much easier to extract the object key from the
-  // reference.
-  CORBA::Object_var obj_ref = the_poa.id_to_reference (oid
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Associate the object reference with the group reference.
-  this->associate_group_with_ref (the_poa,
-                                  ref,
-                                  obj_ref.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_POA_Hooks::disassociate_reference_with_id (
-      TAO_POA &/*the_poa*/,
-      CORBA::Object_ptr /*ref*/,
-      const PortableServer::ObjectId & /*oid*/
-      ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableServer::NotAGroupObject
-    ))
-{
-}
-
-#endif  /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h b/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h
deleted file mode 100644
index f1bb0a0dadf..00000000000
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/POA_Hooks.h
+++ /dev/null
@@ -1,135 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   POA_Hooks.h
- *
- *  $Id$
- *
- *  @author Frank Hunleth <fhunleth@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_POA_HOOKS_H
-#define TAO_POA_HOOKS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PortableServer/PortableGroup_Hooks.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "portablegroup_export.h"
-
-#include "orbsvcs/PortableGroupC.h"
-
-// Forward references
-class PortableGroup_Request_Dispatcher;
-class TAO_PortableGroup_Loader;
-class TAO_Profile;
-class TAO_PortableGroup_Acceptor_Registry;
-
-/**
- * @class TAO_POA_Hooks
- *
- * @brief TAO_POA_Hooks
- *
- * This class acts as a facade for all of the POA specific methods in the
- * PortableGroup library.
- */
-class TAO_PortableGroup_Export TAO_POA_Hooks :
-  public TAO_POA_PortableGroup_Hooks
-{
-public:
-  TAO_POA_Hooks (PortableGroup_Request_Dispatcher &request_dispatcher);
-
-  virtual ~TAO_POA_Hooks (void);
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  virtual PortableServer::ObjectId * create_id_for_reference (
-      TAO_POA &the_poa,
-      CORBA::Object_ptr the_ref
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableServer::NotAGroupObject
-    ));
-
-  virtual PortableServer::IDs * reference_to_ids (
-      TAO_POA &the_poa,
-      CORBA::Object_ptr the_ref
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableServer::NotAGroupObject
-    ));
-
-  virtual void associate_reference_with_id (
-      TAO_POA &the_poa,
-      CORBA::Object_ptr ref,
-      const PortableServer::ObjectId & oid
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableServer::NotAGroupObject
-    ));
-
-  virtual void disassociate_reference_with_id (
-      TAO_POA &the_poa,
-      CORBA::Object_ptr ref,
-      const PortableServer::ObjectId & oid
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableServer::NotAGroupObject
-    ));
-
-#endif  /* TAO_HAS_MINIMUM_POA == 0 */
-
-protected:
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  int find_group_component (const CORBA::Object_ptr the_ref,
-                            PortableGroup::TagGroupTaggedComponent &group);
-
-  int find_group_component_in_profile (
-      const TAO_Profile* profile,
-      PortableGroup::TagGroupTaggedComponent &group
-    );
-
-  int create_group_acceptors (
-      CORBA::Object_ptr the_ref,
-      TAO_PortableGroup_Acceptor_Registry &acceptor_registry,
-      TAO_ORB_Core &orb_core
-      ACE_ENV_ARG_DECL
-    );
-
-  /// Helper function to associate group references with
-  /// object references.
-  void associate_group_with_ref (
-        TAO_POA &the_poa,
-        CORBA::Object_ptr group_ref,
-        CORBA::Object_ptr obj_ref
-        ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       PortableServer::NotAGroupObject));
-
-#endif  /* TAO_HAS_MINIMUM_POA == 0 */
-
-private:
-
-  PortableGroup_Request_Dispatcher &request_dispatcher_;
-
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_POA_HOOKS_H */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
index 234c493816d..ce639bbf3ec 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
@@ -3,6 +3,7 @@
 // $Id$
 
 #include "PortableGroup_Loader.h"
+#include "PG_Object_Adapter_Factory.h"
 #include "PortableGroup_ORBInitializer.h"
 #include "ace/Dynamic_Service.h"
 #include "tao/ORB_Core.h"
@@ -27,12 +28,12 @@ TAO_PortableGroup_Loader::init (int /*argc*/,
         PortableInterceptor::ORBInitializer::_nil ();
       PortableInterceptor::ORBInitializer_var orb_initializer;
 
-      /// Register the RTCORBA ORBInitializer.
+      /// Register the Portablegroup ORBInitializer.
       ACE_NEW_THROW_EX (temp_orb_initializer,
                         TAO_PortableGroup_ORBInitializer (),
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
index d322948b490..a528c515277 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
@@ -37,8 +37,6 @@
 class TAO_PortableGroup_Export TAO_PortableGroup_Loader
   : public ACE_Service_Object
 {
-  friend class TAO_POA_Hooks;
-
 public:
   /// Constructor.
   TAO_PortableGroup_Loader (void);
@@ -65,7 +63,7 @@ TAO_Requires_PortableGroup_Initializer =
 #else
 
 static int
-TAO_Requires_PortableGroup_Initializer = 
+TAO_Requires_PortableGroup_Initializer =
   TAO_PortableGroup_Loader::Initializer ();
 
 #endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
index a3cadc7b45d..61c733012bc 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
@@ -17,7 +17,9 @@ ACE_RCSID (PortableGroup,
 #include "tao/debug.h"
 
 #include "PortableGroup_Request_Dispatcher.h"
-#include "POA_Hooks.h"
+
+static const char *pg_poa_factory_name = "TAO_PG_POA";
+static const char *pg_poa_factory_directive = "dynamic TAO_PG_POA Service_Object * TAO_PortableGroup:_make_TAO_PG_Object_Adapter_Factory()";
 
 TAO_PortableGroup_ORBInitializer::TAO_PortableGroup_ORBInitializer ()
 {
@@ -53,24 +55,16 @@ TAO_PortableGroup_ORBInitializer::pre_init (
                     PortableGroup_Request_Dispatcher (),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
 
   tao_info->orb_core ()->request_dispatcher (rd);
 
-  // Create and save the hooks for the POA.
-  TAO_POA_PortableGroup_Hooks *poa_hooks;
-  ACE_NEW_THROW_EX (poa_hooks,
-                    TAO_POA_Hooks (*rd),
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK;
-  tao_info->orb_core ()->portable_group_poa_hooks (poa_hooks);
+  // If the application resolves the root POA, make sure we load the PG POA.
+  TAO_ORB_Core::set_poa_factory (pg_poa_factory_name,
+                                 pg_poa_factory_directive);
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h
index c42963a480f..77c7f8632f4 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h
@@ -36,7 +36,7 @@ class TAO_PortableGroup_Loader;
 class TAO_PortableGroup_Export PortableGroup_Request_Dispatcher :
   public TAO_Request_Dispatcher
 {
-  friend class TAO_POA_Hooks;
+  friend class TAO_GOA;
 
 public:
   /// Destructor.
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
index 9760e1c4e64..ec2f55c0da7 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp
@@ -57,7 +57,7 @@ TAO_Portable_Group_Map::add_groupid_objectkey_pair (
                     Map_Entry (),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
index 3b4dfdfdabc..7f738ee864a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connection_Handler.cpp
@@ -19,7 +19,9 @@
 #include "UIPMC_Transport.h"
 #include "UIPMC_Endpoint.h"
 
-ACE_RCSID(tao, UIPMC_Connect, "$Id$")
+ACE_RCSID(PortableGroup,
+          UIPMC_Connect,
+          "$Id$")
 
 TAO_UIPMC_Connection_Handler::TAO_UIPMC_Connection_Handler (ACE_Thread_Manager *t)
   : TAO_UIPMC_SVC_HANDLER (t, 0 , 0),
@@ -131,7 +133,7 @@ TAO_UIPMC_Connection_Handler::open (void*)
   if(TAO_debug_level > 5)
   {
      ACE_DEBUG ((LM_DEBUG,
-                 ACE_TEXT("\nTAO (%P|%t) TAO_UIPMC_Connection_Handler::open -")
+                 ACE_TEXT("TAO (%P|%t) TAO_UIPMC_Connection_Handler::open, ")
                  ACE_TEXT("listening on: <%s:%u>\n"),
                  this->local_addr_.get_host_addr (),
                  this->local_addr_.get_port_number ()));
@@ -155,7 +157,7 @@ TAO_UIPMC_Connection_Handler::open_server (void)
   if( TAO_debug_level > 5)
   {
      ACE_DEBUG ((LM_DEBUG,
-                 ACE_TEXT("\nTAO (%P|%t) TAO_UIPMC_Connection_Handler::open_server -")
+                 ACE_TEXT("TAO (%P|%t) TAO_UIPMC_Connection_Handler::open_server, ")
                  ACE_TEXT("subcribed to multicast group at %s:%d\n"),
                  this->local_addr_.get_host_addr (),
                  this->local_addr_.get_port_number ()
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
index 6118681e9c4..08268364c86 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
@@ -213,7 +213,7 @@ TAO_UIPMC_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
                     TAO_UIPMC_Profile (this->orb_core ()),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
index d24c1a2f721..8c1cfd4af4f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
@@ -163,7 +163,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
         {
           ACE_THROW (CORBA::INV_OBJREF (
                           CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             EINVAL),
                           CORBA::COMPLETED_NO));
         }
@@ -197,7 +197,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
         {
           ACE_THROW (CORBA::INV_OBJREF (
                           CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             EINVAL),
                           CORBA::COMPLETED_NO));
         }
@@ -210,7 +210,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
       // The group component version is mandatory.
       ACE_THROW (CORBA::INV_OBJREF (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         EINVAL),
                       CORBA::COMPLETED_NO));
     }
@@ -230,7 +230,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
       // exception if it isn't found.
       ACE_THROW (CORBA::INV_OBJREF (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         EINVAL),
                       CORBA::COMPLETED_NO));
     }
@@ -263,7 +263,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
           // The Group ID is mandatory, so throw an exception.
           ACE_THROW (CORBA::INV_OBJREF (
                           CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             EINVAL),
                           CORBA::COMPLETED_NO));
         }
@@ -290,7 +290,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
           // so throw an exception.
           ACE_THROW (CORBA::INV_OBJREF (
                           CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             EINVAL),
                           CORBA::COMPLETED_NO));
         }
@@ -312,7 +312,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
       // since it wasn't found.
       ACE_THROW (CORBA::INV_OBJREF (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         EINVAL),
                       CORBA::COMPLETED_NO));
     }
@@ -329,7 +329,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
       // since it wasn't found.
       ACE_THROW (CORBA::INV_OBJREF (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         EINVAL),
                       CORBA::COMPLETED_NO));
     }
@@ -658,7 +658,7 @@ TAO_UIPMC_Profile::addressing_mode (CORBA::Short addr_mode
     default:
       ACE_THROW (CORBA::BAD_PARAM (
              CORBA::SystemException::_tao_minor_code (
-               TAO_DEFAULT_MINOR_CODE,
+               TAO::VMCID,
                EINVAL),
              CORBA::COMPLETED_NO));
     }
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling.idl b/TAO/orbsvcs/orbsvcs/RTCosScheduling.idl
index 10d68c8815c..7ffd6662db1 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling.idl
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling.idl
@@ -22,7 +22,7 @@
 #define _RT_COS_SCHEDULING_
 
 #include <orb.idl>
-#include "tao/PortableServer/PortableServer.pidl"
+#include "tao/PortableServer/PortableServer_include.pidl"
 
 /**
  * @module RTCosScheduling
@@ -30,8 +30,6 @@
  * @brief This module contains the interfaces for the RTCORBA 1.0
  * Scheduling Service.
  */
-
-
 module RTCosScheduling {
 
   /**
@@ -103,7 +101,6 @@ module RTCosScheduling {
       raises (UnknownName);
 
   };
-
 };
 
 
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
index 7b69e4f0271..63b09de0866 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
@@ -19,7 +19,7 @@
 #endif /* __ACE_INLINE__ */
 
 #include "tao/ORB_Core.h"
-#include "tao/PortableServer/POA.h"
+#include "tao/PortableServer/Root_POA.h"
 #include "tao/RTCORBA/Linear_Priority_Mapping.h"
 #include "tao/RTCORBA/Priority_Mapping_Manager.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
@@ -165,7 +165,8 @@ RTCosScheduling_ServerScheduler_i::configure_ORB(TAO_ORB_Core *orb_core)
 #endif /* ACE_HAS_THREADS */
 
       /// Get the ORB core from the POA Manager
-      TAO_POA *tao_poa = parent->_tao_poa_downcast();
+      TAO_Root_POA *tao_poa = dynamic_cast<TAO_Root_POA*>(parent);
+
       TAO_ORB_Core &orb_core = tao_poa->orb_core();
 
       /// configure the orb (linear mapping, register interceptor, etc.)
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
index 0c7b47d751a..5ba81681a20 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -276,7 +276,7 @@ TAO::SSLIOP::Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
                                           0), // SSL component
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
@@ -299,7 +299,7 @@ TAO::SSLIOP::Connector::make_secure_profile (ACE_ENV_SINGLE_ARG_DECL)
                                           1), // SSL component
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
@@ -412,7 +412,7 @@ TAO::SSLIOP::Connector::iiop_connect (
                         ::Security::NoProtection))
     ACE_THROW_RETURN (CORBA::NO_PERMISSION (
                         CORBA::SystemException::_tao_minor_code (
-                          TAO_DEFAULT_MINOR_CODE,
+                          TAO::VMCID,
                           EPERM),
                         CORBA::COMPLETED_NO),
                       0);
@@ -459,7 +459,7 @@ TAO::SSLIOP::Connector::ssliop_connect (
                        ::Security::NoProtection))
     ACE_THROW_RETURN (CORBA::NO_PERMISSION (
                         CORBA::SystemException::_tao_minor_code (
-                          TAO_DEFAULT_MINOR_CODE,
+                          TAO::VMCID,
                           EPERM),
                         CORBA::COMPLETED_NO),
                       0);
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
index 9b18545640b..f953099ead9 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
@@ -43,7 +43,7 @@ TAO::SSLIOP::Current::get_peer_certificate (
                     ::SSLIOP::ASN_1_Cert,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
@@ -77,7 +77,7 @@ TAO::SSLIOP::Current::get_peer_certificate_chain (
                     ::SSLIOP::SSL_Cert,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
index eb7ff19899a..6ee7a07cffe 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
@@ -39,7 +39,7 @@ TAO::SSLIOP::Current_Impl::client_credentials (
                                                     this->ssl_),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (SecurityLevel3::ClientCredentials::_nil ());
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
index 1b01c15ecf1..5e29395ba31 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
@@ -52,7 +52,7 @@ const char *
 TAO::SSLIOP::Protocol_Factory::prefix (void) const
 {
    // Note: This method doesn't seem to be used anywhere. Moreover,
-   // keeping it may make things more confusing - a Factory can 
+   // keeping it may make things more confusing - a Factory can
    // well be handling multiple protocol prefixes, not just one!
    // Shouldn't it be deprecated?
   return ::prefix_[0];
@@ -78,22 +78,22 @@ TAO::SSLIOP::Protocol_Factory::make_acceptor (void)
 }
 
 
-// Parses a X509 path. Beware: This function modifies 
+// Parses a X509 path. Beware: This function modifies
 // the buffer pointed to by arg!
 int
-TAO::SSLIOP::Protocol_Factory::parse_x509_file_path (char *arg, 
+TAO::SSLIOP::Protocol_Factory::parse_x509_file_path (char *arg,
                                                    char **path)
 {
   ACE_ASSERT (arg!= 0);
   ACE_ASSERT (path!= 0);
-  
+
   char *lst = 0;
   const char *type_name = ACE_OS::strtok_r (arg, ":", &lst);
   *path = ACE_OS::strtok_r (0, "", &lst);
 
   if (ACE_OS::strcasecmp (type_name, "ASN1") == 0)
       return SSL_FILETYPE_ASN1;
-  
+
   if (ACE_OS::strcasecmp (type_name, "PEM") == 0)
       return SSL_FILETYPE_PEM;
 
@@ -402,7 +402,7 @@ TAO::SSLIOP::Protocol_Factory::register_orb_initializer (
                         TAO::Security::ORBInitializer,
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
       ACE_TRY_CHECK;
@@ -421,7 +421,7 @@ TAO::SSLIOP::Protocol_Factory::register_orb_initializer (
                                                      csiv2_target_requires),
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
index efa08eeb608..4b12486ee86 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
@@ -63,7 +63,7 @@ TAO::SSLIOP::ORBInitializer::pre_init (
                     TAO::SSLIOP::Current (orb_core),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
@@ -128,7 +128,7 @@ TAO::SSLIOP::ORBInitializer::post_init (
                       this->qop_),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
@@ -161,7 +161,7 @@ TAO::SSLIOP::ORBInitializer::post_init (
 //                                                  this->csiv2_target_requires_),
 //                     CORBA::NO_MEMORY (
 //                       CORBA::SystemException::_tao_minor_code (
-//                         TAO_DEFAULT_MINOR_CODE,
+//                         TAO::VMCID,
 //                         ENOMEM),
 //                       CORBA::COMPLETED_NO));
 //   ACE_CHECK;
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
index fb61097ebaf..5fbdca1e5e7 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
@@ -37,7 +37,7 @@ TAO::Security::EstablishTrustPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
                     TAO::Security::EstablishTrustPolicy (this->trust_),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
index f716d9c03b7..6d9748b209d 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
@@ -35,7 +35,7 @@ TAO::Security::QOPPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
                     TAO::Security::QOPPolicy (this->qop_),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
index 673c4debebc..ad681e183e3 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
@@ -59,7 +59,7 @@ TAO::Security::ORBInitializer::pre_init (
 //                     TAO_Security_Current (old_tss_slot, orb_id.in ()),
 //                     CORBA::NO_MEMORY (
 //                       CORBA::SystemException::_tao_minor_code (
-//                         TAO_DEFAULT_MINOR_CODE,
+//                         TAO::VMCID,
 //                         ENOMEM),
 //                       CORBA::COMPLETED_NO));
 //   ACE_CHECK;
@@ -88,7 +88,7 @@ TAO::Security::ORBInitializer::pre_init (
                                                tao_info->orb_core ()),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
@@ -108,7 +108,7 @@ TAO::Security::ORBInitializer::pre_init (
                     TAO::SL3::CredentialsCurator,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
@@ -128,7 +128,7 @@ TAO::Security::ORBInitializer::pre_init (
                     TAO::SL3::SecurityManager (credentials_curator.in ()),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
index 87f0d172965..001c74c2ef9 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
@@ -39,7 +39,7 @@ TAO::Security::PolicyFactory::create_policy (
       if (!(value >>= qop))
         ACE_THROW_RETURN (CORBA::BAD_PARAM (
                             CORBA::SystemException::_tao_minor_code (
-                              TAO_DEFAULT_MINOR_CODE,
+                              TAO::VMCID,
                               EINVAL),
                             CORBA::COMPLETED_NO),
                           CORBA::Policy::_nil ());
@@ -49,7 +49,7 @@ TAO::Security::PolicyFactory::create_policy (
                         TAO::Security::QOPPolicy (qop),
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
       ACE_CHECK_RETURN (CORBA::Policy::_nil ());
@@ -66,7 +66,7 @@ TAO::Security::PolicyFactory::create_policy (
       if (!(value >>= trust))
         ACE_THROW_RETURN (CORBA::BAD_PARAM (
                             CORBA::SystemException::_tao_minor_code (
-                              TAO_DEFAULT_MINOR_CODE,
+                              TAO::VMCID,
                               EINVAL),
                             CORBA::COMPLETED_NO),
                           CORBA::Policy::_nil ());
@@ -76,7 +76,7 @@ TAO::Security::PolicyFactory::create_policy (
                         TAO::Security::EstablishTrustPolicy (*trust),
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
       ACE_CHECK_RETURN (CORBA::Policy::_nil ());
@@ -93,7 +93,7 @@ TAO::Security::PolicyFactory::create_policy (
       if (!(value >>= args))
         ACE_THROW_RETURN (CORBA::BAD_PARAM (
                             CORBA::SystemException::_tao_minor_code (
-                              TAO_DEFAULT_MINOR_CODE,
+                              TAO::VMCID,
                               EINVAL),
                             CORBA::COMPLETED_NO),
                           CORBA::Policy::_nil ());
@@ -109,7 +109,7 @@ TAO::Security::PolicyFactory::create_policy (
                           args->use_integrity),
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
       ACE_CHECK_RETURN (CORBA::Policy::_nil ());
@@ -126,7 +126,7 @@ TAO::Security::PolicyFactory::create_policy (
       if (!(value >>= creds))
         ACE_THROW_RETURN (CORBA::BAD_PARAM (
                             CORBA::SystemException::_tao_minor_code (
-                              TAO_DEFAULT_MINOR_CODE,
+                              TAO::VMCID,
                               EINVAL),
                             CORBA::COMPLETED_NO),
                           CORBA::Policy::_nil ());
@@ -136,7 +136,7 @@ TAO::Security::PolicyFactory::create_policy (
                         TAO::SL3::ObjectCredentialsPolicy (*creds),
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
       ACE_CHECK_RETURN (CORBA::Policy::_nil ());
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
index eef1f946440..cdebf3a0462 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
@@ -18,7 +18,6 @@
 #define TAO_TIO_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/ORB_Manager.h"
 #include "orbsvcs/TimeServiceS.h"
 #include "TAO_UTO.h"
 #include "time_export.h"
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
index ce679eada06..f722cfd6cba 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
@@ -17,7 +17,7 @@
 #define TAO_TRADING_LOADER_H
 
 #include "tao/Object_Loader.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "ace/Auto_Ptr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
index 758d58bbe66..bf98cd03930 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/ORBInitializer.cpp
@@ -36,7 +36,7 @@ ORBInitializer::post_init (
                     TAO_LB_ServerRequestInterceptor (this->load_alert_),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
index 68953a71771..6ebd0450558 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp
@@ -34,7 +34,7 @@ ORBInitializer::post_init (
                     ServerRequestInterceptor,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
@@ -51,7 +51,7 @@ ORBInitializer::post_init (
                     TAO_LB_ServerRequestInterceptor (this->load_alert_),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
index 58c918139fa..1a640f3cbf7 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp
@@ -38,7 +38,7 @@ RPS_Monitor::the_location (ACE_ENV_SINGLE_ARG_DECL)
                     CosLoadBalancing::Location (this->location_),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
@@ -69,7 +69,7 @@ RPS_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL)
                     CosLoadBalancing::LoadList (1),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h
index c09769d950c..0117cc448a6 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h
@@ -2,7 +2,6 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
-#include "tao/PortableServer/ORB_Manager.h"
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Flows_T.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
index 20bdbda0205..ad0cf76d51d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
@@ -42,7 +42,6 @@ public:
   virtual int set_protocol_object (const char *flowname,
                                    TAO_AV_Protocol_Object *object);
 protected:
-  TAO_ORB_Manager *orb_manager_;
   //  FTP_Client_Flow_Handler *handler_;
   FTP_Client_Callback *callback_;
 };
@@ -64,7 +63,6 @@ public:
 private:
   Client *client_;
   // pointer to command handler object
-  TAO_ORB_Manager *orb_manager_;
 };
 
 
@@ -80,7 +78,6 @@ public:
 private:
   int parse_args (int argc, char **argv);
   int bind_to_server (const char *name);
-  TAO_ORB_Manager *orb_manager_;
   Endpoint_Reactive_Strategy endpoint_strategy_;
   AVStreams::MMDevice_var server_mmdevice_;
   TAO_MMDevice client_mmdevice_;
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index 4575366be4f..b06fe26b585 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -102,7 +102,7 @@ EC_Driver::run_init (int &argc, char* argv[]
   ACE_CHECK;
 
   if (this->parse_args (argc, argv))
-    ACE_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE,
+    ACE_THROW (CORBA::INTERNAL (TAO::VMCID,
                                 CORBA::COMPLETED_NO));
 
   if (this->verbose ())
@@ -120,18 +120,18 @@ EC_Driver::run_init (int &argc, char* argv[]
     }
 
   if (this->move_to_rt_class () == -1)
-    ACE_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE,
+    ACE_THROW (CORBA::INTERNAL (TAO::VMCID,
                                 CORBA::COMPLETED_NO));
 
   this->initialize_ec_impl (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (this->allocate_consumers () == -1)
-    ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+    ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID,
                                  CORBA::COMPLETED_NO));
 
   if (this->allocate_suppliers () == -1)
-    ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+    ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID,
                                  CORBA::COMPLETED_NO));
 
   this->connect_clients (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
index 5bc817e59d7..f60232ef9a2 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
@@ -16,7 +16,6 @@
 #include "ace/OS_NS_unistd.h"
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/PortableGroupC.h"
-#include "tao/PortableServer/ORB_Manager.h"
 #include "orbsvcs/PortableGroup/PG_Property_Set.h"
 
 // Use this macro at the beginning of CORBA methods
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
index c18bbacf50e..e79d8756dc8 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
@@ -15,7 +15,6 @@
 
 #include "FT_TestReplica_i.h"
 #include "FT_ReplicaFactory_i.h"
-#include "tao/PortableServer/ORB_Manager.h"
 #include "tao/ORB_Constants.h"
 #include "FT_TestReplicaC.h"
 // FUZZ: disable check_for_streams_include
@@ -78,7 +77,7 @@ namespace
     suicide (#value " in method " #method);                        \
     ACE_THROW (FAULT_CODE (                                        \
       CORBA::SystemException::_tao_minor_code (                    \
-            TAO_DEFAULT_MINOR_CODE,                                \
+            TAO::VMCID,                                \
             EFAULT),                                               \
             CORBA::COMPLETED_NO));                                 \
     } else ;
@@ -88,7 +87,7 @@ namespace
     suicide ("read-only method " #method);                         \
     ACE_THROW (FAULT_CODE (                                        \
       CORBA::SystemException::_tao_minor_code (                    \
-            TAO_DEFAULT_MINOR_CODE,                                \
+            TAO::VMCID,                                \
             EFAULT),                                               \
             CORBA::COMPLETED_NO));                                 \
     } else ;
@@ -98,7 +97,7 @@ namespace
     suicide (#value " in method " #method);                        \
     ACE_THROW_RETURN (FAULT_CODE (                                 \
       CORBA::SystemException::_tao_minor_code (                    \
-            TAO_DEFAULT_MINOR_CODE,                                \
+            TAO::VMCID,                                \
             EFAULT),                                               \
             CORBA::COMPLETED_NO),                                  \
       result);                                                     \
@@ -109,7 +108,7 @@ namespace
     suicide ("read-only method " #method);                         \
     ACE_THROW_RETURN (FAULT_CODE (                                 \
       CORBA::SystemException::_tao_minor_code (                    \
-            TAO_DEFAULT_MINOR_CODE,                                \
+            TAO::VMCID,                                \
             EFAULT),                                               \
             CORBA::COMPLETED_NO),                                  \
             result);                                               \
diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
index 2ed7b7baca0..3337f367c2a 100644
--- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
@@ -4,7 +4,6 @@
 
 #include "StubBatchConsumer.h"
 #include "ace/Get_Opt.h"
-#include "tao/PortableServer/ORB_Manager.h"
 #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h"
 
 StubBatchConsumer::StubBatchConsumer ()
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
index a61f3ae1478..eae0bf303f5 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
@@ -4,7 +4,6 @@
 
 #include "StubFaultAnalyzer.h"
 #include "ace/Get_Opt.h"
-#include "tao/PortableServer/ORB_Manager.h"
 #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h"
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
index 3712953a2aa..a9ca2e66117 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
@@ -4,7 +4,6 @@
 
 #include "StubFaultConsumer.h"
 #include "ace/Get_Opt.h"
-#include "tao/PortableServer/ORB_Manager.h"
 #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h"
 
 StubFaultConsumer::StubFaultConsumer ()
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
index d59c37c9025..2417c974648 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
@@ -5,7 +5,6 @@
 #include "StubFaultNotifier.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
-#include "tao/PortableServer/ORB_Manager.h"
 #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h"
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
index a1280eee3c5..a446d0d7eff 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp
@@ -36,7 +36,7 @@ Server_ORBInitializer::post_init (
                     Server_Request_Interceptor,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
index e07dc2c309a..1b689bd3fba 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
@@ -32,7 +32,7 @@ Server_Request_Interceptor::forward_references (
   if (CORBA::is_nil (obj1) || CORBA::is_nil (obj2))
     ACE_THROW (CORBA::INV_OBJREF (
                  CORBA::SystemException::_tao_minor_code (
-                   TAO_DEFAULT_MINOR_CODE,
+                   TAO::VMCID,
                    EINVAL),
                  CORBA::COMPLETED_NO));
 
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
index 12e291c0f78..98925443c7d 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp
@@ -3,6 +3,7 @@
 #include "ace/OS_NS_sys_time.h"
 #include "PushConsumer.h"
 #include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
+#include "tao/PortableServer/PS_CurrentC.h"
 #include <stdio.h>
 
 ACE_RCSID (FtRtEvent,
diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
index 8c1b1757ecf..347af9f1e8c 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp
@@ -8,6 +8,7 @@
 #include "tao/MProfile.h"
 #include "tao/Stub.h"
 #include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
+#include "tao/PortableServer/PS_CurrentC.h"
 
 ACE_RCSID (FtRtEvent,
            PushSupplier,
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc b/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc
index 0d1d684a15d..2ae37efe568 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/HTIOP_Hello.mpc
@@ -2,7 +2,7 @@
 //
 // $Id$
 
-project(*Server): taoexe, naming, iortable, portableserver {
+project(*Server): taoserver, naming, iortable {
   macros += TEST_OUTPUT_HAS_DLL=0
   Source_Files {
     Test_Output.cpp
@@ -16,7 +16,7 @@ project(*Server): taoexe, naming, iortable, portableserver {
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   macros += TEST_OUTPUT_HAS_DLL=0
   Source_Files {
     Test_Output.cpp
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
index 8ab7c68c3d8..e3ba7544ee9 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
@@ -5,7 +5,7 @@
 #include "tests/test_config.h"
 
 #include "ace/Get_Opt.h"
-#include "tao/IORTable/IORTableC.h"
+#include "tao/IORTable/IORTable.h"
 #include "orbsvcs/CosNamingC.h"
 
 ACE_RCSID (Hello,
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
index 1e66342e764..7d7bdcee716 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
@@ -3,6 +3,7 @@
 #include "server_i.h"
 
 #include "tao/IORTable/IORTable.h"
+#include "tao/PortableServer/PS_CurrentC.h"
 
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
index c71f26760f2..49cf892be38 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
@@ -4,6 +4,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "orbsvcs/PortableGroup/MIOP.h"
+#include "orbsvcs/PortableGroup/GOA.h"
 
 ACE_RCSID (McastHello,
            server,
@@ -61,8 +62,8 @@ main (int argc, char *argv[])
         orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
+      PortableGroup::GOA_var root_poa =
+        PortableGroup::GOA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (root_poa.in ()))
diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
index 7ab11e5aec3..b5952bd09c7 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
@@ -7,7 +7,7 @@ ACE_RCSID(Notify, TAO_RT_Test_Filter, "$Id$")
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
 #include "tao/RTCORBA/Thread_Pool.h"
-#include "tao/PortableServer/POA.h"
+#include "tao/PortableServer/Root_POA.h"
 
 TAO_Notify_Tests_RT_Test_Filter::TAO_Notify_Tests_RT_Test_Filter (void)
   : expected_pool_id_ (0)
@@ -161,7 +161,7 @@ TAO_Notify_Tests_RT_Test_Filter::match_structured (const CosNotification::Struct
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "TAO_Notify_Tests_RT_Test_Filter (%x) ::match_structured (%t)\n", this));
 
-  TAO_POA *poa = this->_default_POA ()->_tao_poa_downcast();
+  TAO_Root_POA *poa = dynamic_cast<TAO_Root_POA*>(this->_default_POA ());
 
   ACE_ASSERT (poa != 0);
 
diff --git a/TAO/orbsvcs/tests/Property/Property.mpc b/TAO/orbsvcs/tests/Property/Property.mpc
index 4bc3c8bf1e4..53e3baba922 100644
--- a/TAO/orbsvcs/tests/Property/Property.mpc
+++ b/TAO/orbsvcs/tests/Property/Property.mpc
@@ -1,13 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): namingexe, property {
+project(*server): namingexe, property, utils {
   Source_Files {
     server.cpp
   }
 }
 
-project(*client): namingexe, property {
+project(*client): namingexe, property, utils {
   Source_Files {
     client.cpp
   }
diff --git a/TAO/orbsvcs/tests/Property/client.h b/TAO/orbsvcs/tests/Property/client.h
index 4845eb5a324..2d0f0760c99 100644
--- a/TAO/orbsvcs/tests/Property/client.h
+++ b/TAO/orbsvcs/tests/Property/client.h
@@ -29,7 +29,7 @@
 #include "ace/Task.h"
 #include "ace/Thread_Manager.h"
 #include "ace/Get_Opt.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "orbsvcs/Property/CosPropertyService_i.h"
 #include "orbsvcs/Naming/Naming_Client.h"
 
diff --git a/TAO/orbsvcs/tests/Property/server.h b/TAO/orbsvcs/tests/Property/server.h
index 0ddad8b9aae..42d21922d35 100644
--- a/TAO/orbsvcs/tests/Property/server.h
+++ b/TAO/orbsvcs/tests/Property/server.h
@@ -20,7 +20,7 @@
 #ifndef COSPROPERTYSERVICE_SERVER_H
 #define COSPROPERTYSERVICE_SERVER_H
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "orbsvcs/Property/CosPropertyService_i.h"
 #include "orbsvcs/Naming/Naming_Client.h"
 
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
index 3d93dfff3bb..154ac5b6a8a 100644
--- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
@@ -19,13 +19,12 @@
 #include "test_objectS.h"
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/Naming/Naming_Server.h"
-#include "tao/PortableServer/ORB_Manager.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
-ACE_RCSID (Simple_Naming, 
-           client, 
+ACE_RCSID (Simple_Naming,
+           client,
            "$Id$")
 
 #if defined (_MSC_VER)
@@ -104,7 +103,7 @@ main (int argc, ACE_TCHAR **argv)
         i = ACE_OS::atoi(get_opts.opt_arg ());
         if (i<2)
         {
-          ACE_ERROR((LM_ERROR, 
+          ACE_ERROR((LM_ERROR,
                      ACE_LIB_TEXT ("Invalid breath, must be 2 or more\n")));
           exit(1);
         }
@@ -114,7 +113,7 @@ main (int argc, ACE_TCHAR **argv)
         i = ACE_OS::atoi(get_opts.opt_arg ());
         if (i<2)
         {
-          ACE_ERROR((LM_ERROR, 
+          ACE_ERROR((LM_ERROR,
                      ACE_LIB_TEXT ("Invalid depth, must be 2 or more\n")));
           exit(1);
         }
@@ -124,7 +123,7 @@ main (int argc, ACE_TCHAR **argv)
         i = ACE_OS::atoi(get_opts.opt_arg ());
         if (i<2)
         {
-          ACE_ERROR((LM_ERROR, 
+          ACE_ERROR((LM_ERROR,
                      ACE_LIB_TEXT ("Invalid breath, must be 2 or more\n")));
           exit(1);
         }
@@ -194,7 +193,7 @@ main (int argc, ACE_TCHAR **argv)
   }
   ACE_CATCHANY
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
+    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                          ACE_LIB_TEXT ("Unable to resolve name servers"));
     return -1;
   }
@@ -235,7 +234,7 @@ main (int argc, ACE_TCHAR **argv)
   }
   ACE_CATCHANY
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
+    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                          ACE_LIB_TEXT ("Unable to create a lot of objects"));
     return -1;
   }
@@ -263,7 +262,7 @@ main (int argc, ACE_TCHAR **argv)
   }
   ACE_CATCHANY
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
+    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                          ACE_LIB_TEXT ("Unable to create deep context"));
     return -1;
   }
@@ -289,7 +288,7 @@ main (int argc, ACE_TCHAR **argv)
   }
   ACE_CATCHANY
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
+    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                          ACE_LIB_TEXT ("Unable to create wide context"));
     return -1;
   }
@@ -317,7 +316,7 @@ main (int argc, ACE_TCHAR **argv)
     CORBA::Object_var result_obj_ref = root_context_1->resolve (wide2
                                                           ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK_EX(bl_e);
-    CosNaming::NamingContext_var result_object = 
+    CosNaming::NamingContext_var result_object =
       CosNaming::NamingContext::_narrow (result_obj_ref.in ()
                                          ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK_EX(bl_e);
@@ -342,7 +341,7 @@ main (int argc, ACE_TCHAR **argv)
     }
     result_obj_ref = root_context_1->resolve (deep ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK_EX(bl_e);
-    result_object = 
+    result_object =
       CosNaming::NamingContext::_narrow (result_obj_ref.in ()
                                          ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK_EX(bl_e);
@@ -359,7 +358,7 @@ main (int argc, ACE_TCHAR **argv)
   }
   ACE_CATCHANY
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
+    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                          ACE_LIB_TEXT ("Unable to delete objects"));
     return -1;
   }
@@ -392,7 +391,7 @@ main (int argc, ACE_TCHAR **argv)
   }
   ACE_CATCHANY
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
+    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
       ACE_LIB_TEXT ("Unable to resolve object from redundant server"));
     return -1;
   }
@@ -433,7 +432,7 @@ main (int argc, ACE_TCHAR **argv)
     CORBA::Object_var result_obj_ref = root_context_2->resolve (wide
                                                           ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK_EX(bl_h);
-    CosNaming::NamingContext_var result_object = 
+    CosNaming::NamingContext_var result_object =
       CosNaming::NamingContext::_narrow (result_obj_ref.in ()
                                          ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK_EX(bl_h);
@@ -446,7 +445,7 @@ main (int argc, ACE_TCHAR **argv)
   }
   ACE_CATCHANY
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
+    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
       ACE_LIB_TEXT ("Unable to resolve wide context from redundant server"));
     return -1;
   }
@@ -514,7 +513,7 @@ main (int argc, ACE_TCHAR **argv)
     CORBA::Object_var result_obj_ref = root_context_1->resolve (deep
                                                           ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK_EX(bl_k);
-    CosNaming::NamingContext_var result_object = 
+    CosNaming::NamingContext_var result_object =
       CosNaming::NamingContext::_narrow (result_obj_ref.in ()
                                          ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK_EX(bl_k);
@@ -529,7 +528,7 @@ main (int argc, ACE_TCHAR **argv)
   }
   ACE_CATCHANY
   {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
+    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
       ACE_LIB_TEXT ("Unable to resolve deep context from redundant server"));
     return -1;
   }
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h
index 15eb7fe577e..8b72d84d4cc 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h
@@ -20,7 +20,7 @@
 #include "test_objectS.h"
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/Naming/Naming_Client.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "ace/Task.h"
 
 class Naming_Test
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/corbaloc_ssliop.mpc b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/corbaloc_ssliop.mpc
index 97620a0feb0..22d615b4010 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/corbaloc_ssliop.mpc
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/corbaloc_ssliop.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Client) : namingexe, portableserver {
+project(*Client) : namingexe, portableserver, utils {
   Source_Files {
     client.cpp
   }
diff --git a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc
index 97620a0feb0..0a4a4f0b63a 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc
+++ b/TAO/orbsvcs/tests/Simple_Naming/Simple_Naming.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Client) : namingexe, portableserver {
+project(*Client) : namingexe, utils, portableserver {
   Source_Files {
     client.cpp
   }
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.h b/TAO/orbsvcs/tests/Simple_Naming/client.h
index 15eb7fe577e..8b72d84d4cc 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.h
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.h
@@ -20,7 +20,7 @@
 #include "test_objectS.h"
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/Naming/Naming_Client.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "ace/Task.h"
 
 class Naming_Test
diff --git a/TAO/orbsvcs/tests/Trading/Trading.mpc b/TAO/orbsvcs/tests/Trading/Trading.mpc
index be9a73bffe7..c3bce6c79df 100644
--- a/TAO/orbsvcs/tests/Trading/Trading.mpc
+++ b/TAO/orbsvcs/tests/Trading/Trading.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Test Lib): orbsvcslib, trading_serv, naming, svc_utils, iortable, dynamicany, portableserver {
+project(*Test Lib): orbsvcslib, trading_serv, naming, svc_utils, iortable, portableserver {
   sharedname = TTest
   idlflags += -I..\..\.. -I..\..\..\orbsvcs -Sc -Wb,export_macro=TAO_TTest_Export -Wb,export_include=ttest_export.h
   dynamicflags = TAO_TTEST_BUILD_DLL
@@ -23,7 +23,7 @@ project(*Test Lib): orbsvcslib, trading_serv, naming, svc_utils, iortable, dynam
   }
 }
 
-project(*export test): namingexe, trading_serv, dynamicany, portableserver {
+project(*export test): namingexe, trading_serv, utils, portableserver {
   after   += Trading_Test_Lib
   libs    += TTest
 
@@ -35,7 +35,7 @@ project(*export test): namingexe, trading_serv, dynamicany, portableserver {
   }
 }
 
-project(*import test): namingexe, trading_serv, dynamicany, portableserver {
+project(*import test): namingexe, trading_serv, utils, portableserver {
   after   += Trading_Test_Lib
   libs    += TTest
 
@@ -47,7 +47,7 @@ project(*import test): namingexe, trading_serv, dynamicany, portableserver {
   }
 }
 
-project(*colocated test): namingexe, trading_serv, dynamicany {
+project(*colocated test): namingexe, trading_serv, utils {
   after   += Trading_Test_Lib
   libs    += TTest
 
diff --git a/TAO/orbsvcs/tests/Trading/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
index aa780f7e187..95f0dcf7ec6 100644
--- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
@@ -2,15 +2,15 @@
 
 #include "ace/Auto_Ptr.h"
 #include "ace/Get_Opt.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "Offer_Exporter.h"
 #include "Offer_Importer.h"
 #include "Service_Type_Exporter.h"
 #include "orbsvcs/Trader/Trader.h"
 #include "orbsvcs/Trader/Service_Type_Repository.h"
 
-ACE_RCSID (Trading, 
-           colocated_test, 
+ACE_RCSID (Trading,
+           colocated_test,
            "$Id$")
 
 void
diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp
index 23fc4c88e83..9078aa74b23 100644
--- a/TAO/orbsvcs/tests/Trading/export_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/export_test.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "Offer_Exporter.h"
 #include "Offer_Importer.h"
 #include "Service_Type_Exporter.h"
@@ -8,8 +8,8 @@
 #include "orbsvcs/Trader/Trader.h"
 #include "orbsvcs/Trader/Service_Type_Repository.h"
 
-ACE_RCSID (Trading, 
-           export_test, 
+ACE_RCSID (Trading,
+           export_test,
            "$Id$")
 
 int
diff --git a/TAO/orbsvcs/tests/Trading/import_test.cpp b/TAO/orbsvcs/tests/Trading/import_test.cpp
index 8c96bd0b963..f303d292998 100644
--- a/TAO/orbsvcs/tests/Trading/import_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/import_test.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "Offer_Importer.h"
 
 ACE_RCSID(Trading, import_test, "$Id$")
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
index 5f5bb1419d4..87c501fdaf6 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
@@ -28,7 +28,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Log_Msg.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "Cubit_Client.h"
 #include "Cubit_i.h"
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc
index 3dc88c1f5b0..038ec2e524a 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, strategies {
+project(*Server): taoexe, utils, portableserver, strategies {
   idlflags += -Gd
 
   Source_Files {
@@ -25,7 +25,7 @@ project(*client): taoexe, portableserver, strategies {
   }
 }
 
-project(*collocation): taoexe, portableserver, strategies {
+project(*collocation): taoexe, utils, portableserver, strategies {
   // Note : You can't just prepend collocation/ to the exename
   //        to get it to ouput to that directory. It won't go
   //        to the right place on some platforms. (Windows)
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
index 2bf6ed21986..b222ad4c0b2 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h
@@ -24,7 +24,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/ARGV.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "cubit_i.h"
 #include "Globals.h"
 
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc
index d7de8c25b5c..db2f67048e0 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver, strategies {
+project(*server): taoexe, utils, portableserver, strategies {
   Source_Files {
     tmplinst.cpp
     Timer.cpp
@@ -12,7 +12,7 @@ project(*server): taoexe, portableserver, strategies {
   }
 }
 
-project(*client): taoexe, portableserver, strategies {
+project(*client): taoexe, utils, portableserver, strategies {
   Source_Files {
     tmplinst.cpp
     Timer.cpp
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h
index 67cdfd4481e..1cfd32f967e 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.h
@@ -38,9 +38,6 @@
 #include "ace/ARGV.h"
 #include "ace/Sched_Params.h"
 
-// TAO includes.
-#include "tao/PortableServer/ORB_Manager.h"
-
 // MT Cubit application includes.
 #include "cubit_i.h"
 #include "Task_Client.h"
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.h b/TAO/performance-tests/POA/Demux/demux_test_server.h
index 7ef4306b2eb..e26ce828e0c 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_server.h
+++ b/TAO/performance-tests/POA/Demux/demux_test_server.h
@@ -24,7 +24,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/Log_Msg.h"
 #include "tao/Timeprobe.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/PortableServer/PortableServer.h"
 #include "orbsvcs/Naming/Naming_Client.h"
 
 #include "demux_test_i.h"
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Server.h b/TAO/performance-tests/Pluggable/PP_Test_Server.h
index f655b98caf0..24eb43a7126 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Server.h
+++ b/TAO/performance-tests/Pluggable/PP_Test_Server.h
@@ -27,7 +27,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "PP_Test_i.h"
 
 class PP_Test_Server
diff --git a/TAO/performance-tests/Pluggable/Pluggable.mpc b/TAO/performance-tests/Pluggable/Pluggable.mpc
index a5aa0f9886c..c39be3c611f 100644
--- a/TAO/performance-tests/Pluggable/Pluggable.mpc
+++ b/TAO/performance-tests/Pluggable/Pluggable.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver {
+project(*server): taoserver, utils {
   Source_Files {
     PP_Test_Server.cpp
     PP_Test_i.cpp
@@ -9,7 +9,7 @@ project(*server): taoexe, portableserver {
   }
 }
 
-project(*client) : taoexe {
+project(*client) : taoclient {
   Source_Files {
     PP_TestC.cpp
     PP_Test_Client.cpp
diff --git a/TAO/release.pl b/TAO/release.pl
deleted file mode 100755
index 28c741f69e1..00000000000
--- a/TAO/release.pl
+++ /dev/null
@@ -1,91 +0,0 @@
-# $Id$
-#
-# Takes over some of the release work rather than having it all
-# inline in the Makefile.
-
-$date = `/usr/bin/date +"%a %b %d %T %Y"`;
-chop $date;
-$VERSION = "VERSION";
-$CHANGELOG = "ChangeLog";
-$TAO_VERSION = '';
-$MODNAME = 'TAO';
-
-# Range of values on this is "alpha", "beta", or "major",
-# in which case the 3rd, 2nd, or 1st digit.
-$BUMP_WHICH = $ENV{'RELEASE_TYPE'};
-
-sub inplace {
-    my($ext, @files) = @_;
-    my(@nfiles) = ();
-    my($nfile);
-    $ext = '~' if ($ext eq '');
-    foreach $file (@files) {
-        $nfile = $file . $ext;
-        if (rename ($file, $nfile)) {
-            push(@nfiles, $nfile);
-        }
-        else {
-            warn "Unable to rename $files[$i] for in-place editing: $!\n";
-        }
-    }
-    @nfiles;
-}
-
-@inplace = inplace('.del', $VERSION, $CHANGELOG);
-
-open (VERSION, $inplace[0])
-    || die "Unable to open file $inplace[0] for inplace edit: $!\n";
-open (VERSIONOUT, ">$VERSION")
-    || die "Unable to open file $VERSION for writing: $!\n";
-
-undef $version_number;
-while (<VERSION>) {
-    if ($BUMP_WHICH =~ m/major/i) {
-        $bump_expr = 'sprintf("$1%d.0.0", $2+1)';
-    }
-    elsif ($BUMP_WHICH =~ m/beta/i) {
-        $bump_expr = 'sprintf("$1$2.%d.0", $3+1)';
-    }
-    else {
-        $bump_expr = 'sprintf("$1$2.$3.%d", $4+1)';
-    }
-    $subst = 's/(TAO version )(\d+)\.(\d+)\.(\d+)/' . $bump_expr . '/e';
-    eval $subst;
-    ($version_number = $_) =~ s/.*(\d+\.\d+\.\d+).*/$1/ if (!defined($version_number));
-    if (s/(, released ).*/$1$date./) {
-        ($TAO_VERSION = $_) =~ s/^This is //;
-    }
-    print VERSIONOUT $_;
-}
-
-close (VERSIONOUT);
-close (VERSION);
-chmod 0644, $VERSION;
-
-$message = $date."  ".$ENV{"SIGNATURE"}."  <".$ENV{"LOGNAME"}."\@cs.wustl.edu>\n\n\t* ".$TAO_VERSION."\n";
-$message_printed = 0;
-
-open (CHANGELOG, $inplace[1])
-    || die "Unable to open file $inplace[1] for inplace edit: $!\n";
-open (CHANGELOGOUT, ">$CHANGELOG")
-    || die "Unable to open file $CHANGELOG for writing: $!\n";
-
-while (<CHANGELOG>) {
-    print CHANGELOGOUT "$message" if ( ! $message_printed++ );
-    print CHANGELOGOUT $_;
-}
-
-close (CHANGELOG);
-close (CHANGELOGOUT);
-chmod 0644, $CHANGELOG;
-
-# Morph the version number
-chop $version_number;
-($version_tag = $MODNAME."-".$version_number) =~ s/\./_/g;
-
-$CVSCOM = 'cvs';
-$COM = qq/$CVSCOM commit -m'$TAO_VERSION' $VERSION $CHANGELOG && $CVSCOM rtag $version_tag $MODNAME && $CVSCOM rtag -F Current $MODNAME/;
-print $COM;
-system $COM;
-
-unlink @inplace;
diff --git a/TAO/tao/AnySeqC.cpp b/TAO/tao/AnySeqC.cpp
index 22d1c2b3c41..14b5b87e812 100644
--- a/TAO/tao/AnySeqC.cpp
+++ b/TAO/tao/AnySeqC.cpp
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -118,7 +118,7 @@ CORBA::Boolean operator<< (
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -128,7 +128,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -145,7 +145,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -154,11 +154,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -169,7 +169,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_AnySeq_CPP_ */
diff --git a/TAO/tao/AnySeqC.inl b/TAO/tao/AnySeqC.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/tao/AnySeqC.inl
+++ b/TAO/tao/AnySeqC.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
index 8114dc49045..8de1abb5487 100644
--- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
@@ -41,7 +41,7 @@ TAO_BiDirGIOP_Loader::activate (CORBA::ORB_ptr orb,
                         TAO_BiDir_ORBInitializer,
                         CORBA::NO_MEMORY (
                             CORBA::SystemException::_tao_minor_code (
-                                TAO_DEFAULT_MINOR_CODE,
+                                TAO::VMCID,
                                 ENOMEM),
                             CORBA::COMPLETED_NO));
       ACE_CHECK_RETURN (-1);
@@ -73,7 +73,7 @@ TAO_BiDirGIOP_Loader::load_policy_validators (TAO_Policy_Validator &val
                     TAO_BiDirPolicy_Validator (val.orb_core ()),
                     CORBA::NO_MEMORY (
                         CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             ENOMEM),
                         CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
index 1f8014b896f..2e94e92fa1d 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.cpp
@@ -42,7 +42,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -106,10 +106,10 @@ BiDirPolicy::BidirectionalPolicy::_narrow (
     {
       return BidirectionalPolicy::_nil ();
     }
-  
+
   BidirectionalPolicy_ptr proxy =
     dynamic_cast<BidirectionalPolicy_ptr> (_tao_objref);
-  
+
   return BidirectionalPolicy::_duplicate (proxy);
 }
 
@@ -123,10 +123,10 @@ BiDirPolicy::BidirectionalPolicy::_unchecked_narrow (
     {
       return BidirectionalPolicy::_nil ();
     }
-  
+
   BidirectionalPolicy_ptr proxy =
     dynamic_cast<BidirectionalPolicy_ptr> (_tao_objref);
-  
+
   return BidirectionalPolicy::_duplicate (proxy);
 }
 
@@ -137,7 +137,7 @@ BiDirPolicy::BidirectionalPolicy::_duplicate (BidirectionalPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -149,22 +149,22 @@ BiDirPolicy::BidirectionalPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/BiDirPolicy/BidirectionalPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
diff --git a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
index 13ba19032b5..981017226fb 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicyC.h
@@ -91,7 +91,7 @@ namespace BiDirPolicy
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::UShort BidirectionalPolicyValue;
   typedef CORBA::UShort_out BidirectionalPolicyValue_out;
@@ -162,7 +162,7 @@ namespace BiDirPolicy
     
     static BidirectionalPolicy_ptr _nil (void)
     {
-      return (BidirectionalPolicy_ptr)0;
+      return static_cast<BidirectionalPolicy_ptr> (0);
     }
     
     
diff --git a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
index 8be838a7bac..328d9fb86da 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
@@ -8,13 +8,10 @@
 
 #include "tao/ORB_Constants.h"
 
-ACE_RCSID (BiDir_GIOP, 
+ACE_RCSID (BiDir_GIOP,
            BiDir_ORBInitializer,
            "$Id$")
 
-
-
-
 void
 TAO_BiDir_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
@@ -50,7 +47,7 @@ TAO_BiDir_ORBInitializer::register_policy_factories (
                     TAO_BiDir_PolicyFactory,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                         TAO_DEFAULT_MINOR_CODE,
+                         TAO::VMCID,
                          ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
index 8547ced2063..65e88904bba 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
@@ -35,7 +35,7 @@ TAO_BiDir_PolicyFactory::create_policy (
                         TAO_BidirectionalPolicy (val),
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
       ACE_CHECK_RETURN (CORBA::Policy::_nil ());
diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
index ff133474e61..c301a8a7b53 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp
@@ -61,7 +61,7 @@ TAO_BidirectionalPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
 
   TAO_BidirectionalPolicy* tmp;
   ACE_NEW_THROW_EX (tmp, TAO_BidirectionalPolicy (*this),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
diff --git a/TAO/tao/BiDir_GIOP/diffs/BiDirPolicy.diff b/TAO/tao/BiDir_GIOP/diffs/BiDirPolicy.diff
index 0029a3af050..0fa2c8a8f8a 100644
--- a/TAO/tao/BiDir_GIOP/diffs/BiDirPolicy.diff
+++ b/TAO/tao/BiDir_GIOP/diffs/BiDirPolicy.diff
@@ -1,31 +1,48 @@
---- orig/BiDirPolicyC.h	2004-11-09 16:09:54.752499200 +0100
-+++ BiDirPolicyC.h	2004-11-09 16:14:36.808075200 +0100
+--- orig/BiDirPolicyC.h	2005-02-11 13:45:01.971851200 +0100
++++ BiDirPolicyC.h	2005-02-11 13:48:51.000000000 +0100
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
 @@ -33,6 +33,9 @@
-
+ 
  #include /**/ "ace/pre.h"
-
+ 
 +#ifndef TAO_BIDIRGIOP_SAFE_INCLUDE
 +#error "You should not include BiDirPolicyC.h directly, use BiDirGIOP.h"
 +#endif /* !TAO_BIDIRGIOP_SAFE_INCLUDE */
-
+ 
  #include "ace/config-all.h"
-
+ 
 @@ -47,6 +50,8 @@
  #include "tao/Object.h"
  #include "tao/Objref_VarOut_T.h"
-
+ 
 +#include "tao/PolicyC.h"
 +
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
  #endif
---- orig\BiDirPolicyC.cpp       2005-01-04 20:49:10.788272000 +0100
-+++ BiDirPolicyC.cpp    2005-01-04 20:47:44.974878400 +0100
+--- orig/BiDirPolicyC.cpp	2005-02-11 13:45:01.971851200 +0100
++++ BiDirPolicyC.cpp	2005-02-11 13:48:51.000000000 +0100
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
 @@ -29,7 +29,7 @@
  // be\be_codegen.cpp:302
-
-
+ 
+ 
 -#include "BiDirPolicyC.h"
 +#include "BiDirGIOP.h"
  #include "tao/CDR.h"
  #include "ace/OS_NS_string.h"
+ 
diff --git a/TAO/tao/BooleanSeqC.cpp b/TAO/tao/BooleanSeqC.cpp
index 413c8a348ad..9d224a1d73f 100644
--- a/TAO/tao/BooleanSeqC.cpp
+++ b/TAO/tao/BooleanSeqC.cpp
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -121,7 +121,7 @@ CORBA::Boolean operator<< (
       return strm.write_boolean_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -138,7 +138,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -147,7 +147,7 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
@@ -155,7 +155,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_BooleanSeq_CPP_ */
diff --git a/TAO/tao/BooleanSeqC.h b/TAO/tao/BooleanSeqC.h
index 989fa5a1448..b03e18df8e2 100644
--- a/TAO/tao/BooleanSeqC.h
+++ b/TAO/tao/BooleanSeqC.h
@@ -166,7 +166,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_BooleanSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:963
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "BooleanSeqC.inl"
diff --git a/TAO/tao/BoundsA.cpp b/TAO/tao/BoundsA.cpp
index 588a1817f2a..d518997171e 100644
--- a/TAO/tao/BoundsA.cpp
+++ b/TAO/tao/BoundsA.cpp
@@ -42,9 +42,9 @@ TAO::Any_Dual_Impl_T<CORBA::Bounds>::demarshal_value (
 {
   CORBA::String_var id;
   
-  if ((cdr >> id.out ()) == 0)
+  if (!(cdr >> id.out ()))
     {
-      return 0;
+      return false;
     }
   
   ACE_TRY_NEW_ENV
@@ -54,11 +54,11 @@ TAO::Any_Dual_Impl_T<CORBA::Bounds>::demarshal_value (
     }
   ACE_CATCHANY
     {
-      return 0;
+      return false;
     }
   ACE_ENDTRY;
   
-  return 1;
+  return true;
 }
 
 // Copying insertion.
diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp
index 76d929580b0..0da12c2b61c 100644
--- a/TAO/tao/BoundsC.cpp
+++ b/TAO/tao/BoundsC.cpp
@@ -44,7 +44,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -200,15 +200,8 @@ CORBA::Boolean operator<< (
     const CORBA::Bounds &_tao_aggregate
   )
 {
-  // First marshal the repository ID.
-  if (strm << _tao_aggregate._rep_id ())
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+  // Marshal the repository ID.
+  return (strm << _tao_aggregate._rep_id ());
 }
 
 CORBA::Boolean operator>> (
@@ -216,7 +209,7 @@ CORBA::Boolean operator>> (
     CORBA::Bounds&
   )
 {
-  return 1;
+  return true;
 }
 
 // TAO_IDL - Generated from
diff --git a/TAO/tao/BoundsC.h b/TAO/tao/BoundsC.h
index 1add5c5e0f8..02239c4c295 100644
--- a/TAO/tao/BoundsC.h
+++ b/TAO/tao/BoundsC.h
@@ -149,7 +149,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Bounds &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Bounds &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:963
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "BoundsC.inl"
diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp
index e21fd458a8c..943d9f377d3 100644
--- a/TAO/tao/CONV_FRAMEC.cpp
+++ b/TAO/tao/CONV_FRAMEC.cpp
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -160,7 +160,7 @@ CORBA::Boolean operator<< (
       return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -177,7 +177,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -186,7 +186,7 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
@@ -194,7 +194,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CONV_FRAME_CodeSetIdSeq_CPP_ */
diff --git a/TAO/tao/CONV_FRAMEC.h b/TAO/tao/CONV_FRAMEC.h
index 00586477862..315262b4e53 100644
--- a/TAO/tao/CONV_FRAMEC.h
+++ b/TAO/tao/CONV_FRAMEC.h
@@ -76,7 +76,7 @@ namespace CONV_FRAME
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::ULong CodeSetId;
   typedef CORBA::ULong_out CodeSetId_out;
@@ -322,7 +322,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSet
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetContext &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:963
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "CONV_FRAMEC.inl"
diff --git a/TAO/tao/CharSeqC.cpp b/TAO/tao/CharSeqC.cpp
index 9d8f0e78b85..18bb086b837 100644
--- a/TAO/tao/CharSeqC.cpp
+++ b/TAO/tao/CharSeqC.cpp
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -121,7 +121,7 @@ CORBA::Boolean operator<< (
       return strm.write_char_array ((const char *)_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -138,7 +138,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -147,7 +147,7 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
@@ -155,7 +155,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_CharSeq_CPP_ */
diff --git a/TAO/tao/CharSeqC.h b/TAO/tao/CharSeqC.h
index 7f73bd5f293..29a5bc3df9a 100644
--- a/TAO/tao/CharSeqC.h
+++ b/TAO/tao/CharSeqC.h
@@ -166,7 +166,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_CharSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:963
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "CharSeqC.inl"
diff --git a/TAO/tao/ClientRequestInfo_i.cpp b/TAO/tao/ClientRequestInfo_i.cpp
index a74aee08e15..8b82ed4a088 100644
--- a/TAO/tao/ClientRequestInfo_i.cpp
+++ b/TAO/tao/ClientRequestInfo_i.cpp
@@ -143,7 +143,7 @@ TAO_ClientRequestInfo_i::effective_profile (ACE_ENV_SINGLE_ARG_DECL)
                     IOP::TaggedProfile,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
@@ -194,7 +194,7 @@ TAO_ClientRequestInfo_i::received_exception (ACE_ENV_SINGLE_ARG_DECL)
                     CORBA::Any,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
@@ -250,7 +250,7 @@ TAO_ClientRequestInfo_i::get_effective_component (
                             IOP::TaggedComponent,
                             CORBA::NO_MEMORY (
                               CORBA::SystemException::_tao_minor_code (
-                                TAO_DEFAULT_MINOR_CODE,
+                                TAO::VMCID,
                                 ENOMEM),
                               CORBA::COMPLETED_NO));
           ACE_CHECK_RETURN (0);
@@ -301,7 +301,7 @@ TAO_ClientRequestInfo_i::get_effective_components (
                                 IOP::TaggedComponentSeq,
                                 CORBA::NO_MEMORY (
                                   CORBA::SystemException::_tao_minor_code (
-                                    TAO_DEFAULT_MINOR_CODE,
+                                    TAO::VMCID,
                                     ENOMEM),
                                   CORBA::COMPLETED_NO));
               ACE_CHECK_RETURN (0);
@@ -344,7 +344,7 @@ TAO_ClientRequestInfo_i::get_request_policy (CORBA::PolicyType type
 
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOTSUP),
                       CORBA::COMPLETED_NO),
                     0);
diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp
index d8616c49558..7525edd024a 100644
--- a/TAO/tao/Connection_Handler.cpp
+++ b/TAO/tao/Connection_Handler.cpp
@@ -21,7 +21,6 @@ ACE_RCSID (tao,
 TAO_Connection_Handler::TAO_Connection_Handler (TAO_ORB_Core *orb_core)
   : orb_core_ (orb_core)
   , transport_ (0)
-  , tss_resources_ (orb_core->get_tss_resources ())
 {
   // @@todo: We need to have a distinct option/ method in the resource
   // factory for this and TAO_Transport.
@@ -94,9 +93,6 @@ TAO_Connection_Handler::svc_i (void)
 {
   int result = 0;
 
-  // Inheriting the ORB_Core tss stuff from the parent thread.
-  this->orb_core_->inherit_from_parent_thread (this->tss_resources_);
-
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
                 ACE_TEXT ("TAO (%P|%t) - Connection_Handler::svc_i begin\n")));
@@ -216,10 +212,9 @@ TAO_Connection_Handler::handle_input_eh (
     {
       if (TAO_debug_level > 6)
         ACE_DEBUG ((LM_DEBUG,
-                    "(%P|%t) Connection_Handler[%d] - not going to handle_input "
-                    "on Transport %d "
+                    "TAO (%P|%t) - Connection_Handler[%d]::handle_input_eh, "
+                    "not going to handle_input on transport "
                     "because upcalls temporarily suspended on this thread\n",
-                    this->transport()->id(),
                     this->transport()->id()));
       return 0;
     }
diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h
index cf43218186d..6fd34502273 100644
--- a/TAO/tao/Connection_Handler.h
+++ b/TAO/tao/Connection_Handler.h
@@ -25,7 +25,6 @@
 #include "tao/Basic_Types.h"
 
 class TAO_ORB_Core;
-class TAO_ORB_Core_TSS_Resources;
 class TAO_Transport;
 class ACE_SOCK;
 class ACE_Lock;
@@ -110,9 +109,6 @@ protected:
   /// Return our TAO_ORB_Core pointer
   TAO_ORB_Core *orb_core (void);
 
-  /// Return our TSS Resources pointer
-  TAO_ORB_Core_TSS_Resources* tss_resources (void);
-
   /// Set options on the socket
   int set_socket_option (ACE_SOCK &sock,
                          int snd_size,
@@ -170,9 +166,6 @@ private:
   /// Transport object reference
   TAO_Transport* transport_;
 
-  /// Cached tss resources of the ORB that activated this object.
-  TAO_ORB_Core_TSS_Resources *tss_resources_;
-
   /// Internal state lock, needs to be separate from the reference
   /// count / pending upcalls lock because they interleave.
   ACE_Lock * lock_;
diff --git a/TAO/tao/Connection_Handler.inl b/TAO/tao/Connection_Handler.inl
index d8cd7fafc4d..fc8bf978516 100644
--- a/TAO/tao/Connection_Handler.inl
+++ b/TAO/tao/Connection_Handler.inl
@@ -8,12 +8,6 @@ TAO_Connection_Handler::orb_core (void)
   return this->orb_core_;
 }
 
-ACE_INLINE TAO_ORB_Core_TSS_Resources *
-TAO_Connection_Handler::tss_resources (void)
-{
-  return this->tss_resources_;
-}
-
 ACE_INLINE TAO_Transport *
 TAO_Connection_Handler::transport (void)
 {
diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp
index 417e74ce188..1e8cbfa1742 100644
--- a/TAO/tao/CurrentC.cpp
+++ b/TAO/tao/CurrentC.cpp
@@ -42,7 +42,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -161,14 +161,14 @@ CORBA::Current::_is_a (
           "IDL:omg.org/CORBA/Current:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
diff --git a/TAO/tao/CurrentS.h b/TAO/tao/CurrentS.h
new file mode 100644
index 00000000000..e6eddadbaeb
--- /dev/null
+++ b/TAO/tao/CurrentS.h
@@ -0,0 +1,78 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:390
+
+#ifndef _TAO_IDL_ORIG_CURRENTS_H_
+#define _TAO_IDL_ORIG_CURRENTS_H_
+
+#include /**/ "ace/pre.h"
+
+#include "CurrentC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:49
+
+namespace POA_CORBA
+{
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:80
+
+} // module CORBA
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:997
+
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/Domain.pidl b/TAO/tao/Domain.pidl
index 419ce4952fd..e066d2e6dc6 100644
--- a/TAO/tao/Domain.pidl
+++ b/TAO/tao/Domain.pidl
@@ -6,7 +6,7 @@
  * @brief Pre-compiled IDL source for the CORBA::Domain related
  * classes.
  *
- *   This file was used to generate the code in DomainC.{h,i,cpp}.
+ *   This file was used to generate the code in DomainC.{h,inl,cpp}.
  *
  *   The steps to regenerate the code are as follows:
  *
@@ -35,12 +35,9 @@
  *
  *   Note: The diffs were generated with these commands:
  *
- *   for i in DomainC.{h,i,cpp}; do
+ *   for i in DomainC.{h,cpp}; do
  *     diff -wBbu orig/$i $i;
  *   done > diffs/Domain.diff
- *   for i in Domain{S,S_T}.{h,i,cpp}; do
- *     diff -wBbu orig/$i Domain/$i;
- *   done >> diffs/Domain.diff
  */
 
 #ifndef TAO_CORBA_DOMAIN_PIDL
diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp
index 24286923a07..eb8bf7cc97e 100644
--- a/TAO/tao/Domain/DomainS.cpp
+++ b/TAO/tao/Domain/DomainS.cpp
@@ -27,14 +27,15 @@
 
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:631
+// be\be_codegen.cpp:609
 
 #ifndef _TAO_IDL_ORIG_DOMAINS_CPP_
 #define _TAO_IDL_ORIG_DOMAINS_CPP_
 
 
 #include "DomainS.h"
-#include "tao/PortableServer/Object_Adapter.h"
+#include "tao/PortableServer/Servant_Upcall.h"
+#include "tao/PortableServer/ForwardRequestC.h"
 #include "tao/PortableServer/Operation_Table.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/ORB_Core.h"
@@ -50,26 +51,25 @@
 #include "tao/Special_Basic_Arguments.h"
 #include "tao/PortableInterceptor.h"
 #if TAO_HAS_INTERCEPTORS == 1
-#include "tao/RequestInfo_Util.h"
 #include "tao/PortableServer/PICurrent_Guard.h"
 #include "tao/PortableServer/ServerRequestInfo.h"
 #include "tao/PortableServer/ServerInterceptorAdapter.h"
+#include "tao/RequestInfo_Util.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 #include "ace/Dynamic_Service.h"
 #include "ace/Malloc_Allocator.h"
-#include "ace/config-all.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "DomainS.i"
+#include "DomainS.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -112,7 +112,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1534
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_DomainManager_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -125,7 +125,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_DomainManager_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_DomainManager_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_DomainManager_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -236,9 +236,9 @@ class TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy : public TAO_S
 public:
   TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::DomainManager *tao_impl,
-      const CORBA::PolicyType & policy_type
+      const ::CORBA::PolicyType & policy_type
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -282,7 +282,7 @@ private:
 private:
   POA_CORBA::DomainManager *_tao_impl;
   
-  const CORBA::PolicyType & policy_type_;
+  const ::CORBA::PolicyType & policy_type_;
   ::CORBA::Policy_ptr _result;
 };
 
@@ -291,9 +291,9 @@ private:
 
 TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy::TAO_ServerRequestInfo_CORBA_DomainManager_get_domain_policy (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::DomainManager *tao_impl,
-    const CORBA::PolicyType & policy_type
+    const ::CORBA::PolicyType & policy_type
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -437,7 +437,7 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -473,7 +473,7 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -507,7 +507,7 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:631
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_DomainManager_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -528,8 +528,8 @@ CORBA__TAO_DomainManager_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_DomainManager_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_DomainManager_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_DomainManager_Proxy_Broker_Factory_Initializer
         )
     );
@@ -561,14 +561,14 @@ POA_CORBA::_TAO_DomainManager_ThruPOA_Proxy_Impl::get_domain_policy (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::Policy>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::DomainManager_ptr,
+  ((TAO::Arg_Traits< CORBA::Policy>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::DomainManager_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/DomainManager:1.0"
           )
       )->get_domain_policy (
-          ((TAO::Arg_Traits<CORBA::PolicyType>::in_arg_val *) args[1])->arg ()
+          ((TAO::Arg_Traits< ::CORBA::PolicyType>::in_arg_val *) args[1])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
@@ -599,14 +599,14 @@ POA_CORBA::_TAO_DomainManager_Direct_Proxy_Impl::get_domain_policy (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits<CORBA::Policy>::ret_val *) args[0])->arg () =
-    ACE_reinterpret_cast (
-        POA_CORBA::DomainManager_ptr,
+  ((TAO::Arg_Traits< CORBA::Policy>::ret_val *) args[0])->arg () =
+    reinterpret_cast<
+        POA_CORBA::DomainManager_ptr> (
         servant->_downcast (
             "IDL:omg.org/CORBA/DomainManager:1.0"
           )
       )->get_domain_policy (
-          ((TAO::Arg_Traits<CORBA::PolicyType>::in_arg_val *) args[1])->arg ()
+          ((TAO::Arg_Traits< ::CORBA::PolicyType>::in_arg_val *) args[1])->arg ()
           ACE_ENV_ARG_PARAMETER
         );
   ACE_CHECK;
@@ -644,14 +644,14 @@ void POA_CORBA::DomainManager::get_domain_policy_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::DomainManager *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::DomainManager *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::DomainManager *_tao_impl =
+    static_cast<
+        POA_CORBA::DomainManager *> (
         _tao_servant
       );
   ::CORBA::Policy_var _tao_retval;
-  CORBA::PolicyType policy_type;
+  ::CORBA::PolicyType policy_type;
   
   if (!(
       (_tao_in >> policy_type)
@@ -662,9 +662,9 @@ POA_CORBA::DomainManager *_tao_impl =
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
+    static_cast<
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -795,7 +795,7 @@ void POA_CORBA::DomainManager::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::DomainManager *_tao_impl =
-    (POA_CORBA::DomainManager *) _tao_servant;
+    static_cast<POA_CORBA::DomainManager *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -825,7 +825,7 @@ void POA_CORBA::DomainManager::_non_existent_skel (
   )
 {
   POA_CORBA::DomainManager *_tao_impl =
-    (POA_CORBA::DomainManager *) _tao_servant;
+    static_cast<POA_CORBA::DomainManager *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -858,7 +858,7 @@ void POA_CORBA::DomainManager::_interface_skel (
     }
   
   POA_CORBA::DomainManager *_tao_impl =
-    (POA_CORBA::DomainManager *) _tao_servant;
+    static_cast<POA_CORBA::DomainManager *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -889,7 +889,7 @@ void POA_CORBA::DomainManager::_component_skel (
   )
 {
   POA_CORBA::DomainManager *_tao_impl =
-    (POA_CORBA::DomainManager *) _tao_object_reference;
+    static_cast<POA_CORBA::DomainManager *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -909,23 +909,17 @@ CORBA::Boolean POA_CORBA::DomainManager::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/DomainManager:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::DomainManager::_downcast (
@@ -935,13 +929,13 @@ void* POA_CORBA::DomainManager::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/DomainManager:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::DomainManager_ptr, this);
+      return static_cast<POA_CORBA::DomainManager_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 static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -953,7 +947,7 @@ const char* POA_CORBA::DomainManager::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:567
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::DomainManager::_dispatch (
     TAO_ServerRequest &req,
@@ -968,7 +962,7 @@ void POA_CORBA::DomainManager::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:509
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::DomainManager *
 POA_CORBA::DomainManager::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -979,22 +973,14 @@ POA_CORBA::DomainManager::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -1008,7 +994,7 @@ POA_CORBA::DomainManager::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1534
+// be\be_interface.cpp:1536
 
 class TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -1021,7 +1007,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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_ConstructionPolicy_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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_ConstructionPolicy_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ConstructionPolicy_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -1137,10 +1123,10 @@ class TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager : publi
 public:
   TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::ConstructionPolicy *tao_impl,
-      CORBA::InterfaceDef_ptr object_type,
-      const CORBA::Boolean & constr_policy
+      ::CORBA::InterfaceDef_ptr object_type,
+      const ::CORBA::Boolean & constr_policy
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
   
@@ -1182,8 +1168,8 @@ private:
 private:
   POA_CORBA::ConstructionPolicy *_tao_impl;
   
-  CORBA::InterfaceDef_ptr object_type_;
-  const CORBA::Boolean & constr_policy_;
+  ::CORBA::InterfaceDef_ptr object_type_;
+  const ::CORBA::Boolean & constr_policy_;
 };
 
 // TAO_IDL - Generated from
@@ -1191,10 +1177,10 @@ private:
 
 TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::ConstructionPolicy *tao_impl,
-    CORBA::InterfaceDef_ptr object_type,
-    const CORBA::Boolean & constr_policy
+    ::CORBA::InterfaceDef_ptr object_type,
+    const ::CORBA::Boolean & constr_policy
     ACE_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
@@ -1332,7 +1318,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -1368,7 +1354,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::dispatch (
   
   if (status == -1)
     {
-      ACE_THROW (CORBA::BAD_OPERATION ());
+      ACE_THROW (CORBA::BAD_OPERATION (TAO::VMCID | 2, CORBA::COMPLETED_NO));
     }
   
   ACE_TRY
@@ -1402,7 +1388,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:631
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -1423,8 +1409,8 @@ CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_ConstructionPolicy_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_Initializer (
-      ACE_reinterpret_cast (
-          size_t,
+      reinterpret_cast<
+          size_t> (
           CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_Initializer
         )
     );
@@ -1456,14 +1442,14 @@ POA_CORBA::_TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::make_domain_manager (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ConstructionPolicy_ptr,
+  reinterpret_cast<
+      POA_CORBA::ConstructionPolicy_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ConstructionPolicy:1.0"
         )
     )->make_domain_manager (
-        ((TAO::Arg_Traits<CORBA::InterfaceDef>::in_arg_val *) args[1])->arg (),
-        ((TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val *) args[2])->arg ()
+        ((TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val *) args[1])->arg (),
+        ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val *) args[2])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
@@ -1494,14 +1480,14 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::make_domain_manager (
     CORBA::SystemException
   ))
 {
-  ACE_reinterpret_cast (
-      POA_CORBA::ConstructionPolicy_ptr,
+  reinterpret_cast<
+      POA_CORBA::ConstructionPolicy_ptr> (
       servant->_downcast (
           "IDL:omg.org/CORBA/ConstructionPolicy:1.0"
         )
     )->make_domain_manager (
-        ((TAO::Arg_Traits<CORBA::InterfaceDef>::in_arg_val *) args[1])->arg (),
-        ((TAO::Arg_Traits<ACE_InputCDR::to_boolean>::in_arg_val *) args[2])->arg ()
+        ((TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val *) args[1])->arg (),
+        ((TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val *) args[2])->arg ()
         ACE_ENV_ARG_PARAMETER
       );
   ACE_CHECK;
@@ -1540,16 +1526,16 @@ void POA_CORBA::ConstructionPolicy::make_domain_manager_skel (
     ACE_ENV_ARG_DECL
   )
 {
-    TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
-POA_CORBA::ConstructionPolicy *_tao_impl =
-    ACE_static_cast (
-        POA_CORBA::ConstructionPolicy *,
+  TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
+  POA_CORBA::ConstructionPolicy *_tao_impl =
+    static_cast<
+        POA_CORBA::ConstructionPolicy *> (
         _tao_servant
       );
   _tao_server_request.argument_flag (0);
   
-  CORBA::InterfaceDef_var object_type;
-  CORBA::Boolean constr_policy;
+  ::CORBA::InterfaceDef_var object_type;
+  ::CORBA::Boolean constr_policy;
   
   if (!(
       (_tao_in >> object_type.out ()) &&
@@ -1561,9 +1547,9 @@ POA_CORBA::ConstructionPolicy *_tao_impl =
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
-    ACE_static_cast (
-        TAO_Object_Adapter::Servant_Upcall *,
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
+    static_cast<
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -1678,7 +1664,7 @@ void POA_CORBA::ConstructionPolicy::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::ConstructionPolicy *_tao_impl =
-    (POA_CORBA::ConstructionPolicy *) _tao_servant;
+    static_cast<POA_CORBA::ConstructionPolicy *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -1708,7 +1694,7 @@ void POA_CORBA::ConstructionPolicy::_non_existent_skel (
   )
 {
   POA_CORBA::ConstructionPolicy *_tao_impl =
-    (POA_CORBA::ConstructionPolicy *) _tao_servant;
+    static_cast<POA_CORBA::ConstructionPolicy *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -1741,7 +1727,7 @@ void POA_CORBA::ConstructionPolicy::_interface_skel (
     }
   
   POA_CORBA::ConstructionPolicy *_tao_impl =
-    (POA_CORBA::ConstructionPolicy *) _tao_servant;
+    static_cast<POA_CORBA::ConstructionPolicy *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -1772,7 +1758,7 @@ void POA_CORBA::ConstructionPolicy::_component_skel (
   )
 {
   POA_CORBA::ConstructionPolicy *_tao_impl =
-    (POA_CORBA::ConstructionPolicy *) _tao_object_reference;
+    static_cast<POA_CORBA::ConstructionPolicy *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -1792,27 +1778,21 @@ CORBA::Boolean POA_CORBA::ConstructionPolicy::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ConstructionPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::ConstructionPolicy::_downcast (
@@ -1822,19 +1802,19 @@ void* POA_CORBA::ConstructionPolicy::_downcast (
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/Policy:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::Policy_ptr, this);
+      return static_cast<POA_CORBA::Policy_ptr> (this);
     }
   
   if (ACE_OS::strcmp (logical_type_id,
                       "IDL:omg.org/CORBA/ConstructionPolicy:1.0") == 0)
     {
-      return ACE_static_cast (POA_CORBA::ConstructionPolicy_ptr, this);
+      return static_cast<POA_CORBA::ConstructionPolicy_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 static_cast<PortableServer::Servant> (this);
     }
   
   return 0;
@@ -1846,7 +1826,7 @@ const char* POA_CORBA::ConstructionPolicy::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:567
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::ConstructionPolicy::_dispatch (
     TAO_ServerRequest &req,
@@ -1861,7 +1841,7 @@ void POA_CORBA::ConstructionPolicy::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:509
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::ConstructionPolicy *
 POA_CORBA::ConstructionPolicy::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -1872,22 +1852,14 @@ POA_CORBA::ConstructionPolicy::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
@@ -1901,3 +1873,4 @@ POA_CORBA::ConstructionPolicy::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/Domain/DomainS.h b/TAO/tao/Domain/DomainS.h
index 16e435a3a25..0c53176cac0 100644
--- a/TAO/tao/Domain/DomainS.h
+++ b/TAO/tao/Domain/DomainS.h
@@ -26,19 +26,19 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:411
+// be\be_codegen.cpp:390
 
 #ifndef _TAO_IDL_ORIG_DOMAINS_H_
 #define _TAO_IDL_ORIG_DOMAINS_H_
 
 #include /**/ "ace/pre.h"
-#include "domain_export.h"
+
+#include "tao/DomainC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/DomainC.h"
 #include "tao/PortableServer/PolicyS.h"
 #include "tao/Collocation_Proxy_Broker.h"
 #include "tao/PortableServer/PortableServer.h"
@@ -46,9 +46,7 @@
 #include "tao/IFR_Client/IFR_ExtendedC.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -56,98 +54,111 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+#include "domain_export.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_Domain_Export
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_Domain_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_sh.cpp:90
-  
+  // be\be_visitor_interface/interface_sh.cpp:87
+
   class DomainManager;
   typedef DomainManager *DomainManager_ptr;
-  
+
   class _TAO_DomainManager_ThruPOA_Proxy_Impl;
   class _TAO_DomainManager_Direct_Proxy_Impl;
   class _TAO_DomainManager_Strategized_Proxy_Broker;
-  
+
   class TAO_Domain_Export DomainManager
     : public virtual PortableServer::ServantBase
   {
   protected:
     DomainManager (void);
-  
+
   public:
     // Useful for template programming.
     typedef ::CORBA::DomainManager _stub_type;
     typedef ::CORBA::DomainManager_ptr _stub_ptr_type;
     typedef ::CORBA::DomainManager_var _stub_var_type;
-    
+
     DomainManager (const DomainManager& rhs);
     virtual ~DomainManager (void);
-    
+
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void* _downcast (
         const char* logical_type_id
       );
-    
+
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _component_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     ::CORBA::DomainManager *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::Policy_ptr get_domain_policy (
-        CORBA::PolicyType policy_type
+        ::CORBA::PolicyType policy_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void get_domain_policy_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
@@ -155,29 +166,29 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
   };
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-  
+
   class TAO_Domain_Export _TAO_DomainManager_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_DomainManager_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_DomainManager_Strategized_Proxy_Broker (void);
-    
+
     TAO::Collocation_Strategy
     get_strategy (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     void
     dispatch (
         CORBA::Object_ptr obj,
@@ -240,7 +251,7 @@ namespace POA_CORBA
   //                    Direct  Impl. Declaration
   //
   
-class TAO_Domain_Export _TAO_DomainManager_Direct_Proxy_Impl
+  class TAO_Domain_Export _TAO_DomainManager_Direct_Proxy_Impl
   {
   public:
     _TAO_DomainManager_Direct_Proxy_Impl (void);
@@ -269,7 +280,7 @@ class TAO_Domain_Export _TAO_DomainManager_Direct_Proxy_Impl
   
   
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_sh.cpp:90
+  // be\be_visitor_interface/interface_sh.cpp:87
   
   class ConstructionPolicy;
   typedef ConstructionPolicy *ConstructionPolicy_ptr;
@@ -278,7 +289,7 @@ class TAO_Domain_Export _TAO_DomainManager_Direct_Proxy_Impl
   class _TAO_ConstructionPolicy_Direct_Proxy_Impl;
   class _TAO_ConstructionPolicy_Strategized_Proxy_Broker;
   
-class TAO_Domain_Export ConstructionPolicy
+  class TAO_Domain_Export ConstructionPolicy
     : public virtual POA_CORBA::Policy
   {
   protected:
@@ -346,8 +357,8 @@ class TAO_Domain_Export ConstructionPolicy
     // be\be_visitor_operation/operation_sh.cpp:45
     
     virtual void make_domain_manager (
-        CORBA::InterfaceDef_ptr object_type,
-        CORBA::Boolean constr_policy
+        ::CORBA::InterfaceDef_ptr object_type,
+        ::CORBA::Boolean constr_policy
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -370,7 +381,7 @@ class TAO_Domain_Export ConstructionPolicy
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:2024
+    // be\be_interface.cpp:2026
     
     static void
     copy_skel (
@@ -381,7 +392,7 @@ class TAO_Domain_Export ConstructionPolicy
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:2024
+    // be\be_interface.cpp:2026
     
     static void
     destroy_skel (
@@ -399,7 +410,7 @@ class TAO_Domain_Export ConstructionPolicy
   // TAO_IDL - Generated from
   // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
-class TAO_Domain_Export _TAO_ConstructionPolicy_Strategized_Proxy_Broker
+  class TAO_Domain_Export _TAO_ConstructionPolicy_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
   public: 
@@ -443,7 +454,7 @@ class TAO_Domain_Export _TAO_ConstructionPolicy_Strategized_Proxy_Broker
   // TAO_IDL - Generated from
   // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
-class TAO_Domain_Export _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl
+  class TAO_Domain_Export _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl
   {
   public:
@@ -475,7 +486,7 @@ class TAO_Domain_Export _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl
       ));
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:2212
+    // be\be_interface.cpp:2214
     
     static void
     copy (
@@ -489,7 +500,7 @@ class TAO_Domain_Export _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl
       ));
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:2212
+    // be\be_interface.cpp:2214
     
     static void
     destroy (
@@ -514,7 +525,7 @@ class TAO_Domain_Export _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl
   //                    Direct  Impl. Declaration
   //
   
-class TAO_Domain_Export _TAO_ConstructionPolicy_Direct_Proxy_Impl
+  class TAO_Domain_Export _TAO_ConstructionPolicy_Direct_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_Policy_Direct_Proxy_Impl
   {
   public:
@@ -546,7 +557,7 @@ class TAO_Domain_Export _TAO_ConstructionPolicy_Direct_Proxy_Impl
       ));
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:2212
+    // be\be_interface.cpp:2214
     
     static void
     copy (
@@ -560,7 +571,7 @@ class TAO_Domain_Export _TAO_ConstructionPolicy_Direct_Proxy_Impl
       ));
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:2212
+    // be\be_interface.cpp:2214
     
     static void
     destroy (
@@ -586,15 +597,15 @@ class TAO_Domain_Export _TAO_ConstructionPolicy_Direct_Proxy_Impl
 } // module CORBA
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:1014
+// be\be_codegen.cpp:997
 
 #include "DomainS_T.h"
 
 #if defined (__ACE_INLINE__)
-#include "DomainS.i"
+#include "DomainS.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -604,3 +615,4 @@ class TAO_Domain_Export _TAO_ConstructionPolicy_Direct_Proxy_Impl
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/Domain/DomainS.i b/TAO/tao/Domain/DomainS.inl
index 7afdb7fa79a..5acf842afc3 100644
--- a/TAO/tao/Domain/DomainS.i
+++ b/TAO/tao/Domain/DomainS.inl
@@ -45,7 +45,7 @@ POA_CORBA::ConstructionPolicy::_get_policy_type_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:2024
+// be\be_interface.cpp:2026
 
 ACE_INLINE
 void
@@ -66,7 +66,7 @@ POA_CORBA::ConstructionPolicy::copy_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:2024
+// be\be_interface.cpp:2026
 
 ACE_INLINE
 void
@@ -87,7 +87,7 @@ POA_CORBA::ConstructionPolicy::destroy_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1332
+// be\be_interface.cpp:1323
 
 ACE_INLINE void
 POA_CORBA::_TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::_get_policy_type (
@@ -110,7 +110,7 @@ POA_CORBA::_TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::_get_policy_type (
 
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1332
+// be\be_interface.cpp:1323
 
 ACE_INLINE void
 POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::_get_policy_type (
@@ -133,7 +133,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::_get_policy_type (
 
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1332
+// be\be_interface.cpp:1323
 
 ACE_INLINE void
 POA_CORBA::_TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::copy (
@@ -156,7 +156,7 @@ POA_CORBA::_TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::copy (
 
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1332
+// be\be_interface.cpp:1323
 
 ACE_INLINE void
 POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::copy (
@@ -179,7 +179,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::copy (
 
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1332
+// be\be_interface.cpp:1323
 
 ACE_INLINE void
 POA_CORBA::_TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::destroy (
@@ -202,7 +202,7 @@ POA_CORBA::_TAO_ConstructionPolicy_ThruPOA_Proxy_Impl::destroy (
 
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1332
+// be\be_interface.cpp:1323
 
 ACE_INLINE void
 POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::destroy (
@@ -222,3 +222,4 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::destroy (
       ACE_ENV_ARG_PARAMETER
     );
 }
+
diff --git a/TAO/tao/Domain/DomainS_T.cpp b/TAO/tao/Domain/DomainS_T.cpp
index 6ab02885d50..f213baefffa 100644
--- a/TAO/tao/Domain/DomainS_T.cpp
+++ b/TAO/tao/Domain/DomainS_T.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:705
+// be\be_codegen.cpp:683
 
 #ifndef _TAO_IDL_ORIG_DOMAINS_T_CPP_
 #define _TAO_IDL_ORIG_DOMAINS_T_CPP_
@@ -34,7 +34,7 @@
 #include "DomainS_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "DomainS_T.i"
+#include "DomainS_T.inl"
 #endif /* !defined INLINE */
 
 
diff --git a/TAO/tao/Domain/DomainS_T.h b/TAO/tao/Domain/DomainS_T.h
index dacc83e2682..7a27d664cb0 100644
--- a/TAO/tao/Domain/DomainS_T.h
+++ b/TAO/tao/Domain/DomainS_T.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:566
+// be\be_codegen.cpp:546
 
 #ifndef _TAO_IDL_ORIG_DOMAINS_T_H_
 #define _TAO_IDL_ORIG_DOMAINS_T_H_
@@ -34,9 +34,7 @@
 #include /**/ "ace/pre.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -44,7 +42,6 @@
 // TAO_IDL - Generated from 
 // be\be_visitor_root/root_sth.cpp:116
 
-#if defined (ACE_HAS_USING_KEYWORD)
 namespace POA_CORBA
 {
   
@@ -92,7 +89,7 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
     
     ::CORBA::Policy_ptr get_domain_policy (
-        CORBA::PolicyType policy_type
+        ::CORBA::PolicyType policy_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -183,8 +180,8 @@ namespace POA_CORBA
     // be\be_visitor_operation/tie_sh.cpp:60
     
     void make_domain_manager (
-        CORBA::InterfaceDef_ptr object_type,
-        CORBA::Boolean constr_policy
+        ::CORBA::InterfaceDef_ptr object_type,
+        ::CORBA::Boolean constr_policy
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -201,13 +198,12 @@ namespace POA_CORBA
     void operator= (const ConstructionPolicy_tie &);
   };
 } // module CORBA
-#endif /* ACE_HAS_USING_KEYWORD */
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:1111
+// be\be_codegen.cpp:1094
 
 #if defined (__ACE_INLINE__)
-#include "DomainS_T.i"
+#include "DomainS_T.inl"
 #endif /* defined INLINE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
@@ -218,9 +214,10 @@ namespace POA_CORBA
 #pragma implementation ("DomainS_T.cpp")
 #endif /* defined REQUIRED PRAGMA */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/Domain/DomainS_T.i b/TAO/tao/Domain/DomainS_T.inl
index 0a1135f66f7..83b1baa46c4 100644
--- a/TAO/tao/Domain/DomainS_T.i
+++ b/TAO/tao/Domain/DomainS_T.inl
@@ -29,8 +29,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_interface/tie_si.cpp:96
 
-#if defined (ACE_HAS_USING_KEYWORD)
-
 template <class T> ACE_INLINE
 POA_CORBA::DomainManager_tie<T>::DomainManager_tie (T &t)
 	: ptr_ (&t),
@@ -126,7 +124,7 @@ POA_CORBA::DomainManager_tie<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)
 
 template <class T> ACE_INLINE
 ::CORBA::Policy_ptr POA_CORBA::DomainManager_tie<T>::get_domain_policy  (
-    CORBA::PolicyType policy_type
+    ::CORBA::PolicyType policy_type
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -139,13 +137,9 @@ template <class T> ACE_INLINE
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
 // TAO_IDL - Generated from
 // be\be_visitor_interface/tie_si.cpp:96
 
-#if defined (ACE_HAS_USING_KEYWORD)
-
 template <class T> ACE_INLINE
 POA_CORBA::ConstructionPolicy_tie<T>::ConstructionPolicy_tie (T &t)
 	: ptr_ (&t),
@@ -289,8 +283,8 @@ void POA_CORBA::ConstructionPolicy_tie<T>::destroy  (
 
 template <class T> ACE_INLINE
 void POA_CORBA::ConstructionPolicy_tie<T>::make_domain_manager  (
-    CORBA::InterfaceDef_ptr object_type,
-    CORBA::Boolean constr_policy
+    ::CORBA::InterfaceDef_ptr object_type,
+    ::CORBA::Boolean constr_policy
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -304,5 +298,3 @@ void POA_CORBA::ConstructionPolicy_tie<T>::make_domain_manager  (
   );
 }
 
-#endif /* ACE_HAS_USING_KEYWORD */
-
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index 1ad53d24434..21c7228a4bd 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -53,7 +53,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // TAO specific stuff.
 namespace CORBA
@@ -101,7 +101,7 @@ namespace TAO
 
 #if !defined (_CORBA_POLICY__ARG_TRAITS_CS_)
 #define _CORBA_POLICY__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_Export Arg_Traits<CORBA::Policy>
     : public
@@ -118,7 +118,7 @@ namespace TAO
 
 #if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_CS_)
 #define _CORBA_INTERFACEDEF__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_Export Arg_Traits<CORBA::InterfaceDef>
     : public
@@ -134,6 +134,7 @@ namespace TAO
 #endif /* end #if !defined */
 }
 
+
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
@@ -175,7 +176,7 @@ TAO::Objref_Traits<CORBA::DomainManager>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -195,21 +196,21 @@ TAO::Collocation_Proxy_Broker *
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_DomainManager_Proxy_Broker_ == 0)
     {
       CORBA_DomainManager_setup_collocation ();
     }
-
-  TAO::Arg_Traits< ::CORBA::Policy>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::PolicyType>::in_arg_val _tao_policy_type (policy_type);
-
+  
+  TAO::Arg_Traits< CORBA::Policy>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::PolicyType>::in_arg_val _tao_policy_type (policy_type);
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_policy_type
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -218,10 +219,10 @@ TAO::Collocation_Proxy_Broker *
       17,
       this->the_TAO_DomainManager_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-
+  
   return _tao_retval.retn ();
 }
 
@@ -244,7 +245,7 @@ CORBA::DomainManager::CORBA_DomainManager_setup_collocation ()
 CORBA::DomainManager::~DomainManager (void)
 {}
 
-void
+void 
 CORBA::DomainManager::_tao_any_destructor (void *_tao_void_pointer)
 {
   DomainManager *_tao_tmp_pointer =
@@ -289,7 +290,7 @@ CORBA::DomainManager::_duplicate (DomainManager_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -301,14 +302,14 @@ CORBA::DomainManager::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/DomainManager:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -373,7 +374,7 @@ TAO::Objref_Traits<CORBA::ConstructionPolicy>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
+TAO::Collocation_Proxy_Broker * 
 (*CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -394,23 +395,23 @@ void CORBA::ConstructionPolicy::make_domain_manager (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-
+  
   if (this->the_TAO_ConstructionPolicy_Proxy_Broker_ == 0)
     {
       CORBA_ConstructionPolicy_setup_collocation ();
     }
-
+  
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_object_type (object_type);
-  TAO::Arg_Traits< ACE_InputCDR::to_boolean>::in_arg_val _tao_constr_policy (constr_policy);
-
+  TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val _tao_object_type (object_type);
+  TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_constr_policy (constr_policy);
+  
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_object_type,
       &_tao_constr_policy
     };
-
+  
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -419,7 +420,7 @@ void CORBA::ConstructionPolicy::make_domain_manager (
       19,
       this->the_TAO_ConstructionPolicy_Proxy_Broker_
     );
-
+  
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -438,14 +439,14 @@ CORBA::ConstructionPolicy::CORBA_ConstructionPolicy_setup_collocation ()
       this->the_TAO_ConstructionPolicy_Proxy_Broker_ =
         ::CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer (this);
     }
-
+  
   this->CORBA_Policy_setup_collocation ();
 }
 
 CORBA::ConstructionPolicy::~ConstructionPolicy (void)
 {}
 
-void
+void 
 CORBA::ConstructionPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ConstructionPolicy *_tao_tmp_pointer =
@@ -490,7 +491,7 @@ CORBA::ConstructionPolicy::_duplicate (ConstructionPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -502,18 +503,18 @@ CORBA::ConstructionPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/ConstructionPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -612,9 +613,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::DomainManager RHS_SCOPED_NAME;
@@ -648,9 +649,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::ConstructionPolicy RHS_SCOPED_NAME;
@@ -681,18 +682,20 @@ CORBA::Boolean operator<< (
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
-            _tao_sequence[i].in ()->marshal (strm);
+            TAO::Objref_Traits<CORBA::DomainManager>::marshal (
+                _tao_sequence[i].in (), strm
+              );
         }
       
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -709,7 +712,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -718,11 +721,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -733,7 +736,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_DomainManagerList_CPP_ */
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
index 69bc5db35eb..4d3f3700691 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -49,6 +49,7 @@
 #include "tao/Objref_VarOut_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
+
 #include "tao/PolicyC.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -72,13 +73,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-  
+
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -88,22 +89,22 @@ namespace TAO
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_DOMAINMANAGER__VAR_OUT_CH_)
 #define _CORBA_DOMAINMANAGER__VAR_OUT_CH_
-  
+
   class DomainManager;
   typedef DomainManager *DomainManager_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         DomainManager
       >
     DomainManager_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         DomainManager
@@ -111,13 +112,13 @@ namespace CORBA
     DomainManager_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_DOMAINMANAGER_CH_)
 #define _CORBA_DOMAINMANAGER_CH_
-  
+
   class TAO_Export DomainManager
     : public virtual CORBA::Object
   {
@@ -125,30 +126,30 @@ namespace CORBA
     friend class TAO::Narrow_Utils<DomainManager>;
     typedef DomainManager_ptr _ptr_type;
     typedef DomainManager_var _var_type;
-    
+
     // The static operations.
     static DomainManager_ptr _duplicate (DomainManager_ptr obj);
-    
+
     static DomainManager_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DomainManager_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DomainManager_ptr _nil (void)
     {
-      return (DomainManager_ptr)0;
+      return static_cast<DomainManager_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr get_domain_policy (
         ::CORBA::PolicyType policy_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -156,34 +157,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-    
+
     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);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_DomainManager_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     DomainManager (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_DomainManager_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     DomainManager (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     DomainManager (
         TAO_Stub *objref,
@@ -191,9 +192,9 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~DomainManager (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     DomainManager (const DomainManager &);
@@ -265,7 +266,7 @@ namespace CORBA
     
     static ConstructionPolicy_ptr _nil (void)
     {
-      return (ConstructionPolicy_ptr)0;
+      return static_cast<ConstructionPolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
diff --git a/TAO/tao/DoubleSeqC.cpp b/TAO/tao/DoubleSeqC.cpp
index 2997e7642d8..a6c63b761a4 100644
--- a/TAO/tao/DoubleSeqC.cpp
+++ b/TAO/tao/DoubleSeqC.cpp
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -121,7 +121,7 @@ CORBA::Boolean operator<< (
       return strm.write_double_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -138,7 +138,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -147,7 +147,7 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
@@ -155,7 +155,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_DoubleSeq_CPP_ */
diff --git a/TAO/tao/DoubleSeqC.inl b/TAO/tao/DoubleSeqC.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/tao/DoubleSeqC.inl
+++ b/TAO/tao/DoubleSeqC.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/tao/Dynamic.pidl b/TAO/tao/Dynamic.pidl
index 459ea3af7e8..4332dcc4cde 100644
--- a/TAO/tao/Dynamic.pidl
+++ b/TAO/tao/Dynamic.pidl
@@ -17,17 +17,15 @@
  *          -Wb,post_include="ace/post.h"
  *          Dynamic.pidl
  *
- *   Patches for changes to the generated code are available in the
- *   `diffs' directory.
  */
 // ================================================================
 
 // File: Dynamic.idl
 // Used primarily for Interceptors
 
-#include <orb.idl>
 #include "Dynamic_Parameter.pidl"
 #include "StringSeq.pidl"
+#include "Typecode_types.pidl"
 
 #ifndef _DYNAMIC_IDL_
 #define _DYNAMIC_IDL_
diff --git a/TAO/tao/DynamicAny/DynamicAny.pidl b/TAO/tao/DynamicAny/DynamicAny.pidl
index 3de13053589..68768ed26e2 100644
--- a/TAO/tao/DynamicAny/DynamicAny.pidl
+++ b/TAO/tao/DynamicAny/DynamicAny.pidl
@@ -46,10 +46,10 @@
 #ifndef _DYNAMIC_ANY_IDL_
 #define _DYNAMIC_ANY_IDL_
 
-#include <orb.idl>
-
 #pragma prefix "omg.org"
 
+#include <Typecode_types.pidl>
+
 module DynamicAny {
 
     local interface DynAny {
diff --git a/TAO/tao/DynamicAny/diffs/DynamicAny.diff b/TAO/tao/DynamicAny/diffs/DynamicAny.diff
index f5de7e6491c..cc422c43a7f 100644
--- a/TAO/tao/DynamicAny/diffs/DynamicAny.diff
+++ b/TAO/tao/DynamicAny/diffs/DynamicAny.diff
@@ -1,5 +1,5 @@
---- orig/DynamicAnyC.h	2004-11-24 08:54:01.902620800 +0100
-+++ DynamicAnyC.h	2004-11-24 08:57:51.632956800 +0100
+--- orig/DynamicAnyC.h	2005-02-11 13:49:41.303510400 +0100
++++ DynamicAnyC.h	2005-02-11 13:49:41.774187200 +0100
 @@ -34,6 +34,10 @@
  #include /**/ "ace/pre.h"
  
@@ -19,10 +19,10 @@
  #include "tao/ORB.h"
  #include "tao/SystemException.h"
  #include "tao/Environment.h"
---- orig/DynamicAnyC.cpp	2004-11-24 08:54:01.902620800 +0100
-+++ DynamicAnyC.cpp	2004-11-24 08:58:10.009380800 +0100
+--- orig/DynamicAnyC.cpp	2005-02-11 13:49:41.303510400 +0100
++++ DynamicAnyC.cpp	2005-02-11 13:49:41.964460800 +0100
 @@ -29,7 +29,7 @@
- // be\be_codegen.cpp:301
+ // be\be_codegen.cpp:302
  
  
 -#include "DynamicAnyC.h"
diff --git a/TAO/tao/DynamicC.cpp b/TAO/tao/DynamicC.cpp
index abd5c387b97..bf33bffefee 100644
--- a/TAO/tao/DynamicC.cpp
+++ b/TAO/tao/DynamicC.cpp
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -171,7 +171,7 @@ CORBA::Boolean operator<< (
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -181,7 +181,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -198,7 +198,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -207,11 +207,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -222,7 +222,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_Dynamic_ParameterList_CPP_ */
@@ -243,7 +243,7 @@ CORBA::Boolean operator<< (
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -253,7 +253,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -270,7 +270,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -279,11 +279,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -294,7 +294,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_Dynamic_ExceptionList_CPP_ */
diff --git a/TAO/tao/DynamicC.h b/TAO/tao/DynamicC.h
index 0f7761b42cc..5291af0d2e6 100644
--- a/TAO/tao/DynamicC.h
+++ b/TAO/tao/DynamicC.h
@@ -42,7 +42,6 @@
 
 #include "tao/TAO_Export.h"
 #include "tao/ORB.h"
-#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Typecode.h"
 #include "tao/Sequence_T.h"
@@ -51,6 +50,7 @@
 
 #include "tao/Dynamic_ParameterC.h"
 #include "tao/StringSeqC.h"
+#include "tao/Typecode_typesC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -133,7 +133,7 @@ namespace Dynamic
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ParameterList;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:435
+  // be\be_visitor_typedef/typedef_ch.cpp:472
   
   typedef CORBA::StringSeq ContextList;
   typedef CORBA::StringSeq_var ContextList_var;
@@ -202,7 +202,7 @@ namespace Dynamic
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ExceptionList;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:435
+  // be\be_visitor_typedef/typedef_ch.cpp:472
   
   typedef CORBA::StringSeq RequestContext;
   typedef CORBA::StringSeq_var RequestContext_var;
@@ -277,7 +277,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_Dynamic_ExceptionList_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:963
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "DynamicC.inl"
diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp
index ed48e85cd35..bf0c1dd0b86 100644
--- a/TAO/tao/DynamicInterface/Context.cpp
+++ b/TAO/tao/DynamicInterface/Context.cpp
@@ -63,7 +63,7 @@ CORBA::Context::_decr_refcnt (void)
 const char *
 CORBA::Context::context_name (ACE_ENV_SINGLE_ARG_DECL) const
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO::VMCID,
                                          CORBA::COMPLETED_NO),
                     0);
 }
@@ -71,7 +71,7 @@ CORBA::Context::context_name (ACE_ENV_SINGLE_ARG_DECL) const
 CORBA::Context_ptr
 CORBA::Context::parent (ACE_ENV_SINGLE_ARG_DECL) const
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO::VMCID,
                                          CORBA::COMPLETED_NO),
                     0);
 }
@@ -81,7 +81,7 @@ CORBA::Context::create_child (const char * /* child_ctx_name */,
                               CORBA::Context_out /* child_ctx */
                               ACE_ENV_ARG_DECL)
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
+  ACE_THROW (CORBA::NO_IMPLEMENT (TAO::VMCID,
                                   CORBA::COMPLETED_NO));
 }
 
@@ -90,7 +90,7 @@ CORBA::Context::set_one_value (const char * /* propname */,
                                const CORBA::Any & /* propvalue */
                                ACE_ENV_ARG_DECL)
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
+  ACE_THROW (CORBA::NO_IMPLEMENT (TAO::VMCID,
                                   CORBA::COMPLETED_NO));
 }
 
@@ -98,7 +98,7 @@ void
 CORBA::Context::set_values (CORBA::NVList_ptr
                             ACE_ENV_ARG_DECL)
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
+  ACE_THROW (CORBA::NO_IMPLEMENT (TAO::VMCID,
                                   CORBA::COMPLETED_NO));
 }
 
@@ -106,7 +106,7 @@ void
 CORBA::Context::delete_values (const char * /* propname */
                                ACE_ENV_ARG_DECL)
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
+  ACE_THROW (CORBA::NO_IMPLEMENT (TAO::VMCID,
                                   CORBA::COMPLETED_NO));
 }
 
@@ -117,7 +117,7 @@ CORBA::Context::get_values (const char * /* start_scope */,
                             CORBA::NVList_ptr & /* values */
                             ACE_ENV_ARG_DECL)
 {
-  ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
+  ACE_THROW (CORBA::NO_IMPLEMENT (TAO::VMCID,
                                   CORBA::COMPLETED_NO));
 }
 
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp
index d0ebbf90dd9..deca796a521 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp
@@ -109,7 +109,7 @@ namespace TAO
     // Pull the exception ID out of the marshaling buffer.
     if (tmp_stream.read_string (buf.inout ()) == 0)
       {
-        ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
+        ACE_THROW_RETURN (CORBA::MARSHAL (TAO::VMCID,
                                           CORBA::COMPLETED_YES),
                           TAO_INVOKE_FAILURE);
       }
@@ -161,7 +161,7 @@ namespace TAO
     // @@ It would seem that if the remote exception is a
     //    UserException we can assume that the request was
     //    completed.
-    ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE,
+    ACE_THROW_RETURN (CORBA::UNKNOWN (TAO::VMCID,
                                       CORBA::COMPLETED_YES),
                       TAO_INVOKE_USER_EXCEPTION);
 
diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
index 36000c40896..14c2576825a 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
@@ -56,7 +56,7 @@ namespace TAO
       {
         ACE_THROW_RETURN (CORBA::INTERNAL (
             CORBA::SystemException::_tao_minor_code (
-                TAO_DEFAULT_MINOR_CODE,
+                TAO::VMCID,
                 EINVAL),
             CORBA::COMPLETED_NO),
                           TAO_INVOKE_FAILURE);
@@ -145,7 +145,7 @@ namespace TAO
       {
         ACE_THROW_RETURN (CORBA::INTERNAL (
             CORBA::SystemException::_tao_minor_code (
-                TAO_DEFAULT_MINOR_CODE,
+                TAO::VMCID,
                 EINVAL),
             CORBA::COMPLETED_NO),
                    TAO_INVOKE_FAILURE);
diff --git a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
index 260298f6662..ce379c1a689 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
@@ -41,7 +41,7 @@ TAO_Dynamic_Adapter_Impl::create_request (
                                     ACE_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY (
                         CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             ENOMEM
                           ),
                         CORBA::COMPLETED_MAYBE
@@ -62,7 +62,7 @@ TAO_Dynamic_Adapter_Impl::request (CORBA::Object_ptr obj,
                                     ACE_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY (
                         CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             ENOMEM
                           ),
                         CORBA::COMPLETED_MAYBE
@@ -127,7 +127,7 @@ TAO_Dynamic_Adapter_Impl::create_exception_list (
                     CORBA::ExceptionList,
                     CORBA::NO_MEMORY (
                         CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             ENOMEM
                           ),
                         CORBA::COMPLETED_NO
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
index 26b9ae7994a..d88ea1cef70 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
@@ -1,6 +1,5 @@
 #include "Dynamic_Implementation.h"
 
-
 ACE_RCSID (DynamicInterface,
            Dynamic_Implementation,
            "$Id$")
@@ -10,7 +9,8 @@ ACE_RCSID (DynamicInterface,
 #include "tao/ORB_Core.h"
 #include "tao/TSS_Resources.h"
 #include "tao/IFR_Client_Adapter.h"
-#include "tao/PortableServer/POA.h"
+#include "tao/PortableServer/Root_POA.h"
+#include "tao/PortableServer/POA_Current_Impl.h"
 
 #include "ace/Dynamic_Service.h"
 #include "ace/OS_NS_string.h"
@@ -96,9 +96,9 @@ TAO_DynamicImplementation::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
   // context of a request invocation on a target object being served
   // by the DSI servant, it raises the PortableServer::WrongPolicy
   // exception. See the CORBA C++ mapping, section 1.38.3.
-  TAO_POA_Current_Impl *poa_current_impl =
-    ACE_static_cast (TAO_POA_Current_Impl *,
-                     TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
+  TAO::Portable_Server::POA_Current_Impl *poa_current_impl =
+    static_cast <TAO::Portable_Server::POA_Current_Impl *>
+                     (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
 
   if (poa_current_impl == 0
       || this != poa_current_impl->servant ())
@@ -198,9 +198,9 @@ TAO_DynamicImplementation::get_id_from_primary_interface (
   // context of a request invocation on a target object being served
   // by the DSI servant, it raises the PortableServer::WrongPolicy
   // exception. See the CORBA C++ mapping, section 1.38.3.
-  TAO_POA_Current_Impl *poa_current_impl =
-    ACE_static_cast (TAO_POA_Current_Impl *,
-                     TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
+  TAO::Portable_Server::POA_Current_Impl *poa_current_impl =
+    static_cast <TAO::Portable_Server::POA_Current_Impl *>
+                     (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
 
   if (poa_current_impl == 0
       || this != poa_current_impl->servant ())
diff --git a/TAO/tao/Dynamic_Parameter.pidl b/TAO/tao/Dynamic_Parameter.pidl
index ebd34801121..8ddaff3fcea 100644
--- a/TAO/tao/Dynamic_Parameter.pidl
+++ b/TAO/tao/Dynamic_Parameter.pidl
@@ -17,8 +17,6 @@
  *          -Wb,post_include="ace/post.h"
  *          Dynamic_Parameter.pidl
  *
- *   Patches for changes to the generated code are available in the
- *   `diffs' directory.
  */
 // ================================================================
 
diff --git a/TAO/tao/Dynamic_ParameterC.cpp b/TAO/tao/Dynamic_ParameterC.cpp
index b1af4faf993..16763980505 100644
--- a/TAO/tao/Dynamic_ParameterC.cpp
+++ b/TAO/tao/Dynamic_ParameterC.cpp
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/Dynamic_ParameterC.h b/TAO/tao/Dynamic_ParameterC.h
index bdf8ff3f262..d14cad28184 100644
--- a/TAO/tao/Dynamic_ParameterC.h
+++ b/TAO/tao/Dynamic_ParameterC.h
@@ -74,40 +74,40 @@
 
 namespace Dynamic
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-
+  
   struct Parameter;
-
+  
   typedef
     TAO_Var_Var_T<
         Parameter
       >
     Parameter_var;
-
+  
   typedef
     TAO_Out_T<
         Parameter,
         Parameter_var
       >
     Parameter_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-
+  
   struct TAO_Export Parameter
   {
     typedef Parameter_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     CORBA::Any argument;
     CORBA::ParameterMode mode;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Parameter;
 
 // TAO_IDL - Generated from
@@ -138,7 +138,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Dynamic::Parameter
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Dynamic::Parameter &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:963
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "Dynamic_ParameterC.inl"
diff --git a/TAO/tao/Environment.cpp b/TAO/tao/Environment.cpp
index 70dd1ecbcb6..c69aa599a9a 100644
--- a/TAO/tao/Environment.cpp
+++ b/TAO/tao/Environment.cpp
@@ -1,6 +1,7 @@
 #include "Environment.h"
 #include "ORB_Core.h"
 #include "SystemException.h"
+#include "default_environment.h"
 
 #include "ace/OS_NS_string.h"
 
@@ -18,7 +19,6 @@ CORBA::Environment::Environment (void)
   : exception_ (0)
   , previous_ (0)
 {
-  //  TAO_ORB_Core_instance ()->default_environment (this);
 }
 
 CORBA::Environment::Environment (const CORBA::Environment& rhs)
@@ -122,7 +122,7 @@ CORBA::Environment::default_environment ()
   TAO_ORB_Core_instance ()->default_environment ()->clear ();
 #endif /* TAO_HAS_EXCEPTIONS */
 
-  return CORBA::default_environment ();
+  return TAO_default_environment ();;
 }
 
 // Convenience -- say if the exception is a system exception or not.
diff --git a/TAO/tao/Environment.h b/TAO/tao/Environment.h
index 726a2a01091..5446f342097 100644
--- a/TAO/tao/Environment.h
+++ b/TAO/tao/Environment.h
@@ -36,7 +36,6 @@ class TAO_ORB_Core;
 
 namespace CORBA
 {
-
   class Exception;
 
   class Environment;
@@ -44,10 +43,6 @@ namespace CORBA
   typedef TAO_Pseudo_Var_T<Environment> Environment_var;
   typedef TAO_Pseudo_Out_T<Environment, Environment_var> Environment_out;
 
-  /// Obtain the thread-specific default environment.  This is
-  /// obsolete and only left here for backwards compatibility.
-  TAO_NAMESPACE_INLINE_FUNCTION Environment & default_environment (void);
-
   /**
    * @class Environment
    *
diff --git a/TAO/tao/Environment.i b/TAO/tao/Environment.i
index d6144074e37..966da4ea4bc 100644
--- a/TAO/tao/Environment.i
+++ b/TAO/tao/Environment.i
@@ -2,37 +2,28 @@
 //
 // $Id$
 
-ACE_INLINE 
-CORBA::Environment &
-CORBA::default_environment (void)
-{
-  return TAO_default_environment ();
-}
-
-// ======================================================
-
-ACE_INLINE 
+ACE_INLINE
 CORBA::Boolean
 CORBA::is_nil (CORBA::Environment_ptr env)
 {
   return env == 0;
 }
 
-ACE_INLINE 
+ACE_INLINE
 void
 CORBA::release (CORBA::Environment_ptr env)
 {
   delete env;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::Exception *
 CORBA::Environment::exception (void) const
 {
   return this->exception_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::Environment *
 CORBA::Environment::_duplicate (CORBA::Environment *x)
 {
@@ -44,7 +35,7 @@ CORBA::Environment::_duplicate (CORBA::Environment *x)
   return new CORBA::Environment (*x);
 }
 
-ACE_INLINE 
+ACE_INLINE
 CORBA::Environment_ptr
 CORBA::Environment::_nil (void)
 {
diff --git a/TAO/tao/FloatSeqC.cpp b/TAO/tao/FloatSeqC.cpp
index 85598376a00..58b64fa300d 100644
--- a/TAO/tao/FloatSeqC.cpp
+++ b/TAO/tao/FloatSeqC.cpp
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -121,7 +121,7 @@ CORBA::Boolean operator<< (
       return strm.write_float_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -138,7 +138,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -147,7 +147,7 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
@@ -155,7 +155,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_FloatSeq_CPP_ */
diff --git a/TAO/tao/FloatSeqC.h b/TAO/tao/FloatSeqC.h
index c76ef31fdcd..b778a616bc7 100644
--- a/TAO/tao/FloatSeqC.h
+++ b/TAO/tao/FloatSeqC.h
@@ -166,7 +166,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_FloatSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:963
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "FloatSeqC.inl"
diff --git a/TAO/tao/GIOP.pidl b/TAO/tao/GIOP.pidl
index 2e08b31438a..6b94dad54e1 100644
--- a/TAO/tao/GIOP.pidl
+++ b/TAO/tao/GIOP.pidl
@@ -14,7 +14,7 @@
 //   is:
 //
 //     tao_idl
-//        -o orig -Sc -Ge 1 -GT -GA -I..
+//        -o orig -Ge 1 -GT -GA -I..
 //          -Wb,export_macro=TAO_Export
 //          -Wb,export_include="tao/TAO_Export.h"
 //          -Wb,pre_include="ace/pre.h"
@@ -26,7 +26,7 @@
 #ifndef TAO_GIOP_PIDL
 #define TAO_GIOP_PIDL
 
-#include "IOP.pidl"
+#include "IOP_IOR.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp
index 776a61162c4..ae44cf7c754 100644
--- a/TAO/tao/GIOPC.cpp
+++ b/TAO/tao/GIOPC.cpp
@@ -43,7 +43,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -302,10 +302,10 @@ CORBA::Boolean operator<< (
 {
   if ( !(strm << _tao_union._d ()) )
     {
-      return 0;
+      return false;
     }
   
-  CORBA::Boolean result = 1;
+  CORBA::Boolean result = true;
   
   switch (_tao_union._d ())
   {
@@ -339,10 +339,10 @@ CORBA::Boolean operator>> (
   CORBA::Short _tao_discriminant;
   if ( !(strm >> _tao_discriminant) )
     {
-      return 0;
+      return false;
     }
   
-  CORBA::Boolean result = 1;
+  CORBA::Boolean result = true;
   
   switch (_tao_discriminant)
   {
diff --git a/TAO/tao/GIOPC.h b/TAO/tao/GIOPC.h
index fdc8914d3a8..e2733bd5bdd 100644
--- a/TAO/tao/GIOPC.h
+++ b/TAO/tao/GIOPC.h
@@ -42,11 +42,10 @@
 
 #include "tao/TAO_Export.h"
 #include "tao/ORB.h"
-#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/VarOut_T.h"
 
-#include "tao/IOPC.h"
+#include "tao/IOP_IORC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -76,7 +75,7 @@ namespace GIOP
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::Short AddressingDisposition;
   typedef CORBA::Short_out AddressingDisposition_out;
@@ -319,7 +318,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const GIOP::TargetAddress
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::TargetAddress &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:963
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "GIOPC.inl"
diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp
index d37a4f06f15..0095a74a692 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -246,19 +246,18 @@ TAO_GIOP_Message_Base::format_message (TAO_OutputCDR &stream)
   // this particular environment and that isn't handled by the
   // networking infrastructure (e.g., IPSEC).
 
-  CORBA::ULong bodylen = ACE_static_cast (CORBA::ULong,
-                           total_len - TAO_GIOP_MESSAGE_HEADER_LEN);
+  CORBA::ULong bodylen = static_cast <CORBA::ULong>
+                           (total_len - TAO_GIOP_MESSAGE_HEADER_LEN);
 
 #if !defined (ACE_ENABLE_SWAP_ON_WRITE)
-  *ACE_reinterpret_cast (CORBA::ULong *, buf +
-                         TAO_GIOP_MESSAGE_SIZE_OFFSET) = bodylen;
+  *(reinterpret_cast <CORBA::ULong *> (buf +
+                         TAO_GIOP_MESSAGE_SIZE_OFFSET)) = bodylen;
 #else
   if (!stream.do_byte_swap ())
-    *ACE_reinterpret_cast (CORBA::ULong *,
-                           buf + TAO_GIOP_MESSAGE_SIZE_OFFSET) = bodylen;
+    *(reinterpret_cast <CORBA::ULong *>
+                           (buf + TAO_GIOP_MESSAGE_SIZE_OFFSET)) = bodylen;
   else
-    ACE_CDR::swap_4 (ACE_reinterpret_cast (char *,
-                                           &bodylen),
+    ACE_CDR::swap_4 (reinterpret_cast <char *> (&bodylen),
                      buf + TAO_GIOP_MESSAGE_SIZE_OFFSET);
 #endif /* ACE_ENABLE_SWAP_ON_WRITE */
 
@@ -276,8 +275,7 @@ TAO_GIOP_Message_Base::format_message (TAO_OutputCDR &stream)
         }
       ///
       this->dump_msg ("send",
-                      ACE_reinterpret_cast (u_char *,
-                                            buf),
+                      reinterpret_cast <u_char *> (buf),
                       total_len);
 
       //
@@ -551,8 +549,7 @@ TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport,
 
   if (TAO_debug_level > 0)
     this->dump_msg ("recv",
-                    ACE_reinterpret_cast (u_char *,
-                                          qd->msg_block_->rd_ptr ()),
+                    reinterpret_cast <u_char *> (qd->msg_block_->rd_ptr ()),
                     qd->msg_block_->length ());
 
 
@@ -645,8 +642,7 @@ TAO_GIOP_Message_Base::process_reply_message (
 
   if (TAO_debug_level > 0)
     this->dump_msg ("recv",
-                    ACE_reinterpret_cast (u_char *,
-                                          qd->msg_block_->rd_ptr ()),
+                    reinterpret_cast <u_char *> (qd->msg_block_->rd_ptr ()),
                     qd->msg_block_->length ());
 
 
@@ -1434,14 +1430,14 @@ TAO_GIOP_Message_Base::dump_msg (const char *label,
 #if !defined (ACE_DISABLE_SWAP_ON_READ)
       if (byte_order == TAO_ENCAP_BYTE_ORDER)
         {
-          id = ACE_reinterpret_cast (ACE_CDR::ULong*, tmp_id);
+          id = reinterpret_cast <ACE_CDR::ULong*> (tmp_id);
         }
       else
         {
-          ACE_CDR::swap_4 (tmp_id, ACE_reinterpret_cast (char*,id));
+          ACE_CDR::swap_4 (tmp_id, reinterpret_cast <char*> (id));
         }
 #else
-      id = ACE_reinterpret_cast(ACE_CDR::ULong*, tmp_id);
+      id = reinterpret_cast <ACE_CDR::ULong*> (tmp_id);
 #endif /* ACE_DISABLE_SWAP_ON_READ */
 
         }
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp
index 96135ffeaa4..4c13403bdfe 100644
--- a/TAO/tao/GIOP_Message_Lite.cpp
+++ b/TAO/tao/GIOP_Message_Lite.cpp
@@ -198,18 +198,16 @@ TAO_GIOP_Message_Lite::format_message (TAO_OutputCDR &stream)
   // this particular environment and that isn't handled by the
   // networking infrastructure (e.g., IPSEC).
 
-  CORBA::ULong bodylen = ACE_static_cast (CORBA::ULong,
-                                          total_len - header_len);
+  CORBA::ULong bodylen = static_cast <CORBA::ULong> (total_len - header_len);
 
 #if !defined (ACE_ENABLE_SWAP_ON_WRITE)
-  *ACE_reinterpret_cast (CORBA::ULong *, buf + offset) = bodylen;
+  *(reinterpret_cast <CORBA::ULong *> (buf + offset)) = bodylen;
 #else
   if (!stream.do_byte_swap ())
-    *ACE_reinterpret_cast (CORBA::ULong *,
-                           buf + offset) = bodylen;
+    *(reinterpret_cast <CORBA::ULong *>
+                           (buf + offset)) = bodylen;
   else
-    ACE_CDR::swap_4 (ACE_reinterpret_cast (char *,
-                                           &bodylen),
+    ACE_CDR::swap_4 (reinterpret_cast <char *> (&bodylen),
                      buf + offset);
 #endif /* ACE_ENABLE_SWAP_ON_WRITE */
 
@@ -231,8 +229,7 @@ TAO_GIOP_Message_Lite::format_message (TAO_OutputCDR &stream)
       ///
 
       this->dump_msg ("send",
-                      ACE_reinterpret_cast (u_char *,
-                                            buf),
+                      reinterpret_cast <u_char *> (buf),
                       stream.length ());
 
       //
@@ -272,14 +269,14 @@ TAO_GIOP_Message_Lite::parse_incoming_messages (ACE_Message_Block &block)
 #if !defined (ACE_DISABLE_SWAP_ON_READ)
   if (!(this->byte_order_ != TAO_ENCAP_BYTE_ORDER))
     {
-      x = *ACE_reinterpret_cast (ACE_CDR::ULong*, buf);
+      x = *(reinterpret_cast <ACE_CDR::ULong*> (buf));
     }
   else
     {
-      ACE_CDR::swap_4 (buf, ACE_reinterpret_cast (char*, &x));
+      ACE_CDR::swap_4 (buf, reinterpret_cast <char*> (&x));
     }
 #else
-  x = *ACE_reinterpret_cast (ACE_CDR::ULong*, buf);
+  x = *(reinterpret_cast <ACE_CDR::ULong*> (buf));
 #endif /* ACE_DISABLE_SWAP_ON_READ */
 
   this->message_size_ = x;
@@ -525,8 +522,7 @@ TAO_GIOP_Message_Lite::process_request_message (TAO_Transport *transport,
 
   if (TAO_debug_level > 0)
     this->dump_msg ("recv",
-                    ACE_reinterpret_cast (u_char *,
-                                          qd->msg_block_->rd_ptr ()),
+                    reinterpret_cast <u_char *> (qd->msg_block_->rd_ptr ()),
                     qd->msg_block_->length ());
 
 
@@ -580,8 +576,7 @@ TAO_GIOP_Message_Lite::process_reply_message (
 
   if (TAO_debug_level > 0)
     this->dump_msg ("recv",
-                    ACE_reinterpret_cast (u_char *,
-                                          qd->msg_block_->rd_ptr ()),
+                    reinterpret_cast <u_char *> (qd->msg_block_->rd_ptr ()),
                     qd->msg_block_->length ());
 
 
@@ -1600,8 +1595,7 @@ TAO_GIOP_Message_Lite::dump_msg (const char *label,
           // to. So, try to align teh pointer to a 4 byte boundary.
           char *buf = ACE_ptr_align_binary (ptr + TAO_GIOP_LITE_HEADER_LEN, 4);
 
-          id = ACE_reinterpret_cast (CORBA::ULong *,
-                                     (char * ) (buf));
+          id = reinterpret_cast <CORBA::ULong *> (buf);
         }
 
       // Print.
diff --git a/TAO/tao/IFR_Client/IFR_Base.pidl b/TAO/tao/IFR_Client/IFR_Base.pidl
index 764ff92a3ee..00de4b02f97 100644
--- a/TAO/tao/IFR_Client/IFR_Base.pidl
+++ b/TAO/tao/IFR_Client/IFR_Base.pidl
@@ -14,7 +14,7 @@
  *
  * The command used to generate code from this IDL file is:
  *
- *   tao_idl -Ge 1 -Sc -GT -I../.. \
+ *   tao_idl -GA -Ge 1 -Sc -GT -I../.. \
  *        -Wb,export_macro=TAO_IFR_Client_Export \
  *        -Wb,export_include=ifr_client_export.h \
  *        -Wb,pre_include="ace/pre.h" \
@@ -50,7 +50,8 @@
 #ifndef _IFR_BASE_IDL_
 #define _IFR_BASE_IDL_
 
-#include <orb.idl>
+#include <orb_types.pidl>
+#include <Typecode_types.pidl>
 
 module CORBA
 {
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp
index 321fb128802..f85826869f4 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BaseC.cpp
@@ -51,14 +51,14 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:574
+  // be\be_visitor_arg_traits.cpp:624
 
 #if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_CS_)
 #define _CORBA_DEFINITIONKIND__ARG_TRAITS_CS_
@@ -92,7 +92,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:612
+  // be\be_visitor_arg_traits.cpp:662
 
 #if !defined (_CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_CS_)
 #define _CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_CS_
@@ -145,7 +145,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_CS_)
 #define _CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_CS_
@@ -300,7 +300,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_)
 #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_
@@ -370,7 +370,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_)
 #define _CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_
@@ -423,7 +423,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_CS_)
 #define _CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_CS_
@@ -476,7 +476,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_CONTAINEDSEQ__ARG_TRAITS_CS_)
 #define _CORBA_CONTAINEDSEQ__ARG_TRAITS_CS_
@@ -495,7 +495,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_)
 #define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_
@@ -514,7 +514,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_)
 #define _CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_
@@ -533,7 +533,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_)
 #define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_
@@ -552,7 +552,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_)
 #define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_
@@ -571,7 +571,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_)
 #define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_
diff --git a/TAO/tao/IFR_Client/IFR_BaseS.h b/TAO/tao/IFR_Client/IFR_BaseS.h
index 8d7651dd0fe..cbd3ca9851e 100644
--- a/TAO/tao/IFR_Client/IFR_BaseS.h
+++ b/TAO/tao/IFR_Client/IFR_BaseS.h
@@ -28,8 +28,8 @@
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:390
 
-#ifndef _TAO_IDL_IFR_BASES_H_
-#define _TAO_IDL_IFR_BASES_H_
+#ifndef _TAO_IDL_ORIG_IFR_BASES_H_
+#define _TAO_IDL_ORIG_IFR_BASES_H_
 
 #include /**/ "ace/pre.h"
 
@@ -57,108 +57,108 @@
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_sh.cpp:87
-  
+
   class IRObject;
   typedef IRObject *IRObject_ptr;
-  
+
   class _TAO_IRObject_ThruPOA_Proxy_Impl;
   class _TAO_IRObject_Strategized_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export IRObject
     : public virtual PortableServer::ServantBase
   {
   protected:
     IRObject (void);
-  
+
   public:
     // Useful for template programming.
     typedef ::CORBA::IRObject _stub_type;
     typedef ::CORBA::IRObject_ptr _stub_ptr_type;
     typedef ::CORBA::IRObject_var _stub_var_type;
-    
+
     IRObject (const IRObject& rhs);
     virtual ~IRObject (void);
-    
+
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void* _downcast (
         const char* logical_type_id
       );
-    
+
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _component_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     ::CORBA::IRObject *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _get_def_kind_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void destroy_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
@@ -166,29 +166,29 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
   };
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-  
+
   class TAO_IFR_Client_Export _TAO_IRObject_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_IRObject_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_IRObject_Strategized_Proxy_Broker (void);
-    
+
     TAO::Collocation_Strategy
     get_strategy (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     void
     dispatch (
         CORBA::Object_ptr obj,
@@ -201,33 +201,33 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::Exception));
-    
+
     static _TAO_IRObject_Strategized_Proxy_Broker *
     the_TAO_IRObject_Strategized_Proxy_Broker (void);
   };
-  
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_IRObject_ThruPOA_Proxy_Impl
   {
   public:
     _TAO_IRObject_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_IRObject_ThruPOA_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     _get_def_kind (
         TAO_Abstract_ServantBase *servant,
@@ -238,10 +238,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     destroy (
         TAO_Abstract_ServantBase *servant,
@@ -253,104 +253,104 @@ namespace POA_CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_sh.cpp:87
-  
+
   class Contained;
   typedef Contained *Contained_ptr;
-  
+
   class _TAO_Contained_ThruPOA_Proxy_Impl;
   class _TAO_Contained_Strategized_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export Contained
     : public virtual POA_CORBA::IRObject
   {
   protected:
     Contained (void);
-  
+
   public:
     // Useful for template programming.
     typedef ::CORBA::Contained _stub_type;
     typedef ::CORBA::Contained_ptr _stub_ptr_type;
     typedef ::CORBA::Contained_var _stub_var_type;
-    
+
     Contained (const Contained& rhs);
     virtual ~Contained (void);
-    
+
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void* _downcast (
         const char* logical_type_id
       );
-    
+
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _component_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     ::CORBA::Contained *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _get_id_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual void id (
         const char * id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -358,34 +358,34 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _set_id_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _get_name_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual void name (
         const char * name
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -393,34 +393,34 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _set_name_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _get_version_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual void version (
         const char * version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -428,85 +428,85 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _set_version_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _get_defined_in_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _get_absolute_name_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _get_containing_repository_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void describe_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual void move (
         ::CORBA::Container_ptr new_container,
         const char * new_name,
@@ -516,14 +516,14 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void move_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void
     _get_def_kind_skel (
         TAO_ServerRequest &req,
@@ -531,41 +531,41 @@ namespace POA_CORBA
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:2026
-    
+
     static void
     destroy_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-  
+
   class TAO_IFR_Client_Export _TAO_Contained_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_Contained_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_Contained_Strategized_Proxy_Broker (void);
-    
+
     TAO::Collocation_Strategy
     get_strategy (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     void
     dispatch (
         CORBA::Object_ptr obj,
@@ -578,34 +578,34 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::Exception));
-    
+
     static _TAO_Contained_Strategized_Proxy_Broker *
     the_TAO_Contained_Strategized_Proxy_Broker (void);
   };
-  
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_Contained_ThruPOA_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl
   {
   public:
     _TAO_Contained_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_Contained_ThruPOA_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     _get_id (
         TAO_Abstract_ServantBase *servant,
@@ -616,10 +616,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     _set_id (
         TAO_Abstract_ServantBase *servant,
@@ -630,10 +630,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     _get_name (
         TAO_Abstract_ServantBase *servant,
@@ -644,10 +644,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     _set_name (
         TAO_Abstract_ServantBase *servant,
@@ -658,10 +658,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     _get_version (
         TAO_Abstract_ServantBase *servant,
@@ -672,10 +672,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     _set_version (
         TAO_Abstract_ServantBase *servant,
@@ -686,10 +686,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     _get_defined_in (
         TAO_Abstract_ServantBase *servant,
@@ -700,10 +700,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     _get_absolute_name (
         TAO_Abstract_ServantBase *servant,
@@ -714,10 +714,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     _get_containing_repository (
         TAO_Abstract_ServantBase *servant,
@@ -728,10 +728,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     describe (
         TAO_Abstract_ServantBase *servant,
@@ -742,10 +742,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     move (
         TAO_Abstract_ServantBase *servant,
@@ -757,7 +757,7 @@ namespace POA_CORBA
         CORBA::SystemException
       ));static void
     _get_def_kind (
-        TAO_Abstract_ServantBase *servant, 
+        TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -765,13 +765,13 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:2214
-    
+
     static void
     destroy (
-        TAO_Abstract_ServantBase *servant, 
+        TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -780,87 +780,87 @@ namespace POA_CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_sh.cpp:87
-  
+
   class Container;
   typedef Container *Container_ptr;
-  
+
   class _TAO_Container_ThruPOA_Proxy_Impl;
   class _TAO_Container_Strategized_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export Container
     : public virtual POA_CORBA::IRObject
   {
   protected:
     Container (void);
-  
+
   public:
     // Useful for template programming.
     typedef ::CORBA::Container _stub_type;
     typedef ::CORBA::Container_ptr _stub_ptr_type;
     typedef ::CORBA::Container_var _stub_var_type;
-    
+
     Container (const Container& rhs);
     virtual ~Container (void);
-    
+
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void* _downcast (
         const char* logical_type_id
       );
-    
+
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _component_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     ::CORBA::Container *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::Contained_ptr lookup (
         const char * search_name
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -868,17 +868,17 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void lookup_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
@@ -887,17 +887,17 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void contents_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::ContainedSeq * lookup_name (
         const char * search_name,
         ::CORBA::Long levels_to_search,
@@ -908,17 +908,17 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void lookup_name_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::Container::DescriptionSeq * describe_contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
@@ -928,17 +928,17 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void describe_contents_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::ModuleDef_ptr create_module (
         const char * id,
         const char * name,
@@ -948,17 +948,17 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void create_module_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::ConstantDef_ptr create_constant (
         const char * id,
         const char * name,
@@ -970,17 +970,17 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void create_constant_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::StructDef_ptr create_struct (
         const char * id,
         const char * name,
@@ -991,17 +991,17 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void create_struct_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::UnionDef_ptr create_union (
         const char * id,
         const char * name,
@@ -1013,17 +1013,17 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void create_union_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::EnumDef_ptr create_enum (
         const char * id,
         const char * name,
@@ -1034,17 +1034,17 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void create_enum_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::AliasDef_ptr create_alias (
         const char * id,
         const char * name,
@@ -1055,17 +1055,17 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void create_alias_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::InterfaceDef_ptr create_interface (
         const char * id,
         const char * name,
@@ -1076,17 +1076,17 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void create_interface_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::ValueDef_ptr create_value (
         const char * id,
         const char * name,
@@ -1103,17 +1103,17 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void create_value_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::ValueBoxDef_ptr create_value_box (
         const char * id,
         const char * name,
@@ -1124,17 +1124,17 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void create_value_box_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::ExceptionDef_ptr create_exception (
         const char * id,
         const char * name,
@@ -1145,17 +1145,17 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void create_exception_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::NativeDef_ptr create_native (
         const char * id,
         const char * name,
@@ -1165,17 +1165,17 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void create_native_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
         const char * name,
@@ -1186,17 +1186,17 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void create_abstract_interface_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::LocalInterfaceDef_ptr create_local_interface (
         const char * id,
         const char * name,
@@ -1207,17 +1207,17 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void create_local_interface_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::ExtValueDef_ptr create_ext_value (
         const char * id,
         const char * name,
@@ -1234,14 +1234,14 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void create_ext_value_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void
     _get_def_kind_skel (
         TAO_ServerRequest &req,
@@ -1249,41 +1249,41 @@ namespace POA_CORBA
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:2026
-    
+
     static void
     destroy_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-  
+
   class TAO_IFR_Client_Export _TAO_Container_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_Container_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_Container_Strategized_Proxy_Broker (void);
-    
+
     TAO::Collocation_Strategy
     get_strategy (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     void
     dispatch (
         CORBA::Object_ptr obj,
@@ -1296,34 +1296,34 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::Exception));
-    
+
     static _TAO_Container_Strategized_Proxy_Broker *
     the_TAO_Container_Strategized_Proxy_Broker (void);
   };
-  
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_Container_ThruPOA_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl
   {
   public:
     _TAO_Container_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_Container_ThruPOA_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     lookup (
         TAO_Abstract_ServantBase *servant,
@@ -1334,10 +1334,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     contents (
         TAO_Abstract_ServantBase *servant,
@@ -1348,10 +1348,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     lookup_name (
         TAO_Abstract_ServantBase *servant,
@@ -1362,10 +1362,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     describe_contents (
         TAO_Abstract_ServantBase *servant,
@@ -1376,10 +1376,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     create_module (
         TAO_Abstract_ServantBase *servant,
@@ -1390,10 +1390,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     create_constant (
         TAO_Abstract_ServantBase *servant,
@@ -1404,10 +1404,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     create_struct (
         TAO_Abstract_ServantBase *servant,
@@ -1418,10 +1418,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     create_union (
         TAO_Abstract_ServantBase *servant,
@@ -1432,10 +1432,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     create_enum (
         TAO_Abstract_ServantBase *servant,
@@ -1446,10 +1446,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     create_alias (
         TAO_Abstract_ServantBase *servant,
@@ -1460,10 +1460,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     create_interface (
         TAO_Abstract_ServantBase *servant,
@@ -1474,10 +1474,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     create_value (
         TAO_Abstract_ServantBase *servant,
@@ -1488,10 +1488,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     create_value_box (
         TAO_Abstract_ServantBase *servant,
@@ -1502,10 +1502,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     create_exception (
         TAO_Abstract_ServantBase *servant,
@@ -1516,10 +1516,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     create_native (
         TAO_Abstract_ServantBase *servant,
@@ -1530,10 +1530,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     create_abstract_interface (
         TAO_Abstract_ServantBase *servant,
@@ -1544,10 +1544,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     create_local_interface (
         TAO_Abstract_ServantBase *servant,
@@ -1558,10 +1558,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     create_ext_value (
         TAO_Abstract_ServantBase *servant,
@@ -1573,7 +1573,7 @@ namespace POA_CORBA
         CORBA::SystemException
       ));static void
     _get_def_kind (
-        TAO_Abstract_ServantBase *servant, 
+        TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1581,13 +1581,13 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:2214
-    
+
     static void
     destroy (
-        TAO_Abstract_ServantBase *servant, 
+        TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1596,101 +1596,101 @@ namespace POA_CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_sh.cpp:87
-  
+
   class IDLType;
   typedef IDLType *IDLType_ptr;
-  
+
   class _TAO_IDLType_ThruPOA_Proxy_Impl;
   class _TAO_IDLType_Strategized_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export IDLType
     : public virtual POA_CORBA::IRObject
   {
   protected:
     IDLType (void);
-  
+
   public:
     // Useful for template programming.
     typedef ::CORBA::IDLType _stub_type;
     typedef ::CORBA::IDLType_ptr _stub_ptr_type;
     typedef ::CORBA::IDLType_var _stub_var_type;
-    
+
     IDLType (const IDLType& rhs);
     virtual ~IDLType (void);
-    
+
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void* _downcast (
         const char* logical_type_id
       );
-    
+
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _component_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     ::CORBA::IDLType *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _get_type_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_servant,
         void *_tao_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void
     _get_def_kind_skel (
         TAO_ServerRequest &req,
@@ -1698,41 +1698,41 @@ namespace POA_CORBA
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:2026
-    
+
     static void
     destroy_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-  
+
   class TAO_IFR_Client_Export _TAO_IDLType_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_IDLType_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_IDLType_Strategized_Proxy_Broker (void);
-    
+
     TAO::Collocation_Strategy
     get_strategy (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     void
     dispatch (
         CORBA::Object_ptr obj,
@@ -1745,34 +1745,34 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::Exception));
-    
+
     static _TAO_IDLType_Strategized_Proxy_Broker *
     the_TAO_IDLType_Strategized_Proxy_Broker (void);
   };
-  
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_IDLType_ThruPOA_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_IRObject_ThruPOA_Proxy_Impl
   {
   public:
     _TAO_IDLType_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_IDLType_ThruPOA_Proxy_Impl (void) {}
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/proxy_impl_xh.cpp:24
-    
+
     static void
     _get_type (
         TAO_Abstract_ServantBase *servant,
@@ -1784,7 +1784,7 @@ namespace POA_CORBA
         CORBA::SystemException
       ));static void
     _get_def_kind (
-        TAO_Abstract_ServantBase *servant, 
+        TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1792,13 +1792,13 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:2214
-    
+
     static void
     destroy (
-        TAO_Abstract_ServantBase *servant, 
+        TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1807,85 +1807,85 @@ namespace POA_CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_sh.cpp:87
-  
+
   class TypedefDef;
   typedef TypedefDef *TypedefDef_ptr;
-  
+
   class _TAO_TypedefDef_ThruPOA_Proxy_Impl;
   class _TAO_TypedefDef_Strategized_Proxy_Broker;
-  
+
   class TAO_IFR_Client_Export TypedefDef
     : public virtual POA_CORBA::Contained,
       public virtual POA_CORBA::IDLType
   {
   protected:
     TypedefDef (void);
-  
+
   public:
     // Useful for template programming.
     typedef ::CORBA::TypedefDef _stub_type;
     typedef ::CORBA::TypedefDef_ptr _stub_ptr_type;
     typedef ::CORBA::TypedefDef_var _stub_var_type;
-    
+
     TypedefDef (const TypedefDef& rhs);
     virtual ~TypedefDef (void);
-    
+
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual void* _downcast (
         const char* logical_type_id
       );
-    
+
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _component_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     ::CORBA::TypedefDef *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
-    
+
     static void
     _get_def_kind_skel (
         TAO_ServerRequest &req,
@@ -1893,18 +1893,18 @@ namespace POA_CORBA
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:2026
-    
+
     static void
     destroy_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static void
     _get_id_skel (
         TAO_ServerRequest &req,
@@ -1912,7 +1912,7 @@ namespace POA_CORBA
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static void
     _set_id_skel (
         TAO_ServerRequest &req,
@@ -1920,7 +1920,7 @@ namespace POA_CORBA
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static void
     _get_name_skel (
         TAO_ServerRequest &req,
@@ -1928,7 +1928,7 @@ namespace POA_CORBA
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static void
     _set_name_skel (
         TAO_ServerRequest &req,
@@ -1936,7 +1936,7 @@ namespace POA_CORBA
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static void
     _get_version_skel (
         TAO_ServerRequest &req,
@@ -1944,7 +1944,7 @@ namespace POA_CORBA
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static void
     _set_version_skel (
         TAO_ServerRequest &req,
@@ -1952,7 +1952,7 @@ namespace POA_CORBA
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static void
     _get_defined_in_skel (
         TAO_ServerRequest &req,
@@ -1960,7 +1960,7 @@ namespace POA_CORBA
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static void
     _get_absolute_name_skel (
         TAO_ServerRequest &req,
@@ -1968,7 +1968,7 @@ namespace POA_CORBA
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static void
     _get_containing_repository_skel (
         TAO_ServerRequest &req,
@@ -1976,29 +1976,29 @@ namespace POA_CORBA
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:2026
-    
+
     static void
     describe_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:2026
-    
+
     static void
     move_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
         void *context
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static void
     _get_type_skel (
         TAO_ServerRequest &req,
@@ -2007,29 +2007,29 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-  
+
   class TAO_IFR_Client_Export _TAO_TypedefDef_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_TypedefDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_TypedefDef_Strategized_Proxy_Broker (void);
-    
+
     TAO::Collocation_Strategy
     get_strategy (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
-    
+
     void
     dispatch (
         CORBA::Object_ptr obj,
@@ -2042,33 +2042,33 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::Exception));
-    
+
     static _TAO_TypedefDef_Strategized_Proxy_Broker *
     the_TAO_TypedefDef_Strategized_Proxy_Broker (void);
   };
-  
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA Proxy Impl. Declaration
   //
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-  
+
   class TAO_IFR_Client_Export _TAO_TypedefDef_ThruPOA_Proxy_Impl
     : public virtual ::POA_CORBA::_TAO_Contained_ThruPOA_Proxy_Impl,
       public virtual ::POA_CORBA::_TAO_IDLType_ThruPOA_Proxy_Impl
   {
   public:
     _TAO_TypedefDef_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_TypedefDef_ThruPOA_Proxy_Impl (void) {}static void
     _get_def_kind (
-        TAO_Abstract_ServantBase *servant, 
+        TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2076,13 +2076,13 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:2214
-    
+
     static void
     destroy (
-        TAO_Abstract_ServantBase *servant, 
+        TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2091,7 +2091,7 @@ namespace POA_CORBA
         CORBA::SystemException
       ));static void
     _get_id (
-        TAO_Abstract_ServantBase *servant, 
+        TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2099,10 +2099,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     static void
     _set_id (
-        TAO_Abstract_ServantBase *servant, 
+        TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2111,7 +2111,7 @@ namespace POA_CORBA
         CORBA::SystemException
       ));static void
     _get_name (
-        TAO_Abstract_ServantBase *servant, 
+        TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2119,10 +2119,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     static void
     _set_name (
-        TAO_Abstract_ServantBase *servant, 
+        TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2131,7 +2131,7 @@ namespace POA_CORBA
         CORBA::SystemException
       ));static void
     _get_version (
-        TAO_Abstract_ServantBase *servant, 
+        TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2139,10 +2139,10 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     static void
     _set_version (
-        TAO_Abstract_ServantBase *servant, 
+        TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2151,7 +2151,7 @@ namespace POA_CORBA
         CORBA::SystemException
       ));static void
     _get_defined_in (
-        TAO_Abstract_ServantBase *servant, 
+        TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2160,7 +2160,7 @@ namespace POA_CORBA
         CORBA::SystemException
       ));static void
     _get_absolute_name (
-        TAO_Abstract_ServantBase *servant, 
+        TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2169,7 +2169,7 @@ namespace POA_CORBA
         CORBA::SystemException
       ));static void
     _get_containing_repository (
-        TAO_Abstract_ServantBase *servant, 
+        TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2177,13 +2177,13 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:2214
-    
+
     static void
     describe (
-        TAO_Abstract_ServantBase *servant, 
+        TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2191,13 +2191,13 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_interface.cpp:2214
-    
+
     static void
     move (
-        TAO_Abstract_ServantBase *servant, 
+        TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2206,7 +2206,7 @@ namespace POA_CORBA
         CORBA::SystemException
       ));static void
     _get_type (
-        TAO_Abstract_ServantBase *servant, 
+        TAO_Abstract_ServantBase *servant,
         TAO::Argument ** args,
         int num_args
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2215,7 +2215,7 @@ namespace POA_CORBA
         CORBA::SystemException
       ));
   };
-  
+
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
@@ -2225,7 +2225,7 @@ namespace POA_CORBA
 
 } // module CORBA
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:997
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/IFR_Client/IFR_Basic.pidl b/TAO/tao/IFR_Client/IFR_Basic.pidl
index 4f15d777b8f..0fc57a14ad4 100644
--- a/TAO/tao/IFR_Client/IFR_Basic.pidl
+++ b/TAO/tao/IFR_Client/IFR_Basic.pidl
@@ -37,7 +37,7 @@
 //          -Wb,post_include="ace/post.h" \
 //          IFR_Basic.pidl
 //
-//   The only modification necessary to the skelton files is to
+//   The only modification necessary to the skeleton files is to
 //   change
 //
 //   #include "IFR_BasicC.h"
@@ -54,7 +54,7 @@
 #ifndef _IFR_BASIC_IDL_
 #define _IFR_BASIC_IDL_
 
-#include "IFR_Base.pidl"
+#include "tao/IFR_Client/IFR_Base.pidl"
 #include "ParameterMode.pidl"
 
 module CORBA
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.cpp b/TAO/tao/IFR_Client/IFR_BasicC.cpp
index 1093fd76d6b..4411ff8ed50 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BasicC.cpp
@@ -51,7 +51,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -92,7 +92,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:612
+  // be\be_visitor_arg_traits.cpp:662
 
 #if !defined (_CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_CS_)
 #define _CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_CS_
@@ -111,7 +111,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_)
 #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_
@@ -130,7 +130,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_)
 #define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_
@@ -149,7 +149,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_CS_)
 #define _CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_CS_
@@ -168,7 +168,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_)
 #define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_
@@ -187,7 +187,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_)
 #define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_
@@ -308,7 +308,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:574
+  // be\be_visitor_arg_traits.cpp:624
 
 #if !defined (_CORBA_PRIMITIVEKIND__ARG_TRAITS_CS_)
 #define _CORBA_PRIMITIVEKIND__ARG_TRAITS_CS_
@@ -325,7 +325,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_)
 #define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_
@@ -344,7 +344,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:574
+  // be\be_visitor_arg_traits.cpp:624
 
 #if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_CS_)
 #define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_CS_
@@ -378,7 +378,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:612
+  // be\be_visitor_arg_traits.cpp:662
 
 #if !defined (_CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_CS_)
 #define _CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_CS_
@@ -414,7 +414,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:574
+  // be\be_visitor_arg_traits.cpp:624
 
 #if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_CS_)
 #define _CORBA_OPERATIONMODE__ARG_TRAITS_CS_
@@ -431,7 +431,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_)
 #define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_
@@ -450,7 +450,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_CS_)
 #define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_CS_
@@ -486,7 +486,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:612
+  // be\be_visitor_arg_traits.cpp:662
 
 #if !defined (_CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_CS_)
 #define _CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_CS_
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.h b/TAO/tao/IFR_Client/IFR_BasicC.h
index dc162fad223..6505769b601 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.h
+++ b/TAO/tao/IFR_Client/IFR_BasicC.h
@@ -53,8 +53,7 @@
 #include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
 
-#include "tao/ParameterModeC.h"
-#include "IFR_BaseC.h"
+#include "tao/IFR_Client/IFR_BaseC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/IFR_Client/IFR_Components.pidl b/TAO/tao/IFR_Client/IFR_Components.pidl
index 773abb04284..57e4b4862dc 100644
--- a/TAO/tao/IFR_Client/IFR_Components.pidl
+++ b/TAO/tao/IFR_Client/IFR_Components.pidl
@@ -37,7 +37,7 @@
 //          -Wb,post_include="ace/post.h" \
 //          IFR_Components.pidl
 //
-//   The only modification necessary to the skelton files is to
+//   The only modification necessary to the skeleton files is to
 //   change
 //
 //   #include "IFR_ComponentsC.h"
@@ -54,7 +54,7 @@
 #ifndef _IFR_COMPONENTS_IDL_
 #define _IFR_COMPONENTS_IDL_
 
-#include "IFR_Extended.pidl"
+#include "tao/IFR_Client/IFR_Extended.pidl"
 
 module CORBA
 {
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
index 4a5d12bf681..8bc22b180bc 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
@@ -50,7 +50,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -74,7 +74,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_)
 #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_
@@ -110,7 +110,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_)
 #define _CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_
@@ -129,7 +129,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_)
 #define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_
@@ -148,7 +148,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_)
 #define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_
@@ -167,7 +167,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_)
 #define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.h b/TAO/tao/IFR_Client/IFR_ComponentsC.h
index 41e3b2718fc..2b6b48869f6 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.h
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.h
@@ -51,7 +51,8 @@
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
-#include "IFR_ExtendedC.h"
+
+#include "tao/IFR_Client/IFR_ExtendedC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/IFR_Client/IFR_Extended.pidl b/TAO/tao/IFR_Client/IFR_Extended.pidl
index 04ac0bd0259..ccd177c8ac3 100644
--- a/TAO/tao/IFR_Client/IFR_Extended.pidl
+++ b/TAO/tao/IFR_Client/IFR_Extended.pidl
@@ -35,7 +35,7 @@
 //     tao_idl -o ../../orbsvcs/orbsvcs/IFRService -Ge 1 \
 //          -Wb,pre_include="ace/pre.h" \
 //          -Wb,post_include="ace/post.h" \
-//          IFR_ExtendedC.pidl
+//          IFR_Extended.pidl
 //
 //   The only modification necessary to the skelton files is to
 //   change
@@ -54,13 +54,15 @@
 #ifndef _IFR_EXTENDED_IDL_
 #define _IFR_EXTENDED_IDL_
 
-#include "IFR_Basic.pidl"
+#include "tao/IFR_Client/IFR_Basic.pidl"
+#include <Visibility.pidl>
+#include <ValueModifier.pidl>
 
 module CORBA
 {
   typeprefix CORBA "omg.org";
 
-// Already defined in corbafwd.h, included from orb.idl.
+// Already defined in other files, included above
 /*
   typedef short ValueModifier;
   const ValueModifier VM_NONE = 0;
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
index 396605173ba..9646fbd1965 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
@@ -50,7 +50,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -74,7 +74,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_)
 #define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_
@@ -110,7 +110,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:612
+  // be\be_visitor_arg_traits.cpp:662
 
 #if !defined (_CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_CS_)
 #define _CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_CS_
@@ -129,7 +129,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_)
 #define _CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_
@@ -148,7 +148,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_)
 #define _CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_
@@ -167,7 +167,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:612
+  // be\be_visitor_arg_traits.cpp:662
 
 #if !defined (_CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_CS_)
 #define _CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_CS_
@@ -186,7 +186,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_)
 #define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_
@@ -205,7 +205,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_)
 #define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_
@@ -224,7 +224,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:574
+  // be\be_visitor_arg_traits.cpp:624
 
 #if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_CS_)
 #define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_CS_
@@ -275,7 +275,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:574
+  // be\be_visitor_arg_traits.cpp:624
 
 #if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_CS_)
 #define _CORBA_OPERATIONMODE__ARG_TRAITS_CS_
@@ -292,7 +292,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_)
 #define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_
@@ -311,7 +311,7 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_CS_)
 #define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_CS_
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.h b/TAO/tao/IFR_Client/IFR_ExtendedC.h
index 136ead76535..381a833e7f6 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.h
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.h
@@ -51,7 +51,8 @@
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
-#include "IFR_BasicC.h"
+
+#include "tao/IFR_Client/IFR_BasicC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp
index 31b347adc48..3f7df9cbb02 100644
--- a/TAO/tao/IIOPC.cpp
+++ b/TAO/tao/IIOPC.cpp
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -167,7 +167,7 @@ CORBA::Boolean operator<< (
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -177,7 +177,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -194,7 +194,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -203,11 +203,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -218,7 +218,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_IIOP_ListenPointList_CPP_ */
diff --git a/TAO/tao/IIOP_EndpointsC.cpp b/TAO/tao/IIOP_EndpointsC.cpp
index fac99a7040b..c0531091af0 100644
--- a/TAO/tao/IIOP_EndpointsC.cpp
+++ b/TAO/tao/IIOP_EndpointsC.cpp
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -156,7 +156,7 @@ CORBA::Boolean operator<< (
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -166,7 +166,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -183,7 +183,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -192,11 +192,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -207,7 +207,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_TAO_IIOPEndpointSequence_CPP_ */
diff --git a/TAO/tao/IOP.pidl b/TAO/tao/IOP.pidl
index 51ad29939a7..02cfc23f7ef 100644
--- a/TAO/tao/IOP.pidl
+++ b/TAO/tao/IOP.pidl
@@ -6,23 +6,22 @@
  *
  * @brief Pre-compiled IDL source for the IOP module.
  *
- * This file is used to generate IOPC.{h,i,cpp}, using the following
+ * This file is used to generate IOPC.{h,inl,cpp}, using the following
  * command:
  *
  *   tao_idl.exe
  *        -o orig -St -Sp -Ge 1
  *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=TAO_Export.h
+ *        -Wb,export_include="tao/TAO_Export.h"
  *        -Wb,pre_include="ace/pre.h"
  *        -Wb,post_include="ace/post.h"
  *        IOP.pidl
  *
  * and then:
  *
- * cp orig/IOPC.{h,i,cpp} .
  * patch < diffs/IOP.diff
  *
- * The code left in IOPC.{h,i,cpp} is ready for use.
+ * The code left in IOPC.{h,inl,cpp} is ready for use.
  *
  */
 
diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp
index ee210fd4ee1..7653d00390a 100644
--- a/TAO/tao/IOPC.cpp
+++ b/TAO/tao/IOPC.cpp
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h
index f4dc3fd309b..7cf8c351b92 100644
--- a/TAO/tao/IOPC.h
+++ b/TAO/tao/IOPC.h
@@ -42,7 +42,6 @@
 
 #include "tao/TAO_Export.h"
 #include "tao/ORB.h"
-#include "tao/SystemException.h"
 #include "tao/Environment.h"
 
 #include "tao/IOP_IORC.h"
diff --git a/TAO/tao/IOPS.h b/TAO/tao/IOPS.h
index e99ae6ee24a..b6f62b6e326 100644
--- a/TAO/tao/IOPS.h
+++ b/TAO/tao/IOPS.h
@@ -15,26 +15,32 @@
 //       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
+// be\be_codegen.cpp:390
 
-#ifndef _TAO_IDL_IOPS_H_
-#define _TAO_IDL_IOPS_H_
+#ifndef _TAO_IDL_ORIG_IOPS_H_
+#define _TAO_IDL_ORIG_IOPS_H_
 
+#include /**/ "ace/pre.h"
 
+#include "tao/IOP_IORS.h"
+#include "tao/IOP_CodecS.h"
 #include "IOPC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
-
 
 #if defined(_MSC_VER)
 #pragma warning(push)
@@ -46,20 +52,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:49
-
-namespace  POA_IOP
-{
-
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_module/module_sh.cpp:80
-
-}
-// end module IOP
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1044
+// be\be_codegen.cpp:997
 
 #include "IOPS_T.h"
 
@@ -71,4 +64,6 @@ namespace  POA_IOP
 #pragma option pop
 #endif /* __BORLANDC__ */
 
+#include /**/ "ace/post.h"
 #endif /* ifndef */
+
diff --git a/TAO/tao/IOP_Codec.pidl b/TAO/tao/IOP_Codec.pidl
index 54682969d7c..4e2dcdfae17 100644
--- a/TAO/tao/IOP_Codec.pidl
+++ b/TAO/tao/IOP_Codec.pidl
@@ -7,7 +7,7 @@
  *
  * @brief Pre-compiled IDL source for the IOP module.
  *
- * This file is used to generate IOPC.{h,i,cpp}, using the following
+ * This file is used to generate IOPC.{h,inl,cpp}, using the following
  * command:
  *
  *   tao_idl.exe
@@ -18,17 +18,13 @@
  *        -Wb,post_include="ace/post.h"
  *        IOP_Codec.pidl
  *
- * and then apply the patches in  diffs/IOP_Codec.diff.
- *
- * Move the typecodes for exceptions in IOP_CodecA.cpp to
- * IOP_CodecC.cpp.  The code left in IOP_CodecC.{h,i,cpp} and
- * IOP_CodecA.cpp is ready to use.
  */
 
 #ifndef TAO_IOP_CODEC_PIDL
 #define TAO_IOP_CODEC_PIDL
 
-#include <orb.idl>
+#include <Typecode_types.pidl>
+#include <OctetSeq.pidl>
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/IOP_CodecA.cpp b/TAO/tao/IOP_CodecA.cpp
index d275de01d63..a5b9914a5df 100644
--- a/TAO/tao/IOP_CodecA.cpp
+++ b/TAO/tao/IOP_CodecA.cpp
@@ -27,33 +27,64 @@
 
 #include "IOP_CodecC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
+static const CORBA::Long _oc_IOP_Codec[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  26,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x633a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/Codec:1.0
+    6,
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x63000000),  // name = Codec
+  };
 
+static CORBA::TypeCode _tc_TAO_tc_IOP_Codec (
+    CORBA::tk_objref,
+    sizeof (_oc_IOP_Codec),
+    (char *) &_oc_IOP_Codec,
+    0,
+    0
+  );
 
+namespace IOP
+{
+  ::CORBA::TypeCode_ptr _tc_Codec =
+    &_tc_TAO_tc_IOP_Codec;
+}
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_IOP_EncodingFormat[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x456e636f),
-  ACE_NTOHL (0x64696e67),
-  ACE_NTOHL (0x466f726d),
-  ACE_NTOHL (0x61743a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x456e636f), 
+  ACE_NTOHL (0x64696e67), 
+  ACE_NTOHL (0x466f726d), 
+  ACE_NTOHL (0x61743a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0
     15,
-  ACE_NTOHL (0x456e636f),
-  ACE_NTOHL (0x64696e67),
-  ACE_NTOHL (0x466f726d),
+  ACE_NTOHL (0x456e636f), 
+  ACE_NTOHL (0x64696e67), 
+  ACE_NTOHL (0x466f726d), 
   ACE_NTOHL (0x61740000),  // name = EncodingFormat
     CORBA::tk_short,
 
@@ -64,7 +95,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_EncodingFormat (
     sizeof (_oc_IOP_EncodingFormat),
     (char *) &_oc_IOP_EncodingFormat,
     0,
-    sizeof (IOP::EncodingFormat)
+    0
   );
 
 namespace IOP
@@ -74,60 +105,60 @@ namespace IOP
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_IOP_Encoding[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   29,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x456e636f),
-  ACE_NTOHL (0x64696e67),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x456e636f), 
+  ACE_NTOHL (0x64696e67), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Encoding:1.0
     9,
-  ACE_NTOHL (0x456e636f),
-  ACE_NTOHL (0x64696e67),
+  ACE_NTOHL (0x456e636f), 
+  ACE_NTOHL (0x64696e67), 
   ACE_NTOHL (0x0),  // name = Encoding
   3, // member count
     7,
-  ACE_NTOHL (0x666f726d),
+  ACE_NTOHL (0x666f726d), 
   ACE_NTOHL (0x61740000),  // name = format
     CORBA::tk_alias, // typecode kind for typedefs
   68, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     35,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x494f502f),
-    ACE_NTOHL (0x456e636f),
-    ACE_NTOHL (0x64696e67),
-    ACE_NTOHL (0x466f726d),
-    ACE_NTOHL (0x61743a31),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x494f502f), 
+    ACE_NTOHL (0x456e636f), 
+    ACE_NTOHL (0x64696e67), 
+    ACE_NTOHL (0x466f726d), 
+    ACE_NTOHL (0x61743a31), 
     ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/EncodingFormat:1.0
         15,
-    ACE_NTOHL (0x456e636f),
-    ACE_NTOHL (0x64696e67),
-    ACE_NTOHL (0x466f726d),
+    ACE_NTOHL (0x456e636f), 
+    ACE_NTOHL (0x64696e67), 
+    ACE_NTOHL (0x466f726d), 
     ACE_NTOHL (0x61740000),  // name = EncodingFormat
         CORBA::tk_short,
 
 
   14,
-  ACE_NTOHL (0x6d616a6f),
-  ACE_NTOHL (0x725f7665),
-  ACE_NTOHL (0x7273696f),
+  ACE_NTOHL (0x6d616a6f), 
+  ACE_NTOHL (0x725f7665), 
+  ACE_NTOHL (0x7273696f), 
   ACE_NTOHL (0x6e000000),  // name = major_version
     CORBA::tk_octet,
 
   14,
-  ACE_NTOHL (0x6d696e6f),
-  ACE_NTOHL (0x725f7665),
-  ACE_NTOHL (0x7273696f),
+  ACE_NTOHL (0x6d696e6f), 
+  ACE_NTOHL (0x725f7665), 
+  ACE_NTOHL (0x7273696f), 
   ACE_NTOHL (0x6e000000),  // name = minor_version
     CORBA::tk_octet,
 
@@ -138,7 +169,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_Encoding (
     sizeof (_oc_IOP_Encoding),
     (char *) &_oc_IOP_Encoding,
     0,
-    sizeof (IOP::Encoding)
+    0
   );
 
 namespace IOP
@@ -148,25 +179,25 @@ namespace IOP
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_IOP_CodecFactory[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x436f6465),
-  ACE_NTOHL (0x63466163),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x63466163), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/CodecFactory:1.0
     13,
-  ACE_NTOHL (0x436f6465),
-  ACE_NTOHL (0x63466163),
-  ACE_NTOHL (0x746f7279),
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x63466163), 
+  ACE_NTOHL (0x746f7279), 
   ACE_NTOHL (0x0),  // name = CodecFactory
   };
 
@@ -175,7 +206,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_CodecFactory (
     sizeof (_oc_IOP_CodecFactory),
     (char *) &_oc_IOP_CodecFactory,
     0,
-    sizeof (IOP::CodecFactory)
+    0
   );
 
 namespace IOP
@@ -201,14 +232,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<IOP::Codec>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<IOP::Codec>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -253,21 +284,21 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -304,8 +335,8 @@ CORBA::Boolean operator>>= (
     IOP::Codec::InvalidTypeForEncoding *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const IOP::Codec::InvalidTypeForEncoding *&,
+  return _tao_any >>= const_cast<
+      const IOP::Codec::InvalidTypeForEncoding *&> (
       _tao_elem
     );
 }
@@ -325,21 +356,21 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -376,8 +407,8 @@ CORBA::Boolean operator>>= (
     IOP::Codec::FormatMismatch *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const IOP::Codec::FormatMismatch *&,
+  return _tao_any >>= const_cast<
+      const IOP::Codec::FormatMismatch *&> (
       _tao_elem
     );
 }
@@ -397,21 +428,21 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -448,8 +479,8 @@ CORBA::Boolean operator>>= (
     IOP::Codec::TypeMismatch *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const IOP::Codec::TypeMismatch *&,
+  return _tao_any >>= const_cast<
+      const IOP::Codec::TypeMismatch *&> (
       _tao_elem
     );
 }
@@ -469,7 +500,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -506,8 +537,8 @@ CORBA::Boolean operator>>= (
     IOP::Encoding *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const IOP::Encoding *&,
+  return _tao_any >>= const_cast<
+      const IOP::Encoding *&> (
       _tao_elem
     );
 }
@@ -544,14 +575,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<IOP::CodecFactory>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<IOP::CodecFactory>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -596,21 +627,21 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -647,8 +678,8 @@ CORBA::Boolean operator>>= (
     IOP::CodecFactory::UnknownEncoding *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const IOP::CodecFactory::UnknownEncoding *&,
+  return _tao_any >>= const_cast<
+      const IOP::CodecFactory::UnknownEncoding *&> (
       _tao_elem
     );
 }
@@ -667,81 +698,3 @@ CORBA::Boolean operator>>= (
         _tao_elem
       );
 }
-
-
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        IOP::Codec::InvalidTypeForEncoding
-      >;
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        IOP::Codec::FormatMismatch
-      >;
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        IOP::Codec::TypeMismatch
-      >;
-
-  template class
-    TAO::Any_Impl_T<
-        IOP::Codec
-      >;
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        IOP::Encoding
-      >;
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        IOP::CodecFactory::UnknownEncoding
-      >;
-
-  template class
-    TAO::Any_Impl_T<
-        IOP::CodecFactory
-      >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        IOP::Codec::InvalidTypeForEncoding \
-      >
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        IOP::Codec::FormatMismatch \
-      >
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        IOP::Codec::TypeMismatch \
-      >
-
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        IOP::Codec \
-      >
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        IOP::Encoding \
-      >
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        IOP::CodecFactory::UnknownEncoding \
-      >
-
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        IOP::CodecFactory \
-      >
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/IOP_CodecC.cpp b/TAO/tao/IOP_CodecC.cpp
index 3a6a8dbddaa..4c54c1d9d14 100644
--- a/TAO/tao/IOP_CodecC.cpp
+++ b/TAO/tao/IOP_CodecC.cpp
@@ -26,12 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "IOP_CodecC.h"
-#include "tao/SystemException.h"
 #include "tao/CDR.h"
+#include "tao/ORB_Core.h"
+#include "tao/Typecode.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -39,11 +40,11 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "IOP_CodecC.i"
+#include "IOP_CodecC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -88,16 +89,10 @@ TAO::Objref_Traits<IOP::Codec>::marshal (
     TAO_OutputCDR & cdr
   )
 {
-  return p->marshal (cdr);
+  return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*IOP__TAO_Codec_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
 IOP::Codec::InvalidTypeForEncoding::InvalidTypeForEncoding (void)
@@ -130,21 +125,20 @@ IOP::Codec::InvalidTypeForEncoding::operator= (const ::IOP::Codec::InvalidTypeFo
 void IOP::Codec::InvalidTypeForEncoding::_tao_any_destructor (void *_tao_void_pointer)
 {
   InvalidTypeForEncoding *_tao_tmp_pointer =
-    ACE_static_cast (InvalidTypeForEncoding*, _tao_void_pointer);
+    static_cast<InvalidTypeForEncoding *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 IOP::Codec::InvalidTypeForEncoding *
 IOP::Codec::InvalidTypeForEncoding::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (InvalidTypeForEncoding *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<InvalidTypeForEncoding *> (_tao_excp);
+}
+
+const IOP::Codec::InvalidTypeForEncoding *
+IOP::Codec::InvalidTypeForEncoding::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const InvalidTypeForEncoding *> (_tao_excp);
 }
 
 CORBA::Exception *IOP::Codec::InvalidTypeForEncoding::_alloc (void)
@@ -187,32 +181,38 @@ void IOP::Codec::InvalidTypeForEncoding::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr IOP::Codec::InvalidTypeForEncoding::_type (void) const
+{
+  return ::IOP::Codec::_tc_InvalidTypeForEncoding;
+}
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_IOP_Codec_InvalidTypeForEncoding[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   49,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x436f6465),
-  ACE_NTOHL (0x632f496e),
-  ACE_NTOHL (0x76616c69),
-  ACE_NTOHL (0x64547970),
-  ACE_NTOHL (0x65466f72),
-  ACE_NTOHL (0x456e636f),
-  ACE_NTOHL (0x64696e67),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x632f496e), 
+  ACE_NTOHL (0x76616c69), 
+  ACE_NTOHL (0x64547970), 
+  ACE_NTOHL (0x65466f72), 
+  ACE_NTOHL (0x456e636f), 
+  ACE_NTOHL (0x64696e67), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Codec/InvalidTypeForEncoding:1.0
     23,
-  ACE_NTOHL (0x496e7661),
-  ACE_NTOHL (0x6c696454),
-  ACE_NTOHL (0x79706546),
-  ACE_NTOHL (0x6f72456e),
-  ACE_NTOHL (0x636f6469),
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c696454), 
+  ACE_NTOHL (0x79706546), 
+  ACE_NTOHL (0x6f72456e), 
+  ACE_NTOHL (0x636f6469), 
   ACE_NTOHL (0x6e670000),  // name = InvalidTypeForEncoding
   0, // member count
   };
@@ -222,20 +222,13 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding (
     sizeof (_oc_IOP_Codec_InvalidTypeForEncoding),
     (char *) &_oc_IOP_Codec_InvalidTypeForEncoding,
     0,
-    sizeof (IOP::Codec::InvalidTypeForEncoding)
+    0
   );
 
 ::CORBA::TypeCode_ptr IOP::Codec::_tc_InvalidTypeForEncoding =
   &_tc_TAO_tc_IOP_Codec_InvalidTypeForEncoding;
 
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr
-IOP::Codec::InvalidTypeForEncoding::_type (void) const
-{
-  return ::IOP::Codec::_tc_InvalidTypeForEncoding;
-}
-
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
 IOP::Codec::FormatMismatch::FormatMismatch (void)
@@ -268,21 +261,20 @@ IOP::Codec::FormatMismatch::operator= (const ::IOP::Codec::FormatMismatch &_tao_
 void IOP::Codec::FormatMismatch::_tao_any_destructor (void *_tao_void_pointer)
 {
   FormatMismatch *_tao_tmp_pointer =
-    ACE_static_cast (FormatMismatch*, _tao_void_pointer);
+    static_cast<FormatMismatch *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 IOP::Codec::FormatMismatch *
 IOP::Codec::FormatMismatch::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/IOP/Codec/FormatMismatch:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (FormatMismatch *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<FormatMismatch *> (_tao_excp);
+}
+
+const IOP::Codec::FormatMismatch *
+IOP::Codec::FormatMismatch::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const FormatMismatch *> (_tao_excp);
 }
 
 CORBA::Exception *IOP::Codec::FormatMismatch::_alloc (void)
@@ -325,28 +317,34 @@ void IOP::Codec::FormatMismatch::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr IOP::Codec::FormatMismatch::_type (void) const
+{
+  return ::IOP::Codec::_tc_FormatMismatch;
+}
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_IOP_Codec_FormatMismatch[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   41,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x436f6465),
-  ACE_NTOHL (0x632f466f),
-  ACE_NTOHL (0x726d6174),
-  ACE_NTOHL (0x4d69736d),
-  ACE_NTOHL (0x61746368),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x632f466f), 
+  ACE_NTOHL (0x726d6174), 
+  ACE_NTOHL (0x4d69736d), 
+  ACE_NTOHL (0x61746368), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/Codec/FormatMismatch:1.0
     15,
-  ACE_NTOHL (0x466f726d),
-  ACE_NTOHL (0x61744d69),
-  ACE_NTOHL (0x736d6174),
+  ACE_NTOHL (0x466f726d), 
+  ACE_NTOHL (0x61744d69), 
+  ACE_NTOHL (0x736d6174), 
   ACE_NTOHL (0x63680000),  // name = FormatMismatch
   0, // member count
   };
@@ -356,93 +354,13 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_FormatMismatch (
     sizeof (_oc_IOP_Codec_FormatMismatch),
     (char *) &_oc_IOP_Codec_FormatMismatch,
     0,
-    sizeof (IOP::Codec::FormatMismatch)
+    0
   );
 
 ::CORBA::TypeCode_ptr IOP::Codec::_tc_FormatMismatch =
   &_tc_TAO_tc_IOP_Codec_FormatMismatch;
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_IOP_Codec_TypeMismatch[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x436f6465),
-  ACE_NTOHL (0x632f5479),
-  ACE_NTOHL (0x70654d69),
-  ACE_NTOHL (0x736d6174),
-  ACE_NTOHL (0x63683a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/Codec/TypeMismatch:1.0
-    13,
-  ACE_NTOHL (0x54797065),
-  ACE_NTOHL (0x4d69736d),
-  ACE_NTOHL (0x61746368),
-  ACE_NTOHL (0x0),  // name = TypeMismatch
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_TypeMismatch (
-    CORBA::tk_except,
-    sizeof (_oc_IOP_Codec_TypeMismatch),
-    (char *) &_oc_IOP_Codec_TypeMismatch,
-    0,
-    sizeof (IOP::Codec::TypeMismatch)
-  );
-
-::CORBA::TypeCode_ptr IOP::Codec::_tc_TypeMismatch =
-  &_tc_TAO_tc_IOP_Codec_TypeMismatch;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_IOP_Codec[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  26,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x436f6465),
-  ACE_NTOHL (0x633a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/Codec:1.0
-    6,
-  ACE_NTOHL (0x436f6465),
-  ACE_NTOHL (0x63000000),  // name = Codec
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_IOP_Codec (
-    CORBA::tk_objref,
-    sizeof (_oc_IOP_Codec),
-    (char *) &_oc_IOP_Codec,
-    0,
-    sizeof (IOP::Codec)
-  );
-
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr _tc_Codec =
-    &_tc_TAO_tc_IOP_Codec;
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr IOP::Codec::FormatMismatch::_type (void) const
-{
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
-  return ::IOP::Codec::_tc_FormatMismatch;
-}
-
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
 IOP::Codec::TypeMismatch::TypeMismatch (void)
@@ -475,21 +393,20 @@ IOP::Codec::TypeMismatch::operator= (const ::IOP::Codec::TypeMismatch &_tao_excp
 void IOP::Codec::TypeMismatch::_tao_any_destructor (void *_tao_void_pointer)
 {
   TypeMismatch *_tao_tmp_pointer =
-    ACE_static_cast (TypeMismatch*, _tao_void_pointer);
+    static_cast<TypeMismatch *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 IOP::Codec::TypeMismatch *
 IOP::Codec::TypeMismatch::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/IOP/Codec/TypeMismatch:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (TypeMismatch *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<TypeMismatch *> (_tao_excp);
+}
+
+const IOP::Codec::TypeMismatch *
+IOP::Codec::TypeMismatch::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const TypeMismatch *> (_tao_excp);
 }
 
 CORBA::Exception *IOP::Codec::TypeMismatch::_alloc (void)
@@ -535,25 +452,56 @@ void IOP::Codec::TypeMismatch::_tao_decode (
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr IOP::Codec::TypeMismatch::_type (void) const
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
   return ::IOP::Codec::_tc_TypeMismatch;
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_IOP_Codec_TypeMismatch[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  39,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x632f5479), 
+  ACE_NTOHL (0x70654d69), 
+  ACE_NTOHL (0x736d6174), 
+  ACE_NTOHL (0x63683a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/Codec/TypeMismatch:1.0
+    13,
+  ACE_NTOHL (0x54797065), 
+  ACE_NTOHL (0x4d69736d), 
+  ACE_NTOHL (0x61746368), 
+  ACE_NTOHL (0x0),  // name = TypeMismatch
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_IOP_Codec_TypeMismatch (
+    CORBA::tk_except,
+    sizeof (_oc_IOP_Codec_TypeMismatch),
+    (char *) &_oc_IOP_Codec_TypeMismatch,
+    0,
+    0
+  );
+
+::CORBA::TypeCode_ptr IOP::Codec::_tc_TypeMismatch =
+  &_tc_TAO_tc_IOP_Codec_TypeMismatch;
+
 IOP::Codec::Codec (void)
 {}
 
 IOP::Codec::~Codec (void)
 {}
 
-void
+void 
 IOP::Codec::_tao_any_destructor (void *_tao_void_pointer)
 {
   Codec *_tao_tmp_pointer =
-    ACE_static_cast (Codec *, _tao_void_pointer);
+    static_cast<Codec *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -567,10 +515,10 @@ IOP::Codec::_narrow (
     {
       return Codec::_nil ();
     }
-
+  
   Codec_ptr proxy =
     dynamic_cast<Codec_ptr> (_tao_objref);
-
+  
   return Codec::_duplicate (proxy);
 }
 
@@ -584,10 +532,10 @@ IOP::Codec::_unchecked_narrow (
     {
       return Codec::_nil ();
     }
-
+  
   Codec_ptr proxy =
     dynamic_cast<Codec_ptr> (_tao_objref);
-
+  
   return Codec::_duplicate (proxy);
 }
 
@@ -598,7 +546,7 @@ IOP::Codec::_duplicate (Codec_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -610,18 +558,18 @@ IOP::Codec::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/IOP/Codec:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -642,16 +590,16 @@ IOP::Codec::marshal (TAO_OutputCDR &)
   return 0;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void
+void 
 IOP::Encoding::_tao_any_destructor (
     void *_tao_void_pointer
   )
 {
   Encoding *_tao_tmp_pointer =
-    ACE_static_cast (Encoding *, _tao_void_pointer);
+    static_cast<Encoding *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -692,16 +640,10 @@ TAO::Objref_Traits<IOP::CodecFactory>::marshal (
     TAO_OutputCDR & cdr
   )
 {
-  return p->marshal (cdr);
+  return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*IOP__TAO_CodecFactory_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
 IOP::CodecFactory::UnknownEncoding::UnknownEncoding (void)
@@ -734,21 +676,20 @@ IOP::CodecFactory::UnknownEncoding::operator= (const ::IOP::CodecFactory::Unknow
 void IOP::CodecFactory::UnknownEncoding::_tao_any_destructor (void *_tao_void_pointer)
 {
   UnknownEncoding *_tao_tmp_pointer =
-    ACE_static_cast (UnknownEncoding*, _tao_void_pointer);
+    static_cast<UnknownEncoding *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 IOP::CodecFactory::UnknownEncoding *
 IOP::CodecFactory::UnknownEncoding::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (UnknownEncoding *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<UnknownEncoding *> (_tao_excp);
+}
+
+const IOP::CodecFactory::UnknownEncoding *
+IOP::CodecFactory::UnknownEncoding::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const UnknownEncoding *> (_tao_excp);
 }
 
 CORBA::Exception *IOP::CodecFactory::UnknownEncoding::_alloc (void)
@@ -791,30 +732,36 @@ void IOP::CodecFactory::UnknownEncoding::_tao_decode (
   ACE_THROW (CORBA::MARSHAL ());
 }
 
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr IOP::CodecFactory::UnknownEncoding::_type (void) const
+{
+  return ::IOP::CodecFactory::_tc_UnknownEncoding;
+}
+
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_IOP_CodecFactory_UnknownEncoding[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   49,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x436f6465),
-  ACE_NTOHL (0x63466163),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x2f556e6b),
-  ACE_NTOHL (0x6e6f776e),
-  ACE_NTOHL (0x456e636f),
-  ACE_NTOHL (0x64696e67),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x63466163), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x2f556e6b), 
+  ACE_NTOHL (0x6e6f776e), 
+  ACE_NTOHL (0x456e636f), 
+  ACE_NTOHL (0x64696e67), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/CodecFactory/UnknownEncoding:1.0
     16,
-  ACE_NTOHL (0x556e6b6e),
-  ACE_NTOHL (0x6f776e45),
-  ACE_NTOHL (0x6e636f64),
+  ACE_NTOHL (0x556e6b6e), 
+  ACE_NTOHL (0x6f776e45), 
+  ACE_NTOHL (0x6e636f64), 
   ACE_NTOHL (0x696e6700),  // name = UnknownEncoding
   0, // member count
   };
@@ -824,29 +771,23 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_CodecFactory_UnknownEncoding (
     sizeof (_oc_IOP_CodecFactory_UnknownEncoding),
     (char *) &_oc_IOP_CodecFactory_UnknownEncoding,
     0,
-    sizeof (IOP::CodecFactory::UnknownEncoding)
+    0
   );
 
 ::CORBA::TypeCode_ptr IOP::CodecFactory::_tc_UnknownEncoding =
   &_tc_TAO_tc_IOP_CodecFactory_UnknownEncoding;
 
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr IOP::CodecFactory::UnknownEncoding::_type (void) const
-{
-  return ::IOP::CodecFactory::_tc_UnknownEncoding;
-}
-
 IOP::CodecFactory::CodecFactory (void)
 {}
 
 IOP::CodecFactory::~CodecFactory (void)
 {}
 
-void
+void 
 IOP::CodecFactory::_tao_any_destructor (void *_tao_void_pointer)
 {
   CodecFactory *_tao_tmp_pointer =
-    ACE_static_cast (CodecFactory *, _tao_void_pointer);
+    static_cast<CodecFactory *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -860,10 +801,10 @@ IOP::CodecFactory::_narrow (
     {
       return CodecFactory::_nil ();
     }
-
+  
   CodecFactory_ptr proxy =
     dynamic_cast<CodecFactory_ptr> (_tao_objref);
-
+  
   return CodecFactory::_duplicate (proxy);
 }
 
@@ -877,10 +818,10 @@ IOP::CodecFactory::_unchecked_narrow (
     {
       return CodecFactory::_nil ();
     }
-
+  
   CodecFactory_ptr proxy =
     dynamic_cast<CodecFactory_ptr> (_tao_objref);
-
+  
   return CodecFactory::_duplicate (proxy);
 }
 
@@ -891,7 +832,7 @@ IOP::CodecFactory::_duplicate (CodecFactory_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -903,18 +844,18 @@ IOP::CodecFactory::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/IOP/CodecFactory:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -959,92 +900,3 @@ CORBA::Boolean operator>> (
     (strm >> CORBA::Any::to_octet (_tao_aggregate.major_version)) &&
     (strm >> CORBA::Any::to_octet (_tao_aggregate.minor_version));
 }
-
-// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-  template class
-    TAO::Objref_Traits<
-        IOP::Codec
-      >;
-
-  template class
-    TAO_Objref_Var_T<
-        IOP::Codec
-      >;
-
-  template class
-    TAO_Objref_Out_T<
-        IOP::Codec
-      >;
-
-  template class
-    TAO_Fixed_Var_T<
-        IOP::Encoding
-      >;
-
-  template class
-    TAO_Var_Base_T<
-        IOP::Encoding
-      >;
-
-  template class
-    TAO::Objref_Traits<
-        IOP::CodecFactory
-      >;
-
-  template class
-    TAO_Objref_Var_T<
-        IOP::CodecFactory
-      >;
-
-  template class
-    TAO_Objref_Out_T<
-        IOP::CodecFactory
-      >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-# pragma instantiate \
-    TAO::Objref_Traits< \
-        IOP::Codec \
-      >
-
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        IOP::Codec
-      >
-
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        IOP::Codec
-      >
-
-# pragma instantiate \
-    TAO_Fixed_Var_T< \
-        IOP::Encoding \
-      >
-
-# pragma instantiate \
-    TAO_Var_Base_T< \
-        IOP::Encoding \
-      >
-
-# pragma instantiate \
-    TAO::Objref_Traits< \
-        IOP::CodecFactory \
-      >
-
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        IOP::CodecFactory
-      >
-
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        IOP::CodecFactory
-      >
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/IOP_CodecC.h b/TAO/tao/IOP_CodecC.h
index 6b08d0a6a4b..5a2a25650ac 100644
--- a/TAO/tao/IOP_CodecC.h
+++ b/TAO/tao/IOP_CodecC.h
@@ -26,27 +26,32 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_IOP_CODECC_H_
 #define _TAO_IDL_ORIG_IOP_CODECC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Typecode.h"
 #include "tao/Any.h"
 #include "tao/Objref_VarOut_T.h"
 #include "tao/VarOut_T.h"
-#include "tao/SystemException.h"
+
+#include "tao/Typecode_typesC.h"
+#include "tao/OctetSeqC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -61,9 +66,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -71,13 +74,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
-// be\be_visitor_root/root_ch.cpp:63
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -87,22 +90,22 @@ namespace TAO
 
 namespace IOP
 {
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_IOP_CODEC__VAR_OUT_CH_)
 #define _IOP_CODEC__VAR_OUT_CH_
-
+  
   class Codec;
   typedef Codec *Codec_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Codec
       >
     Codec_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Codec
@@ -110,61 +113,63 @@ namespace IOP
     Codec_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IOP_CODEC_CH_)
 #define _IOP_CODEC_CH_
-
+  
   class TAO_Export Codec
     : public virtual CORBA::Object
   {
   public:
     typedef Codec_ptr _ptr_type;
     typedef Codec_var _var_type;
-
+    
     // The static operations.
     static Codec_ptr _duplicate (Codec_ptr obj);
-
+    
     static Codec_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Codec_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Codec_ptr _nil (void)
     {
-      return (Codec_ptr)0;
+      return static_cast<Codec_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IOP_CODEC_INVALIDTYPEFORENCODING_CH_)
 #define _IOP_CODEC_INVALIDTYPEFORENCODING_CH_
-
+    
     class TAO_Export InvalidTypeForEncoding : public CORBA::UserException
     {
     public:
-
+      
       InvalidTypeForEncoding (void);
       InvalidTypeForEncoding (const InvalidTypeForEncoding &);
       ~InvalidTypeForEncoding (void);
 
       InvalidTypeForEncoding &operator= (const InvalidTypeForEncoding &);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       static InvalidTypeForEncoding *_downcast (CORBA::Exception *);
+      static const InvalidTypeForEncoding *_downcast (CORBA::Exception const *);
+      
       static CORBA::Exception *_alloc (void);
-
+      
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -173,46 +178,48 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:125
-
+      // be\be_visitor_exception/exception_ch.cpp:127
+      
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_InvalidTypeForEncoding;
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IOP_CODEC_FORMATMISMATCH_CH_)
 #define _IOP_CODEC_FORMATMISMATCH_CH_
-
+    
     class TAO_Export FormatMismatch : public CORBA::UserException
     {
     public:
-
+      
       FormatMismatch (void);
       FormatMismatch (const FormatMismatch &);
       ~FormatMismatch (void);
 
       FormatMismatch &operator= (const FormatMismatch &);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       static FormatMismatch *_downcast (CORBA::Exception *);
+      static const FormatMismatch *_downcast (CORBA::Exception const *);
+      
       static CORBA::Exception *_alloc (void);
-
+      
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -221,46 +228,48 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:125
-
+      // be\be_visitor_exception/exception_ch.cpp:127
+      
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_FormatMismatch;
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IOP_CODEC_TYPEMISMATCH_CH_)
 #define _IOP_CODEC_TYPEMISMATCH_CH_
-
+    
     class TAO_Export TypeMismatch : public CORBA::UserException
     {
     public:
-
+      
       TypeMismatch (void);
       TypeMismatch (const TypeMismatch &);
       ~TypeMismatch (void);
 
       TypeMismatch &operator= (const TypeMismatch &);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       static TypeMismatch *_downcast (CORBA::Exception *);
+      static const TypeMismatch *_downcast (CORBA::Exception const *);
+      
       static CORBA::Exception *_alloc (void);
-
+      
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -269,170 +278,170 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:125
-
+      // be\be_visitor_exception/exception_ch.cpp:127
+      
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_TypeMismatch;
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::OctetSeq * encode (
-        const CORBA::Any & data
+        const ::CORBA::Any & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , IOP::Codec::InvalidTypeForEncoding
+        CORBA::SystemException,
+        ::IOP::Codec::InvalidTypeForEncoding
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Any * decode (
-        const CORBA::OctetSeq & data
+        const ::CORBA::OctetSeq & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , IOP::Codec::FormatMismatch
+        CORBA::SystemException,
+        ::IOP::Codec::FormatMismatch
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::OctetSeq * encode_value (
-        const CORBA::Any & data
+        const ::CORBA::Any & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , IOP::Codec::InvalidTypeForEncoding
+        CORBA::SystemException,
+        ::IOP::Codec::InvalidTypeForEncoding
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Any * decode_value (
-        const CORBA::OctetSeq & data,
-        CORBA::TypeCode_ptr tc
+        const ::CORBA::OctetSeq & data,
+        ::CORBA::TypeCode_ptr tc
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , IOP::Codec::FormatMismatch
-        , IOP::Codec::TypeMismatch
+        CORBA::SystemException,
+        ::IOP::Codec::FormatMismatch,
+        ::IOP::Codec::TypeMismatch
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     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:
     // Abstract or local interface only.
     Codec (void);
-
+    
     virtual ~Codec (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     Codec (const Codec &);
-
+    
     void operator= (const Codec &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Codec;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
-
+  // be\be_visitor_typedef/typedef_ch.cpp:379
+  
   typedef CORBA::Short EncodingFormat;
   typedef CORBA::Short_out EncodingFormat_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_EncodingFormat;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const IOP::EncodingFormat ENCODING_CDR_ENCAPS = 0;
-
+  
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-
+  
   struct Encoding;
-
+  
   typedef
     TAO_Fixed_Var_T<
         Encoding
       >
     Encoding_var;
-
+  
   typedef
     Encoding &
     Encoding_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-
+  
   struct TAO_Export Encoding
   {
     typedef Encoding_var _var_type;
-
+    
     static void _tao_any_destructor (void *);
     IOP::EncodingFormat format;
     CORBA::Octet major_version;
     CORBA::Octet minor_version;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Encoding;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_IOP_CODECFACTORY__VAR_OUT_CH_)
 #define _IOP_CODECFACTORY__VAR_OUT_CH_
-
+  
   class CodecFactory;
   typedef CodecFactory *CodecFactory_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         CodecFactory
       >
     CodecFactory_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         CodecFactory
@@ -440,61 +449,63 @@ namespace IOP
     CodecFactory_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IOP_CODECFACTORY_CH_)
 #define _IOP_CODECFACTORY_CH_
-
+  
   class TAO_Export CodecFactory
     : public virtual CORBA::Object
   {
   public:
     typedef CodecFactory_ptr _ptr_type;
     typedef CodecFactory_var _var_type;
-
+    
     // The static operations.
     static CodecFactory_ptr _duplicate (CodecFactory_ptr obj);
-
+    
     static CodecFactory_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static CodecFactory_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static CodecFactory_ptr _nil (void)
     {
-      return (CodecFactory_ptr)0;
+      return static_cast<CodecFactory_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IOP_CODECFACTORY_UNKNOWNENCODING_CH_)
 #define _IOP_CODECFACTORY_UNKNOWNENCODING_CH_
-
+    
     class TAO_Export UnknownEncoding : public CORBA::UserException
     {
     public:
-
+      
       UnknownEncoding (void);
       UnknownEncoding (const UnknownEncoding &);
       ~UnknownEncoding (void);
 
       UnknownEncoding &operator= (const UnknownEncoding &);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       static UnknownEncoding *_downcast (CORBA::Exception *);
+      static const UnknownEncoding *_downcast (CORBA::Exception const *);
+      
       static CORBA::Exception *_alloc (void);
-
+      
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -503,66 +514,66 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:125
-
+      // be\be_visitor_exception/exception_ch.cpp:127
+      
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_UnknownEncoding;
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::IOP::Codec_ptr create_codec (
-        const IOP::Encoding & enc
+        const ::IOP::Encoding & enc
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , IOP::CodecFactory::UnknownEncoding
+        CORBA::SystemException,
+        ::IOP::CodecFactory::UnknownEncoding
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     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:
     // Abstract or local interface only.
     CodecFactory (void);
-
+    
     virtual ~CodecFactory (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     CodecFactory (const CodecFactory &);
-
+    
     void operator= (const CodecFactory &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_CodecFactory;
 
 // TAO_IDL - Generated from
@@ -579,19 +590,19 @@ namespace TAO
 
 #if !defined (_IOP_CODEC__TRAITS_CH_)
 #define _IOP_CODEC__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits<IOP::Codec>
+  struct TAO_Export Objref_Traits< ::IOP::Codec>
   {
-    static IOP::Codec_ptr duplicate (
-        IOP::Codec_ptr
+    static ::IOP::Codec_ptr duplicate (
+        ::IOP::Codec_ptr
       );
     static void release (
-        IOP::Codec_ptr
+        ::IOP::Codec_ptr
       );
-    static IOP::Codec_ptr nil (void);
+    static ::IOP::Codec_ptr nil (void);
     static CORBA::Boolean marshal (
-        IOP::Codec_ptr p,
+        ::IOP::Codec_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -600,19 +611,19 @@ namespace TAO
 
 #if !defined (_IOP_CODECFACTORY__TRAITS_CH_)
 #define _IOP_CODECFACTORY__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits<IOP::CodecFactory>
+  struct TAO_Export Objref_Traits< ::IOP::CodecFactory>
   {
-    static IOP::CodecFactory_ptr duplicate (
-        IOP::CodecFactory_ptr
+    static ::IOP::CodecFactory_ptr duplicate (
+        ::IOP::CodecFactory_ptr
       );
     static void release (
-        IOP::CodecFactory_ptr
+        ::IOP::CodecFactory_ptr
       );
-    static IOP::CodecFactory_ptr nil (void);
+    static ::IOP::CodecFactory_ptr nil (void);
     static CORBA::Boolean marshal (
-        IOP::CodecFactory_ptr p,
+        ::IOP::CodecFactory_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -681,13 +692,13 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::Encoding &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::Encoding &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "IOP_CodecC.i"
+#include "IOP_CodecC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -698,3 +709,5 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IOP::Encoding &);
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/PortableServer/ImplRepoS.inl b/TAO/tao/IOP_CodecC.inl
index c944d806c1f..c944d806c1f 100644
--- a/TAO/tao/PortableServer/ImplRepoS.inl
+++ b/TAO/tao/IOP_CodecC.inl
diff --git a/TAO/tao/IOP_CodecS.h b/TAO/tao/IOP_CodecS.h
new file mode 100644
index 00000000000..9ed88507774
--- /dev/null
+++ b/TAO/tao/IOP_CodecS.h
@@ -0,0 +1,79 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:390
+
+#ifndef _TAO_IDL_ORIG_IOP_CODECS_H_
+#define _TAO_IDL_ORIG_IOP_CODECS_H_
+
+#include /**/ "ace/pre.h"
+
+#include "tao/Typecode_typesS.h"
+#include "tao/OctetSeqS.h"
+#include "IOP_CodecC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:49
+
+namespace POA_IOP
+{
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:80
+
+} // module IOP
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:997
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/IOP_IOR.pidl b/TAO/tao/IOP_IOR.pidl
index ed2d39d207b..a24cf6fde7e 100644
--- a/TAO/tao/IOP_IOR.pidl
+++ b/TAO/tao/IOP_IOR.pidl
@@ -12,7 +12,7 @@
  *   tao_idl.exe
  *        -o orig -Gp -Gd -Ge 1 -GT -GA -Sc
  *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=TAO_Export.h
+ *        -Wb,export_include=tao/TAO_Export.h
  *        -Wb,pre_include="ace/pre.h"
  *        -Wb,post_include="ace/post.h"
  *        IOP_IOR.pidl
@@ -20,19 +20,12 @@
  * and then:
  *
  * cp orig/IOP_IORC.{h,i,cpp} .
- * cp orig/IOP_IORA.{h,cpp} .
- *
- * patch < diffs/IOP_IOR.diff
- *
- * The code left in IOP_IORC.{h,i,cpp} and IOP_IORA.{h,cpp} is ready
- * for use.
- *
+ * cp orig/IOP_IORA.cpp .
  */
 
 #ifndef TAO_IOP_IOR_PIDL
 #define TAO_IOP_IOR_PIDL
 
-#include <orb.idl>
 #include <OctetSeq.pidl>
 
 #pragma prefix "omg.org"
diff --git a/TAO/tao/IOP_IORA.cpp b/TAO/tao/IOP_IORA.cpp
index 111d3c7f604..f319e909fa5 100644
--- a/TAO/tao/IOP_IORA.cpp
+++ b/TAO/tao/IOP_IORA.cpp
@@ -27,26 +27,28 @@
 
 #include "IOP_IORC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_IOP_ProfileId[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x50726f66),
-  ACE_NTOHL (0x696c6549),
-  ACE_NTOHL (0x643a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x50726f66), 
+  ACE_NTOHL (0x696c6549), 
+  ACE_NTOHL (0x643a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
     10,
-  ACE_NTOHL (0x50726f66),
-  ACE_NTOHL (0x696c6549),
+  ACE_NTOHL (0x50726f66), 
+  ACE_NTOHL (0x696c6549), 
   ACE_NTOHL (0x64000000),  // name = ProfileId
     CORBA::tk_ulong,
 
@@ -57,7 +59,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_ProfileId (
     sizeof (_oc_IOP_ProfileId),
     (char *) &_oc_IOP_ProfileId,
     0,
-    sizeof (IOP::ProfileId)
+    0
   );
 
 namespace IOP
@@ -67,25 +69,25 @@ namespace IOP
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_IOP_TaggedProfile[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x54616767),
-  ACE_NTOHL (0x65645072),
-  ACE_NTOHL (0x6f66696c),
-  ACE_NTOHL (0x653a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x54616767), 
+  ACE_NTOHL (0x65645072), 
+  ACE_NTOHL (0x6f66696c), 
+  ACE_NTOHL (0x653a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
     14,
-  ACE_NTOHL (0x54616767),
-  ACE_NTOHL (0x65645072),
-  ACE_NTOHL (0x6f66696c),
+  ACE_NTOHL (0x54616767), 
+  ACE_NTOHL (0x65645072), 
+  ACE_NTOHL (0x6f66696c), 
   ACE_NTOHL (0x65000000),  // name = TaggedProfile
   2, // member count
     4,
@@ -94,41 +96,41 @@ static const CORBA::Long _oc_IOP_TaggedProfile[] =
   60, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x494f502f),
-    ACE_NTOHL (0x50726f66),
-    ACE_NTOHL (0x696c6549),
-    ACE_NTOHL (0x643a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x494f502f), 
+    ACE_NTOHL (0x50726f66), 
+    ACE_NTOHL (0x696c6549), 
+    ACE_NTOHL (0x643a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
         10,
-    ACE_NTOHL (0x50726f66),
-    ACE_NTOHL (0x696c6549),
+    ACE_NTOHL (0x50726f66), 
+    ACE_NTOHL (0x696c6549), 
     ACE_NTOHL (0x64000000),  // name = ProfileId
         CORBA::tk_ulong,
 
 
   13,
-  ACE_NTOHL (0x70726f66),
-  ACE_NTOHL (0x696c655f),
-  ACE_NTOHL (0x64617461),
+  ACE_NTOHL (0x70726f66), 
+  ACE_NTOHL (0x696c655f), 
+  ACE_NTOHL (0x64617461), 
   ACE_NTOHL (0x0),  // name = profile_data
     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
@@ -145,7 +147,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedProfile (
     sizeof (_oc_IOP_TaggedProfile),
     (char *) &_oc_IOP_TaggedProfile,
     0,
-    sizeof (IOP::TaggedProfile)
+    0
   );
 
 namespace IOP
@@ -155,27 +157,27 @@ namespace IOP
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_IOP_TaggedProfileSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x54616767),
-  ACE_NTOHL (0x65645072),
-  ACE_NTOHL (0x6f66696c),
-  ACE_NTOHL (0x65536571),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x54616767), 
+  ACE_NTOHL (0x65645072), 
+  ACE_NTOHL (0x6f66696c), 
+  ACE_NTOHL (0x65536571), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/TaggedProfileSeq:1.0
     17,
-  ACE_NTOHL (0x54616767),
-  ACE_NTOHL (0x65645072),
-  ACE_NTOHL (0x6f66696c),
-  ACE_NTOHL (0x65536571),
+  ACE_NTOHL (0x54616767), 
+  ACE_NTOHL (0x65645072), 
+  ACE_NTOHL (0x6f66696c), 
+  ACE_NTOHL (0x65536571), 
   ACE_NTOHL (0x0),  // name = TaggedProfileSeq
     CORBA::tk_sequence, // typecode kind
   264, // encapsulation length
@@ -184,19 +186,19 @@ static const CORBA::Long _oc_IOP_TaggedProfileSeq[] =
     248, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       34,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x494f502f),
-      ACE_NTOHL (0x54616767),
-      ACE_NTOHL (0x65645072),
-      ACE_NTOHL (0x6f66696c),
-      ACE_NTOHL (0x653a312e),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x494f502f), 
+      ACE_NTOHL (0x54616767), 
+      ACE_NTOHL (0x65645072), 
+      ACE_NTOHL (0x6f66696c), 
+      ACE_NTOHL (0x653a312e), 
       ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
             14,
-      ACE_NTOHL (0x54616767),
-      ACE_NTOHL (0x65645072),
-      ACE_NTOHL (0x6f66696c),
+      ACE_NTOHL (0x54616767), 
+      ACE_NTOHL (0x65645072), 
+      ACE_NTOHL (0x6f66696c), 
       ACE_NTOHL (0x65000000),  // name = TaggedProfile
       2, // member count
             4,
@@ -205,41 +207,41 @@ static const CORBA::Long _oc_IOP_TaggedProfileSeq[] =
       60, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         30,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x494f502f),
-        ACE_NTOHL (0x50726f66),
-        ACE_NTOHL (0x696c6549),
-        ACE_NTOHL (0x643a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x494f502f), 
+        ACE_NTOHL (0x50726f66), 
+        ACE_NTOHL (0x696c6549), 
+        ACE_NTOHL (0x643a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
                 10,
-        ACE_NTOHL (0x50726f66),
-        ACE_NTOHL (0x696c6549),
+        ACE_NTOHL (0x50726f66), 
+        ACE_NTOHL (0x696c6549), 
         ACE_NTOHL (0x64000000),  // name = ProfileId
                 CORBA::tk_ulong,
 
 
       13,
-      ACE_NTOHL (0x70726f66),
-      ACE_NTOHL (0x696c655f),
-      ACE_NTOHL (0x64617461),
+      ACE_NTOHL (0x70726f66), 
+      ACE_NTOHL (0x696c655f), 
+      ACE_NTOHL (0x64617461), 
       ACE_NTOHL (0x0),  // name = profile_data
             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
@@ -259,7 +261,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedProfileSeq (
     sizeof (_oc_IOP_TaggedProfileSeq),
     (char *) &_oc_IOP_TaggedProfileSeq,
     0,
-    sizeof (IOP::TaggedProfileSeq)
+    0
   );
 
 namespace IOP
@@ -269,49 +271,49 @@ namespace IOP
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_IOP_IOR[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   24,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x494f523a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x494f523a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/IOR:1.0
     4,
   ACE_NTOHL (0x494f5200),  // name = IOR
   2, // member count
     8,
-  ACE_NTOHL (0x74797065),
+  ACE_NTOHL (0x74797065), 
   ACE_NTOHL (0x5f696400),  // name = type_id
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
   9,
-  ACE_NTOHL (0x70726f66),
-  ACE_NTOHL (0x696c6573),
+  ACE_NTOHL (0x70726f66), 
+  ACE_NTOHL (0x696c6573), 
   ACE_NTOHL (0x0),  // name = profiles
     CORBA::tk_alias, // typecode kind for typedefs
   344, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     37,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x494f502f),
-    ACE_NTOHL (0x54616767),
-    ACE_NTOHL (0x65645072),
-    ACE_NTOHL (0x6f66696c),
-    ACE_NTOHL (0x65536571),
-    ACE_NTOHL (0x3a312e30),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x494f502f), 
+    ACE_NTOHL (0x54616767), 
+    ACE_NTOHL (0x65645072), 
+    ACE_NTOHL (0x6f66696c), 
+    ACE_NTOHL (0x65536571), 
+    ACE_NTOHL (0x3a312e30), 
     ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/TaggedProfileSeq:1.0
         17,
-    ACE_NTOHL (0x54616767),
-    ACE_NTOHL (0x65645072),
-    ACE_NTOHL (0x6f66696c),
-    ACE_NTOHL (0x65536571),
+    ACE_NTOHL (0x54616767), 
+    ACE_NTOHL (0x65645072), 
+    ACE_NTOHL (0x6f66696c), 
+    ACE_NTOHL (0x65536571), 
     ACE_NTOHL (0x0),  // name = TaggedProfileSeq
         CORBA::tk_sequence, // typecode kind
     264, // encapsulation length
@@ -320,19 +322,19 @@ static const CORBA::Long _oc_IOP_IOR[] =
       248, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         34,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x494f502f),
-        ACE_NTOHL (0x54616767),
-        ACE_NTOHL (0x65645072),
-        ACE_NTOHL (0x6f66696c),
-        ACE_NTOHL (0x653a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x494f502f), 
+        ACE_NTOHL (0x54616767), 
+        ACE_NTOHL (0x65645072), 
+        ACE_NTOHL (0x6f66696c), 
+        ACE_NTOHL (0x653a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
                 14,
-        ACE_NTOHL (0x54616767),
-        ACE_NTOHL (0x65645072),
-        ACE_NTOHL (0x6f66696c),
+        ACE_NTOHL (0x54616767), 
+        ACE_NTOHL (0x65645072), 
+        ACE_NTOHL (0x6f66696c), 
         ACE_NTOHL (0x65000000),  // name = TaggedProfile
         2, // member count
                 4,
@@ -341,41 +343,41 @@ static const CORBA::Long _oc_IOP_IOR[] =
         60, // encapsulation length
           TAO_ENCAP_BYTE_ORDER, // byte order
           30,
-          ACE_NTOHL (0x49444c3a),
-          ACE_NTOHL (0x6f6d672e),
-          ACE_NTOHL (0x6f72672f),
-          ACE_NTOHL (0x494f502f),
-          ACE_NTOHL (0x50726f66),
-          ACE_NTOHL (0x696c6549),
-          ACE_NTOHL (0x643a312e),
+          ACE_NTOHL (0x49444c3a), 
+          ACE_NTOHL (0x6f6d672e), 
+          ACE_NTOHL (0x6f72672f), 
+          ACE_NTOHL (0x494f502f), 
+          ACE_NTOHL (0x50726f66), 
+          ACE_NTOHL (0x696c6549), 
+          ACE_NTOHL (0x643a312e), 
           ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
                     10,
-          ACE_NTOHL (0x50726f66),
-          ACE_NTOHL (0x696c6549),
+          ACE_NTOHL (0x50726f66), 
+          ACE_NTOHL (0x696c6549), 
           ACE_NTOHL (0x64000000),  // name = ProfileId
                     CORBA::tk_ulong,
 
 
         13,
-        ACE_NTOHL (0x70726f66),
-        ACE_NTOHL (0x696c655f),
-        ACE_NTOHL (0x64617461),
+        ACE_NTOHL (0x70726f66), 
+        ACE_NTOHL (0x696c655f), 
+        ACE_NTOHL (0x64617461), 
         ACE_NTOHL (0x0),  // name = profile_data
                 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
@@ -396,7 +398,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_IOR (
     sizeof (_oc_IOP_IOR),
     (char *) &_oc_IOP_IOR,
     0,
-    sizeof (IOP::IOR)
+    0
   );
 
 namespace IOP
@@ -406,23 +408,23 @@ namespace IOP
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_IOP_ComponentId[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   32,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x436f6d70),
-  ACE_NTOHL (0x6f6e656e),
-  ACE_NTOHL (0x7449643a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x436f6d70), 
+  ACE_NTOHL (0x6f6e656e), 
+  ACE_NTOHL (0x7449643a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
     12,
-  ACE_NTOHL (0x436f6d70),
-  ACE_NTOHL (0x6f6e656e),
+  ACE_NTOHL (0x436f6d70), 
+  ACE_NTOHL (0x6f6e656e), 
   ACE_NTOHL (0x74496400),  // name = ComponentId
     CORBA::tk_ulong,
 
@@ -433,7 +435,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_ComponentId (
     sizeof (_oc_IOP_ComponentId),
     (char *) &_oc_IOP_ComponentId,
     0,
-    sizeof (IOP::ComponentId)
+    0
   );
 
 namespace IOP
@@ -443,25 +445,25 @@ namespace IOP
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_IOP_TaggedComponent[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x54616767),
-  ACE_NTOHL (0x6564436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e743a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x54616767), 
+  ACE_NTOHL (0x6564436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e743a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
     16,
-  ACE_NTOHL (0x54616767),
-  ACE_NTOHL (0x6564436f),
-  ACE_NTOHL (0x6d706f6e),
+  ACE_NTOHL (0x54616767), 
+  ACE_NTOHL (0x6564436f), 
+  ACE_NTOHL (0x6d706f6e), 
   ACE_NTOHL (0x656e7400),  // name = TaggedComponent
   2, // member count
     4,
@@ -470,41 +472,41 @@ static const CORBA::Long _oc_IOP_TaggedComponent[] =
   60, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     32,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x494f502f),
-    ACE_NTOHL (0x436f6d70),
-    ACE_NTOHL (0x6f6e656e),
-    ACE_NTOHL (0x7449643a),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x494f502f), 
+    ACE_NTOHL (0x436f6d70), 
+    ACE_NTOHL (0x6f6e656e), 
+    ACE_NTOHL (0x7449643a), 
     ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
         12,
-    ACE_NTOHL (0x436f6d70),
-    ACE_NTOHL (0x6f6e656e),
+    ACE_NTOHL (0x436f6d70), 
+    ACE_NTOHL (0x6f6e656e), 
     ACE_NTOHL (0x74496400),  // name = ComponentId
         CORBA::tk_ulong,
 
 
   15,
-  ACE_NTOHL (0x636f6d70),
-  ACE_NTOHL (0x6f6e656e),
-  ACE_NTOHL (0x745f6461),
+  ACE_NTOHL (0x636f6d70), 
+  ACE_NTOHL (0x6f6e656e), 
+  ACE_NTOHL (0x745f6461), 
   ACE_NTOHL (0x74610000),  // name = component_data
     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
@@ -521,7 +523,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponent (
     sizeof (_oc_IOP_TaggedComponent),
     (char *) &_oc_IOP_TaggedComponent,
     0,
-    sizeof (IOP::TaggedComponent)
+    0
   );
 
 namespace IOP
@@ -531,31 +533,31 @@ namespace IOP
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_IOP_MultipleComponentProfile[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   45,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x4d756c74),
-  ACE_NTOHL (0x69706c65),
-  ACE_NTOHL (0x436f6d70),
-  ACE_NTOHL (0x6f6e656e),
-  ACE_NTOHL (0x7450726f),
-  ACE_NTOHL (0x66696c65),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x4d756c74), 
+  ACE_NTOHL (0x69706c65), 
+  ACE_NTOHL (0x436f6d70), 
+  ACE_NTOHL (0x6f6e656e), 
+  ACE_NTOHL (0x7450726f), 
+  ACE_NTOHL (0x66696c65), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/MultipleComponentProfile:1.0
     25,
-  ACE_NTOHL (0x4d756c74),
-  ACE_NTOHL (0x69706c65),
-  ACE_NTOHL (0x436f6d70),
-  ACE_NTOHL (0x6f6e656e),
-  ACE_NTOHL (0x7450726f),
-  ACE_NTOHL (0x66696c65),
+  ACE_NTOHL (0x4d756c74), 
+  ACE_NTOHL (0x69706c65), 
+  ACE_NTOHL (0x436f6d70), 
+  ACE_NTOHL (0x6f6e656e), 
+  ACE_NTOHL (0x7450726f), 
+  ACE_NTOHL (0x66696c65), 
   ACE_NTOHL (0x0),  // name = MultipleComponentProfile
     CORBA::tk_sequence, // typecode kind
   264, // encapsulation length
@@ -564,19 +566,19 @@ static const CORBA::Long _oc_IOP_MultipleComponentProfile[] =
     248, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       36,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x494f502f),
-      ACE_NTOHL (0x54616767),
-      ACE_NTOHL (0x6564436f),
-      ACE_NTOHL (0x6d706f6e),
-      ACE_NTOHL (0x656e743a),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x494f502f), 
+      ACE_NTOHL (0x54616767), 
+      ACE_NTOHL (0x6564436f), 
+      ACE_NTOHL (0x6d706f6e), 
+      ACE_NTOHL (0x656e743a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
             16,
-      ACE_NTOHL (0x54616767),
-      ACE_NTOHL (0x6564436f),
-      ACE_NTOHL (0x6d706f6e),
+      ACE_NTOHL (0x54616767), 
+      ACE_NTOHL (0x6564436f), 
+      ACE_NTOHL (0x6d706f6e), 
       ACE_NTOHL (0x656e7400),  // name = TaggedComponent
       2, // member count
             4,
@@ -585,41 +587,41 @@ static const CORBA::Long _oc_IOP_MultipleComponentProfile[] =
       60, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         32,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x494f502f),
-        ACE_NTOHL (0x436f6d70),
-        ACE_NTOHL (0x6f6e656e),
-        ACE_NTOHL (0x7449643a),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x494f502f), 
+        ACE_NTOHL (0x436f6d70), 
+        ACE_NTOHL (0x6f6e656e), 
+        ACE_NTOHL (0x7449643a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
                 12,
-        ACE_NTOHL (0x436f6d70),
-        ACE_NTOHL (0x6f6e656e),
+        ACE_NTOHL (0x436f6d70), 
+        ACE_NTOHL (0x6f6e656e), 
         ACE_NTOHL (0x74496400),  // name = ComponentId
                 CORBA::tk_ulong,
 
 
       15,
-      ACE_NTOHL (0x636f6d70),
-      ACE_NTOHL (0x6f6e656e),
-      ACE_NTOHL (0x745f6461),
+      ACE_NTOHL (0x636f6d70), 
+      ACE_NTOHL (0x6f6e656e), 
+      ACE_NTOHL (0x745f6461), 
       ACE_NTOHL (0x74610000),  // name = component_data
             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
@@ -639,7 +641,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_MultipleComponentProfile (
     sizeof (_oc_IOP_MultipleComponentProfile),
     (char *) &_oc_IOP_MultipleComponentProfile,
     0,
-    sizeof (IOP::MultipleComponentProfile)
+    0
   );
 
 namespace IOP
@@ -649,27 +651,27 @@ namespace IOP
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_IOP_TaggedComponentList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   40,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x54616767),
-  ACE_NTOHL (0x6564436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e744c),
-  ACE_NTOHL (0x6973743a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x54616767), 
+  ACE_NTOHL (0x6564436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e744c), 
+  ACE_NTOHL (0x6973743a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponentList:1.0
     20,
-  ACE_NTOHL (0x54616767),
-  ACE_NTOHL (0x6564436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e744c),
+  ACE_NTOHL (0x54616767), 
+  ACE_NTOHL (0x6564436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e744c), 
   ACE_NTOHL (0x69737400),  // name = TaggedComponentList
     CORBA::tk_sequence, // typecode kind
   264, // encapsulation length
@@ -678,19 +680,19 @@ static const CORBA::Long _oc_IOP_TaggedComponentList[] =
     248, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       36,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x494f502f),
-      ACE_NTOHL (0x54616767),
-      ACE_NTOHL (0x6564436f),
-      ACE_NTOHL (0x6d706f6e),
-      ACE_NTOHL (0x656e743a),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x494f502f), 
+      ACE_NTOHL (0x54616767), 
+      ACE_NTOHL (0x6564436f), 
+      ACE_NTOHL (0x6d706f6e), 
+      ACE_NTOHL (0x656e743a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
             16,
-      ACE_NTOHL (0x54616767),
-      ACE_NTOHL (0x6564436f),
-      ACE_NTOHL (0x6d706f6e),
+      ACE_NTOHL (0x54616767), 
+      ACE_NTOHL (0x6564436f), 
+      ACE_NTOHL (0x6d706f6e), 
       ACE_NTOHL (0x656e7400),  // name = TaggedComponent
       2, // member count
             4,
@@ -699,41 +701,41 @@ static const CORBA::Long _oc_IOP_TaggedComponentList[] =
       60, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         32,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x494f502f),
-        ACE_NTOHL (0x436f6d70),
-        ACE_NTOHL (0x6f6e656e),
-        ACE_NTOHL (0x7449643a),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x494f502f), 
+        ACE_NTOHL (0x436f6d70), 
+        ACE_NTOHL (0x6f6e656e), 
+        ACE_NTOHL (0x7449643a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
                 12,
-        ACE_NTOHL (0x436f6d70),
-        ACE_NTOHL (0x6f6e656e),
+        ACE_NTOHL (0x436f6d70), 
+        ACE_NTOHL (0x6f6e656e), 
         ACE_NTOHL (0x74496400),  // name = ComponentId
                 CORBA::tk_ulong,
 
 
       15,
-      ACE_NTOHL (0x636f6d70),
-      ACE_NTOHL (0x6f6e656e),
-      ACE_NTOHL (0x745f6461),
+      ACE_NTOHL (0x636f6d70), 
+      ACE_NTOHL (0x6f6e656e), 
+      ACE_NTOHL (0x745f6461), 
       ACE_NTOHL (0x74610000),  // name = component_data
             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
@@ -753,7 +755,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponentList (
     sizeof (_oc_IOP_TaggedComponentList),
     (char *) &_oc_IOP_TaggedComponentList,
     0,
-    sizeof (IOP::TaggedComponentList)
+    0
   );
 
 namespace IOP
@@ -763,27 +765,27 @@ namespace IOP
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_IOP_TaggedComponentSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x54616767),
-  ACE_NTOHL (0x6564436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7453),
-  ACE_NTOHL (0x65713a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x54616767), 
+  ACE_NTOHL (0x6564436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7453), 
+  ACE_NTOHL (0x65713a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/TaggedComponentSeq:1.0
     19,
-  ACE_NTOHL (0x54616767),
-  ACE_NTOHL (0x6564436f),
-  ACE_NTOHL (0x6d706f6e),
-  ACE_NTOHL (0x656e7453),
+  ACE_NTOHL (0x54616767), 
+  ACE_NTOHL (0x6564436f), 
+  ACE_NTOHL (0x6d706f6e), 
+  ACE_NTOHL (0x656e7453), 
   ACE_NTOHL (0x65710000),  // name = TaggedComponentSeq
     CORBA::tk_sequence, // typecode kind
   264, // encapsulation length
@@ -792,19 +794,19 @@ static const CORBA::Long _oc_IOP_TaggedComponentSeq[] =
     248, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       36,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x494f502f),
-      ACE_NTOHL (0x54616767),
-      ACE_NTOHL (0x6564436f),
-      ACE_NTOHL (0x6d706f6e),
-      ACE_NTOHL (0x656e743a),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x494f502f), 
+      ACE_NTOHL (0x54616767), 
+      ACE_NTOHL (0x6564436f), 
+      ACE_NTOHL (0x6d706f6e), 
+      ACE_NTOHL (0x656e743a), 
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
             16,
-      ACE_NTOHL (0x54616767),
-      ACE_NTOHL (0x6564436f),
-      ACE_NTOHL (0x6d706f6e),
+      ACE_NTOHL (0x54616767), 
+      ACE_NTOHL (0x6564436f), 
+      ACE_NTOHL (0x6d706f6e), 
       ACE_NTOHL (0x656e7400),  // name = TaggedComponent
       2, // member count
             4,
@@ -813,41 +815,41 @@ static const CORBA::Long _oc_IOP_TaggedComponentSeq[] =
       60, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         32,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x494f502f),
-        ACE_NTOHL (0x436f6d70),
-        ACE_NTOHL (0x6f6e656e),
-        ACE_NTOHL (0x7449643a),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x494f502f), 
+        ACE_NTOHL (0x436f6d70), 
+        ACE_NTOHL (0x6f6e656e), 
+        ACE_NTOHL (0x7449643a), 
         ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
                 12,
-        ACE_NTOHL (0x436f6d70),
-        ACE_NTOHL (0x6f6e656e),
+        ACE_NTOHL (0x436f6d70), 
+        ACE_NTOHL (0x6f6e656e), 
         ACE_NTOHL (0x74496400),  // name = ComponentId
                 CORBA::tk_ulong,
 
 
       15,
-      ACE_NTOHL (0x636f6d70),
-      ACE_NTOHL (0x6f6e656e),
-      ACE_NTOHL (0x745f6461),
+      ACE_NTOHL (0x636f6d70), 
+      ACE_NTOHL (0x6f6e656e), 
+      ACE_NTOHL (0x745f6461), 
       ACE_NTOHL (0x74610000),  // name = component_data
             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
@@ -867,7 +869,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponentSeq (
     sizeof (_oc_IOP_TaggedComponentSeq),
     (char *) &_oc_IOP_TaggedComponentSeq,
     0,
-    sizeof (IOP::TaggedComponentSeq)
+    0
   );
 
 namespace IOP
@@ -877,23 +879,23 @@ namespace IOP
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_IOP_ServiceId[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   30,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x69636549),
-  ACE_NTOHL (0x643a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636549), 
+  ACE_NTOHL (0x643a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
     10,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x69636549),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636549), 
   ACE_NTOHL (0x64000000),  // name = ServiceId
     CORBA::tk_ulong,
 
@@ -904,7 +906,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceId (
     sizeof (_oc_IOP_ServiceId),
     (char *) &_oc_IOP_ServiceId,
     0,
-    sizeof (IOP::ServiceId)
+    0
   );
 
 namespace IOP
@@ -914,70 +916,70 @@ namespace IOP
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_IOP_ServiceContext[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x69636543),
-  ACE_NTOHL (0x6f6e7465),
-  ACE_NTOHL (0x78743a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636543), 
+  ACE_NTOHL (0x6f6e7465), 
+  ACE_NTOHL (0x78743a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContext:1.0
     15,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x69636543),
-  ACE_NTOHL (0x6f6e7465),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636543), 
+  ACE_NTOHL (0x6f6e7465), 
   ACE_NTOHL (0x78740000),  // name = ServiceContext
   2, // member count
     11,
-  ACE_NTOHL (0x636f6e74),
-  ACE_NTOHL (0x6578745f),
+  ACE_NTOHL (0x636f6e74), 
+  ACE_NTOHL (0x6578745f), 
   ACE_NTOHL (0x69640000),  // name = context_id
     CORBA::tk_alias, // typecode kind for typedefs
   60, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     30,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x494f502f),
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636549),
-    ACE_NTOHL (0x643a312e),
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x494f502f), 
+    ACE_NTOHL (0x53657276), 
+    ACE_NTOHL (0x69636549), 
+    ACE_NTOHL (0x643a312e), 
     ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
         10,
-    ACE_NTOHL (0x53657276),
-    ACE_NTOHL (0x69636549),
+    ACE_NTOHL (0x53657276), 
+    ACE_NTOHL (0x69636549), 
     ACE_NTOHL (0x64000000),  // name = ServiceId
         CORBA::tk_ulong,
 
 
   13,
-  ACE_NTOHL (0x636f6e74),
-  ACE_NTOHL (0x6578745f),
-  ACE_NTOHL (0x64617461),
+  ACE_NTOHL (0x636f6e74), 
+  ACE_NTOHL (0x6578745f), 
+  ACE_NTOHL (0x64617461), 
   ACE_NTOHL (0x0),  // name = context_data
     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
@@ -994,7 +996,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceContext (
     sizeof (_oc_IOP_ServiceContext),
     (char *) &_oc_IOP_ServiceContext,
     0,
-    sizeof (IOP::ServiceContext)
+    0
   );
 
 namespace IOP
@@ -1004,27 +1006,27 @@ namespace IOP
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_IOP_ServiceContextList[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x69636543),
-  ACE_NTOHL (0x6f6e7465),
-  ACE_NTOHL (0x78744c69),
-  ACE_NTOHL (0x73743a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636543), 
+  ACE_NTOHL (0x6f6e7465), 
+  ACE_NTOHL (0x78744c69), 
+  ACE_NTOHL (0x73743a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContextList:1.0
     19,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x69636543),
-  ACE_NTOHL (0x6f6e7465),
-  ACE_NTOHL (0x78744c69),
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x69636543), 
+  ACE_NTOHL (0x6f6e7465), 
+  ACE_NTOHL (0x78744c69), 
   ACE_NTOHL (0x73740000),  // name = ServiceContextList
     CORBA::tk_sequence, // typecode kind
   272, // encapsulation length
@@ -1033,64 +1035,64 @@ static const CORBA::Long _oc_IOP_ServiceContextList[] =
     256, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       35,
-      ACE_NTOHL (0x49444c3a),
-      ACE_NTOHL (0x6f6d672e),
-      ACE_NTOHL (0x6f72672f),
-      ACE_NTOHL (0x494f502f),
-      ACE_NTOHL (0x53657276),
-      ACE_NTOHL (0x69636543),
-      ACE_NTOHL (0x6f6e7465),
-      ACE_NTOHL (0x78743a31),
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x494f502f), 
+      ACE_NTOHL (0x53657276), 
+      ACE_NTOHL (0x69636543), 
+      ACE_NTOHL (0x6f6e7465), 
+      ACE_NTOHL (0x78743a31), 
       ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContext:1.0
             15,
-      ACE_NTOHL (0x53657276),
-      ACE_NTOHL (0x69636543),
-      ACE_NTOHL (0x6f6e7465),
+      ACE_NTOHL (0x53657276), 
+      ACE_NTOHL (0x69636543), 
+      ACE_NTOHL (0x6f6e7465), 
       ACE_NTOHL (0x78740000),  // name = ServiceContext
       2, // member count
             11,
-      ACE_NTOHL (0x636f6e74),
-      ACE_NTOHL (0x6578745f),
+      ACE_NTOHL (0x636f6e74), 
+      ACE_NTOHL (0x6578745f), 
       ACE_NTOHL (0x69640000),  // name = context_id
             CORBA::tk_alias, // typecode kind for typedefs
       60, // encapsulation length
         TAO_ENCAP_BYTE_ORDER, // byte order
         30,
-        ACE_NTOHL (0x49444c3a),
-        ACE_NTOHL (0x6f6d672e),
-        ACE_NTOHL (0x6f72672f),
-        ACE_NTOHL (0x494f502f),
-        ACE_NTOHL (0x53657276),
-        ACE_NTOHL (0x69636549),
-        ACE_NTOHL (0x643a312e),
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x494f502f), 
+        ACE_NTOHL (0x53657276), 
+        ACE_NTOHL (0x69636549), 
+        ACE_NTOHL (0x643a312e), 
         ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
                 10,
-        ACE_NTOHL (0x53657276),
-        ACE_NTOHL (0x69636549),
+        ACE_NTOHL (0x53657276), 
+        ACE_NTOHL (0x69636549), 
         ACE_NTOHL (0x64000000),  // name = ServiceId
                 CORBA::tk_ulong,
 
 
       13,
-      ACE_NTOHL (0x636f6e74),
-      ACE_NTOHL (0x6578745f),
-      ACE_NTOHL (0x64617461),
+      ACE_NTOHL (0x636f6e74), 
+      ACE_NTOHL (0x6578745f), 
+      ACE_NTOHL (0x64617461), 
       ACE_NTOHL (0x0),  // name = context_data
             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
@@ -1110,7 +1112,7 @@ static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceContextList (
     sizeof (_oc_IOP_ServiceContextList),
     (char *) &_oc_IOP_ServiceContextList,
     0,
-    sizeof (IOP::ServiceContextList)
+    0
   );
 
 namespace IOP
@@ -1119,7 +1121,7 @@ namespace IOP
     &_tc_TAO_tc_IOP_ServiceContextList;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -1156,8 +1158,8 @@ CORBA::Boolean operator>>= (
     IOP::TaggedProfile *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const IOP::TaggedProfile *&,
+  return _tao_any >>= const_cast<
+      const IOP::TaggedProfile *&> (
       _tao_elem
     );
 }
@@ -1177,7 +1179,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -1214,8 +1216,8 @@ CORBA::Boolean operator>>= (
     IOP::TaggedProfileSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const IOP::TaggedProfileSeq *&,
+  return _tao_any >>= const_cast<
+      const IOP::TaggedProfileSeq *&> (
       _tao_elem
     );
 }
@@ -1235,7 +1237,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -1272,8 +1274,8 @@ CORBA::Boolean operator>>= (
     IOP::IOR *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const IOP::IOR *&,
+  return _tao_any >>= const_cast<
+      const IOP::IOR *&> (
       _tao_elem
     );
 }
@@ -1293,7 +1295,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -1330,8 +1332,8 @@ CORBA::Boolean operator>>= (
     IOP::TaggedComponent *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const IOP::TaggedComponent *&,
+  return _tao_any >>= const_cast<
+      const IOP::TaggedComponent *&> (
       _tao_elem
     );
 }
@@ -1351,7 +1353,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -1388,8 +1390,8 @@ CORBA::Boolean operator>>= (
     IOP::MultipleComponentProfile *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const IOP::MultipleComponentProfile *&,
+  return _tao_any >>= const_cast<
+      const IOP::MultipleComponentProfile *&> (
       _tao_elem
     );
 }
@@ -1409,7 +1411,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -1446,8 +1448,8 @@ CORBA::Boolean operator>>= (
     IOP::TaggedComponentList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const IOP::TaggedComponentList *&,
+  return _tao_any >>= const_cast<
+      const IOP::TaggedComponentList *&> (
       _tao_elem
     );
 }
@@ -1467,7 +1469,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -1504,8 +1506,8 @@ CORBA::Boolean operator>>= (
     IOP::TaggedComponentSeq *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const IOP::TaggedComponentSeq *&,
+  return _tao_any >>= const_cast<
+      const IOP::TaggedComponentSeq *&> (
       _tao_elem
     );
 }
@@ -1525,7 +1527,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -1562,8 +1564,8 @@ CORBA::Boolean operator>>= (
     IOP::ServiceContext *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const IOP::ServiceContext *&,
+  return _tao_any >>= const_cast<
+      const IOP::ServiceContext *&> (
       _tao_elem
     );
 }
@@ -1583,7 +1585,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -1620,8 +1622,8 @@ CORBA::Boolean operator>>= (
     IOP::ServiceContextList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const IOP::ServiceContextList *&,
+  return _tao_any >>= const_cast<
+      const IOP::ServiceContextList *&> (
       _tao_elem
     );
 }
@@ -1641,8 +1643,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -1737,5 +1737,4 @@ CORBA::Boolean operator>>= (
         IOP::ServiceContextList \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/IOP_IORC.cpp b/TAO/tao/IOP_IORC.cpp
index b298f5c6d6e..43ad5c704dc 100644
--- a/TAO/tao/IOP_IORC.cpp
+++ b/TAO/tao/IOP_IORC.cpp
@@ -26,23 +26,23 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "IOP_IORC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
+#include "tao/ORB_Core.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "IOP_IORC.i"
+#include "IOP_IORC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -59,7 +59,7 @@ IOP::TaggedProfile::_tao_any_destructor (
   )
 {
   TaggedProfile *_tao_tmp_pointer =
-    ACE_static_cast (TaggedProfile *, _tao_void_pointer);
+    static_cast<TaggedProfile *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -110,7 +110,7 @@ void IOP::TaggedProfileSeq::_tao_any_destructor (
   )
 {
   TaggedProfileSeq * _tao_tmp_pointer =
-    ACE_static_cast (TaggedProfileSeq *, _tao_void_pointer);
+    static_cast<TaggedProfileSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -125,7 +125,7 @@ IOP::IOR::_tao_any_destructor (
   )
 {
   IOR *_tao_tmp_pointer =
-    ACE_static_cast (IOR *, _tao_void_pointer);
+    static_cast<IOR *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -138,7 +138,7 @@ IOP::TaggedComponent::_tao_any_destructor (
   )
 {
   TaggedComponent *_tao_tmp_pointer =
-    ACE_static_cast (TaggedComponent *, _tao_void_pointer);
+    static_cast<TaggedComponent *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -189,7 +189,7 @@ void IOP::MultipleComponentProfile::_tao_any_destructor (
   )
 {
   MultipleComponentProfile * _tao_tmp_pointer =
-    ACE_static_cast (MultipleComponentProfile *, _tao_void_pointer);
+    static_cast<MultipleComponentProfile *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -242,7 +242,7 @@ void IOP::TaggedComponentList::_tao_any_destructor (
   )
 {
   TaggedComponentList * _tao_tmp_pointer =
-    ACE_static_cast (TaggedComponentList *, _tao_void_pointer);
+    static_cast<TaggedComponentList *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -295,7 +295,7 @@ void IOP::TaggedComponentSeq::_tao_any_destructor (
   )
 {
   TaggedComponentSeq * _tao_tmp_pointer =
-    ACE_static_cast (TaggedComponentSeq *, _tao_void_pointer);
+    static_cast<TaggedComponentSeq *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -310,7 +310,7 @@ IOP::ServiceContext::_tao_any_destructor (
   )
 {
   ServiceContext *_tao_tmp_pointer =
-    ACE_static_cast (ServiceContext *, _tao_void_pointer);
+    static_cast<ServiceContext *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -361,7 +361,7 @@ void IOP::ServiceContextList::_tao_any_destructor (
   )
 {
   ServiceContextList * _tao_tmp_pointer =
-    ACE_static_cast (ServiceContextList *, _tao_void_pointer);
+    static_cast<ServiceContextList *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -401,12 +401,12 @@ CORBA::Boolean operator<< (
     const IOP::TaggedProfileSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -416,7 +416,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -433,7 +433,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -442,11 +442,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -457,7 +457,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_IOP_TaggedProfileSeq_CPP_ */
@@ -519,12 +519,12 @@ CORBA::Boolean operator<< (
     const IOP::MultipleComponentProfile &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -534,7 +534,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -551,7 +551,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -560,11 +560,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -575,7 +575,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_IOP_MultipleComponentProfile_CPP_ */
@@ -591,12 +591,12 @@ CORBA::Boolean operator<< (
     const IOP::TaggedComponentList &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -606,7 +606,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -623,7 +623,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -632,11 +632,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -647,7 +647,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_IOP_TaggedComponentList_CPP_ */
@@ -663,12 +663,12 @@ CORBA::Boolean operator<< (
     const IOP::TaggedComponentSeq &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -678,7 +678,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -695,7 +695,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -704,11 +704,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -719,7 +719,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_IOP_TaggedComponentSeq_CPP_ */
@@ -758,12 +758,12 @@ CORBA::Boolean operator<< (
     const IOP::ServiceContextList &_tao_sequence
   )
 {
-  CORBA::ULong _tao_seq_len = _tao_sequence.length ();
+  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
   
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -773,7 +773,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -790,7 +790,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -799,11 +799,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -814,13 +814,13 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_IOP_ServiceContextList_CPP_ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -1245,4 +1245,3 @@ CORBA::Boolean operator>> (
 #endif /* end #if !defined */
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
diff --git a/TAO/tao/IOP_IORC.h b/TAO/tao/IOP_IORC.h
index ba824cf06d7..2429bf42c92 100644
--- a/TAO/tao/IOP_IORC.h
+++ b/TAO/tao/IOP_IORC.h
@@ -26,26 +26,29 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_IOP_IORC_H_
 #define _TAO_IDL_ORIG_IOP_IORC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "OctetSeqC.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
 
+#include "tao/OctetSeqC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -60,9 +63,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -77,7 +78,7 @@ namespace IOP
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::ULong ProfileId;
   typedef CORBA::ULong_out ProfileId_out;
@@ -221,7 +222,7 @@ namespace IOP
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IOR;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::ULong ComponentId;
   typedef CORBA::ULong_out ComponentId_out;
@@ -476,7 +477,7 @@ namespace IOP
   const IOP::ComponentId TAG_DCE_NO_PIPES = 102U;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::ULong ServiceId;
   typedef CORBA::ULong_out ServiceId_out;
@@ -864,13 +865,13 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_IOP_ServiceContextList_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "IOP_IORC.i"
+#include "IOP_IORC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -882,3 +883,4 @@ TAO_Export CORBA::Boolean operator>> (
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/PortableServer/ServerObjectS.inl b/TAO/tao/IOP_IORC.inl
index c944d806c1f..c944d806c1f 100644
--- a/TAO/tao/PortableServer/ServerObjectS.inl
+++ b/TAO/tao/IOP_IORC.inl
diff --git a/TAO/tao/IOP_IORS.h b/TAO/tao/IOP_IORS.h
new file mode 100644
index 00000000000..930706bf98b
--- /dev/null
+++ b/TAO/tao/IOP_IORS.h
@@ -0,0 +1,79 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:390
+
+#ifndef _TAO_IDL_ORIG_IOP_IORS_H_
+#define _TAO_IDL_ORIG_IOP_IORS_H_
+
+#include /**/ "ace/pre.h"
+
+#include "tao/OctetSeqS.h"
+#include "IOP_IORC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:49
+
+namespace POA_IOP
+{
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:80
+
+} // module IOP
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:997
+
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/IORInterceptor/IORInfo.cpp b/TAO/tao/IORInterceptor/IORInfo.cpp
index bb5377f0c9a..ca0a10a1038 100644
--- a/TAO/tao/IORInterceptor/IORInfo.cpp
+++ b/TAO/tao/IORInterceptor/IORInfo.cpp
@@ -1,5 +1,5 @@
 #include "IORInfo.h"
-#include "tao/PortableServer/POA.h"
+#include "tao/PortableServer/Root_POA.h"
 
 #include "tao/PolicyC.h"
 #include "tao/IOPC.h"
@@ -15,7 +15,7 @@ ACE_RCSID (IORInterceptor,
 #endif /* __ACE_INLINE__ */
 
 
-TAO_IORInfo::TAO_IORInfo (TAO_POA *poa)
+TAO_IORInfo::TAO_IORInfo (TAO_Root_POA *poa)
   : poa_ (poa),
     components_established_ (0)
 {
@@ -33,28 +33,13 @@ TAO_IORInfo::get_effective_policy (CORBA::PolicyType type
   this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
-  TAO_POA_Policy_Set &policies =
-    this->poa_->policies ();
+  CORBA::Policy_var policy =
+    this->poa_->get_policy (type ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
-  // @@ This brain damaged implementation exists due to the fact
-  //    neither TAO_POA nor TAO_POA_Policy_Set exposes any methods
-  //    useful for retrieving a given Policy in the POA's PolicyList.
-  //    So, I use the lame interfaces for now.
-  //          -Ossama
-  const CORBA::ULong num_policies = policies.num_policies ();
-  for (CORBA::ULong i = 0; i < num_policies; ++i)
+  if (!CORBA::is_nil (policy.in ()))
     {
-      // @@ This incurs at least two locks per loop iteration due
-      //    to the reference counting found within the policy
-      //    object reference!!!
-      CORBA::Policy_var policy = policies.get_policy_by_index (i);
-
-      CORBA::PolicyType ptype =
-        policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-      if (ptype == type)
-        return policy._retn ();
+      return policy._retn ();
     }
 
   // TODO: Now check the global ORB policies.
@@ -201,7 +186,7 @@ TAO_IORInfo::check_validity (ACE_ENV_SINGLE_ARG_DECL)
       // once the POA has invoked all IORInterceptor interception
       // points.  This also prevents memory access violations from
       // occuring if the POA is destroyed before this IORInfo object.
-      ACE_THROW (CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE,
+      ACE_THROW (CORBA::OBJECT_NOT_EXIST (TAO::VMCID,
                                           CORBA::COMPLETED_NO));
     }
 }
diff --git a/TAO/tao/IORInterceptor/IORInfo.h b/TAO/tao/IORInterceptor/IORInfo.h
index 951b083ca6c..c377ff1c994 100644
--- a/TAO/tao/IORInterceptor/IORInfo.h
+++ b/TAO/tao/IORInterceptor/IORInfo.h
@@ -32,7 +32,7 @@
 
 
 /// Forward declarations.
-class TAO_POA;
+class TAO_Root_POA;
 
 
 /**
@@ -48,7 +48,7 @@ class TAO_IORInfo
 public:
 
   /// Constructor.
-  TAO_IORInfo (TAO_POA *poa);
+  TAO_IORInfo (TAO_Root_POA *poa);
 
   /**
    * @name PortableInterceptor::IORInfo Methods
@@ -144,7 +144,7 @@ private:
 private:
 
   /// Pointer to POA
-  TAO_POA *poa_;
+  TAO_Root_POA *poa_;
 
   /// True if the IORInterceptor::components_established()
   /// interception point was called.  False otherwise.
diff --git a/TAO/tao/IORInterceptor/IORInfoC.cpp b/TAO/tao/IORInterceptor/IORInfoC.cpp
index 665c3b9c729..8c9737b4c12 100644
--- a/TAO/tao/IORInterceptor/IORInfoC.cpp
+++ b/TAO/tao/IORInterceptor/IORInfoC.cpp
@@ -43,7 +43,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -171,14 +171,14 @@ PortableInterceptor::IORInfo::_is_a (
           "IDL:omg.org/PortableInterceptor/IORInfo:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
diff --git a/TAO/tao/IORInterceptor/IORInterceptor.pidl b/TAO/tao/IORInterceptor/IORInterceptor.pidl
index ece8347ace7..368b2a9fdc4 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor.pidl
+++ b/TAO/tao/IORInterceptor/IORInterceptor.pidl
@@ -20,7 +20,7 @@
  * The command used to generate code is:
  *
  *  tao_idl
- *     -o orig -Gp -Gd -Ge 1 -Sa -St -Sc -GT
+ *     -o orig -Gp -Gd -Ge 1 -Sa -Sc -St -GT
  *          -I$(TAO_ROOT)
  *          -Wb,export_macro=TAO_IORInterceptor_Export
  *          -Wb,export_include="iorinterceptor_export.h"
diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.cpp b/TAO/tao/IORInterceptor/IORInterceptorC.cpp
index 9c3811144e0..27214c5462b 100644
--- a/TAO/tao/IORInterceptor/IORInterceptorC.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptorC.cpp
@@ -42,7 +42,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -157,14 +157,14 @@ PortableInterceptor::IORInterceptor::_is_a (
           "IDL:omg.org/PortableInterceptor/IORInterceptor:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
diff --git a/TAO/tao/IORInterceptor/IORInterceptorC.h b/TAO/tao/IORInterceptor/IORInterceptorC.h
index fa945405ce6..45f679ca84a 100644
--- a/TAO/tao/IORInterceptor/IORInterceptorC.h
+++ b/TAO/tao/IORInterceptor/IORInterceptorC.h
@@ -33,10 +33,10 @@
 
 #include /**/ "ace/pre.h"
 
+
 #ifndef TAO_IORINTERCEPTOR_SAFE_INCLUDE
 #error "You should not include IORInterceptorC.h directly, use IORInterceptor.h"
 #endif /* !TAO_IORINTERCEPTOR_SAFE_INCLUDE */
-
 #include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
index ecd898772e8..833c113391a 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
@@ -4,7 +4,8 @@
 #include "IORInfo.h"
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
-#include "tao/PortableServer/POA.h"
+#include "tao/PortableServer/Root_POA.h"
+#include "tao/PortableServer/Non_Servant_Upcall.h"
 
 ACE_RCSID (IORInterceptor,
            IORInterceptor_Adapter_Impl,
@@ -83,7 +84,7 @@ TAO_IORInterceptor_Adapter_Impl::interceptor_list (void)
 
 void
 TAO_IORInterceptor_Adapter_Impl::establish_components (
-  TAO_POA* poa
+  TAO_Root_POA* poa
   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -100,7 +101,7 @@ TAO_IORInterceptor_Adapter_Impl::establish_components (
                     TAO_IORInfo (poa),
                     CORBA::NO_MEMORY (
                        CORBA::SystemException::_tao_minor_code (
-                          TAO_DEFAULT_MINOR_CODE,
+                          TAO::VMCID,
                           ENOMEM),
                        CORBA::COMPLETED_NO));
   ACE_CHECK;
@@ -109,7 +110,7 @@ TAO_IORInterceptor_Adapter_Impl::establish_components (
 
   // Release the POA during IORInterceptor calls to avoid potential
   // deadlocks.
-  TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*poa);
+  TAO::Portable_Server::Non_Servant_Upcall non_servant_upcall (*poa);
   ACE_UNUSED_ARG (non_servant_upcall);
 
   for (size_t i = 0; i < interceptor_count; ++i)
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
index b1781953411..4e74b79bbcb 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.h
@@ -26,7 +26,7 @@
 #include "tao/IORInterceptor/IORInterceptor_List.h"
 #include "tao/IORInterceptor/IORInterceptor.h"
 
-class TAO_POA;
+class TAO_Root_POA;
 
 /**
  * @class TAO_IORInterceptor_Adapter_Impl
@@ -53,7 +53,7 @@ public:
   virtual TAO_IORInterceptor_List *interceptor_list (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void establish_components (TAO_POA *poa ACE_ENV_ARG_DECL)
+  virtual void establish_components (TAO_Root_POA *poa ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Call the IORInterceptor::components_established() method on all
diff --git a/TAO/tao/IORInterceptor/diff/IORInterceptor.diff b/TAO/tao/IORInterceptor/diff/IORInterceptor.diff
index 70ecb288508..bdf00fec00e 100644
--- a/TAO/tao/IORInterceptor/diff/IORInterceptor.diff
+++ b/TAO/tao/IORInterceptor/diff/IORInterceptor.diff
@@ -1,13 +1,5 @@
---- orig/IORInterceptorC.h	2004-11-28 16:29:19.000000000 +0000
-+++ IORInterceptorC.h	2004-11-28 17:49:39.000000000 +0000
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/IORInterceptorC.h	2005-02-11 14:57:02.053824000 +0100
++++ IORInterceptorC.h	2005-02-11 14:57:02.734803200 +0100
 @@ -34,6 +34,9 @@
  #include /**/ "ace/pre.h"
  
@@ -18,18 +10,10 @@
  #include "ace/config-all.h"
  
  #if !defined (ACE_LACKS_PRAGMA_ONCE)
---- orig/IORInterceptorC.cpp	2004-11-28 16:29:19.000000000 +0000
-+++ IORInterceptorC.cpp	2004-11-28 17:47:42.000000000 +0000
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
+--- orig/IORInterceptorC.cpp	2005-02-11 14:57:02.053824000 +0100
++++ IORInterceptorC.cpp	2005-02-11 14:57:02.854976000 +0100
 @@ -29,7 +29,7 @@
- // be/be_codegen.cpp:301
+ // be\be_codegen.cpp:302
  
  
 -#include "IORInterceptorC.h"
diff --git a/TAO/tao/IORInterceptor_Adapter.h b/TAO/tao/IORInterceptor_Adapter.h
index 8ab77cbb616..bf01e0ea5c1 100644
--- a/TAO/tao/IORInterceptor_Adapter.h
+++ b/TAO/tao/IORInterceptor_Adapter.h
@@ -41,7 +41,7 @@ ACE_Array_Base<PortableInterceptor::ObjectReferenceTemplate*>
     TAO_ObjectReferenceTemplate_Array;
 
 class TAO_IORInterceptor_List;
-class TAO_POA;
+class TAO_Root_POA;
 
 /**
  * @class TAO_IORInterceptor_Adapter
@@ -79,7 +79,7 @@ public:
    * IORInterceptor::components_established() once the former is
    * completed.
    */
-  virtual void establish_components (TAO_POA *poa ACE_ENV_ARG_DECL)
+  virtual void establish_components (TAO_Root_POA *poa ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 
   /// Call the IORInterceptor::components_established() method on all
diff --git a/TAO/tao/IORManipulation/IORA.cpp b/TAO/tao/IORManipulation/IORA.cpp
index 8b1daf136d4..a67b1945f02 100644
--- a/TAO/tao/IORManipulation/IORA.cpp
+++ b/TAO/tao/IORManipulation/IORA.cpp
@@ -26,196 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "IORManip_Loader.h"
-#include "tao/CDR.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_TAO_IOP_EmptyProfileList[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x54414f5f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x456d7074),
-  ACE_NTOHL (0x7950726f),
-  ACE_NTOHL (0x66696c65),
-  ACE_NTOHL (0x4c697374),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/EmptyProfileList:1.0
-    17,
-  ACE_NTOHL (0x456d7074),
-  ACE_NTOHL (0x7950726f),
-  ACE_NTOHL (0x66696c65),
-  ACE_NTOHL (0x4c697374),
-  ACE_NTOHL (0x0),  // name = EmptyProfileList
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_EmptyProfileList (
-    CORBA::tk_except,
-    sizeof (_oc_TAO_IOP_EmptyProfileList),
-    (char *) &_oc_TAO_IOP_EmptyProfileList,
-    0,
-    sizeof (TAO_IOP::EmptyProfileList)
-  );
-
-namespace TAO_IOP
-{
-  ::CORBA::TypeCode_ptr _tc_EmptyProfileList =
-    &_tc_TAO_tc_TAO_IOP_EmptyProfileList;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_TAO_IOP_NotFound[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  25,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x54414f5f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x4e6f7446),
-  ACE_NTOHL (0x6f756e64),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/NotFound:1.0
-    9,
-  ACE_NTOHL (0x4e6f7446),
-  ACE_NTOHL (0x6f756e64),
-  ACE_NTOHL (0x0),  // name = NotFound
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_NotFound (
-    CORBA::tk_except,
-    sizeof (_oc_TAO_IOP_NotFound),
-    (char *) &_oc_TAO_IOP_NotFound,
-    0,
-    sizeof (TAO_IOP::NotFound)
-  );
-
-namespace TAO_IOP
-{
-  ::CORBA::TypeCode_ptr _tc_NotFound =
-    &_tc_TAO_tc_TAO_IOP_NotFound;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_TAO_IOP_Duplicate[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  26,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x54414f5f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x4475706c),
-  ACE_NTOHL (0x69636174),
-  ACE_NTOHL (0x653a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO_IOP/Duplicate:1.0
-    10,
-  ACE_NTOHL (0x4475706c),
-  ACE_NTOHL (0x69636174),
-  ACE_NTOHL (0x65000000),  // name = Duplicate
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_Duplicate (
-    CORBA::tk_except,
-    sizeof (_oc_TAO_IOP_Duplicate),
-    (char *) &_oc_TAO_IOP_Duplicate,
-    0,
-    sizeof (TAO_IOP::Duplicate)
-  );
-
-namespace TAO_IOP
-{
-  ::CORBA::TypeCode_ptr _tc_Duplicate =
-    &_tc_TAO_tc_TAO_IOP_Duplicate;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_TAO_IOP_Invalid_IOR[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  28,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x54414f5f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x496e7661),
-  ACE_NTOHL (0x6c69645f),
-  ACE_NTOHL (0x494f523a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:TAO_IOP/Invalid_IOR:1.0
-    12,
-  ACE_NTOHL (0x496e7661),
-  ACE_NTOHL (0x6c69645f),
-  ACE_NTOHL (0x494f5200),  // name = Invalid_IOR
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_Invalid_IOR (
-    CORBA::tk_except,
-    sizeof (_oc_TAO_IOP_Invalid_IOR),
-    (char *) &_oc_TAO_IOP_Invalid_IOR,
-    0,
-    sizeof (TAO_IOP::Invalid_IOR)
-  );
-
-namespace TAO_IOP
-{
-  ::CORBA::TypeCode_ptr _tc_Invalid_IOR =
-    &_tc_TAO_tc_TAO_IOP_Invalid_IOR;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_TAO_IOP_MultiProfileList[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x54414f5f),
-  ACE_NTOHL (0x494f502f),
-  ACE_NTOHL (0x4d756c74),
-  ACE_NTOHL (0x6950726f),
-  ACE_NTOHL (0x66696c65),
-  ACE_NTOHL (0x4c697374),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/MultiProfileList:1.0
-    17,
-  ACE_NTOHL (0x4d756c74),
-  ACE_NTOHL (0x6950726f),
-  ACE_NTOHL (0x66696c65),
-  ACE_NTOHL (0x4c697374),
-  ACE_NTOHL (0x0),  // name = MultiProfileList
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_MultiProfileList (
-    CORBA::tk_except,
-    sizeof (_oc_TAO_IOP_MultiProfileList),
-    (char *) &_oc_TAO_IOP_MultiProfileList,
-    0,
-    sizeof (TAO_IOP::MultiProfileList)
-  );
-
-namespace TAO_IOP
-{
-  ::CORBA::TypeCode_ptr _tc_MultiProfileList =
-    &_tc_TAO_tc_TAO_IOP_MultiProfileList;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Property[] =
 {
@@ -243,7 +61,7 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Property (
     sizeof (_oc_TAO_IOP_TAO_IOR_Property),
     (char *) &_oc_TAO_IOP_TAO_IOR_Property,
     0,
-    sizeof (TAO_IOP::TAO_IOR_Property)
+    0
   );
 
 namespace TAO_IOP
@@ -253,7 +71,7 @@ namespace TAO_IOP
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Manipulation_IORList[] =
 {
@@ -302,14 +120,14 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_IORList (
     sizeof (_oc_TAO_IOP_TAO_IOR_Manipulation_IORList),
     (char *) &_oc_TAO_IOP_TAO_IOR_Manipulation_IORList,
     0,
-    sizeof (TAO_IOP::TAO_IOR_Manipulation::IORList)
+    0
   );
 
 ::CORBA::TypeCode_ptr TAO_IOP::TAO_IOR_Manipulation::_tc_IORList =
   &_tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation_IORList;
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_TAO_IOP_TAO_IOR_Manipulation[] =
 {
@@ -339,7 +157,7 @@ static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_TAO_IOR_Manipulation (
     sizeof (_oc_TAO_IOP_TAO_IOR_Manipulation),
     (char *) &_oc_TAO_IOP_TAO_IOR_Manipulation,
     0,
-    sizeof (TAO_IOP::TAO_IOR_Manipulation)
+    0
   );
 
 namespace TAO_IOP
@@ -359,9 +177,9 @@ TAO::Any_Dual_Impl_T<TAO_IOP::EmptyProfileList>::demarshal_value (
 {
   CORBA::String_var id;
 
-  if ((cdr >> id.out ()) == 0)
+  if (!(cdr >> id.out ()))
     {
-      return 0;
+      return false;
     }
 
   ACE_TRY_NEW_ENV
@@ -371,11 +189,11 @@ TAO::Any_Dual_Impl_T<TAO_IOP::EmptyProfileList>::demarshal_value (
     }
   ACE_CATCHANY
     {
-      return 0;
+      return false;
     }
   ACE_ENDTRY;
 
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -412,8 +230,8 @@ CORBA::Boolean operator>>= (
     TAO_IOP::EmptyProfileList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const TAO_IOP::EmptyProfileList *&,
+  return _tao_any >>= const_cast<
+      const TAO_IOP::EmptyProfileList *&> (
       _tao_elem
     );
 }
@@ -444,9 +262,9 @@ TAO::Any_Dual_Impl_T<TAO_IOP::NotFound>::demarshal_value (
 {
   CORBA::String_var id;
 
-  if ((cdr >> id.out ()) == 0)
+  if (!(cdr >> id.out ()))
     {
-      return 0;
+      return false;
     }
 
   ACE_TRY_NEW_ENV
@@ -456,11 +274,11 @@ TAO::Any_Dual_Impl_T<TAO_IOP::NotFound>::demarshal_value (
     }
   ACE_CATCHANY
     {
-      return 0;
+      return false;
     }
   ACE_ENDTRY;
 
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -497,8 +315,8 @@ CORBA::Boolean operator>>= (
     TAO_IOP::NotFound *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const TAO_IOP::NotFound *&,
+  return _tao_any >>= const_cast<
+      const TAO_IOP::NotFound *&> (
       _tao_elem
     );
 }
@@ -529,9 +347,9 @@ TAO::Any_Dual_Impl_T<TAO_IOP::Duplicate>::demarshal_value (
 {
   CORBA::String_var id;
 
-  if ((cdr >> id.out ()) == 0)
+  if (!(cdr >> id.out ()))
     {
-      return 0;
+      return false;
     }
 
   ACE_TRY_NEW_ENV
@@ -541,11 +359,11 @@ TAO::Any_Dual_Impl_T<TAO_IOP::Duplicate>::demarshal_value (
     }
   ACE_CATCHANY
     {
-      return 0;
+      return false;
     }
   ACE_ENDTRY;
 
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -582,8 +400,8 @@ CORBA::Boolean operator>>= (
     TAO_IOP::Duplicate *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const TAO_IOP::Duplicate *&,
+  return _tao_any >>= const_cast<
+      const TAO_IOP::Duplicate *&> (
       _tao_elem
     );
 }
@@ -614,9 +432,9 @@ TAO::Any_Dual_Impl_T<TAO_IOP::Invalid_IOR>::demarshal_value (
 {
   CORBA::String_var id;
 
-  if ((cdr >> id.out ()) == 0)
+  if (!(cdr >> id.out ()))
     {
-      return 0;
+      return false;
     }
 
   ACE_TRY_NEW_ENV
@@ -626,11 +444,11 @@ TAO::Any_Dual_Impl_T<TAO_IOP::Invalid_IOR>::demarshal_value (
     }
   ACE_CATCHANY
     {
-      return 0;
+      return false;
     }
   ACE_ENDTRY;
 
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -667,8 +485,8 @@ CORBA::Boolean operator>>= (
     TAO_IOP::Invalid_IOR *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const TAO_IOP::Invalid_IOR *&,
+  return _tao_any >>= const_cast<
+      const TAO_IOP::Invalid_IOR *&> (
       _tao_elem
     );
 }
@@ -688,7 +506,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
@@ -698,12 +516,12 @@ TAO::Any_Dual_Impl_T<TAO_IOP::MultiProfileList>::demarshal_value (
   )
 {
   CORBA::String_var id;
-
-  if ((cdr >> id.out ()) == 0)
+  
+  if (!(cdr >> id.out ()))
     {
-      return 0;
+      return false;
     }
-
+  
   ACE_TRY_NEW_ENV
     {
       this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -711,11 +529,11 @@ TAO::Any_Dual_Impl_T<TAO_IOP::MultiProfileList>::demarshal_value (
     }
   ACE_CATCHANY
     {
-      return 0;
+      return false;
     }
   ACE_ENDTRY;
-
-  return 1;
+  
+  return true;
 }
 
 // Copying insertion.
@@ -752,8 +570,8 @@ CORBA::Boolean operator>>= (
     TAO_IOP::MultiProfileList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const TAO_IOP::MultiProfileList *&,
+  return _tao_any >>= const_cast<
+      const TAO_IOP::MultiProfileList *&> (
       _tao_elem
     );
 }
@@ -790,14 +608,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Property>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -859,14 +677,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -911,7 +729,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -920,14 +738,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<TAO_IOP::TAO_IOR_Manipulation::IORList>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<TAO_IOP::TAO_IOR_Manipulation::IORList>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
@@ -962,8 +780,8 @@ CORBA::Boolean operator>>= (
     TAO_IOP::TAO_IOR_Manipulation::IORList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const TAO_IOP::TAO_IOR_Manipulation::IORList *&,
+  return _tao_any >>= const_cast<
+      const TAO_IOP::TAO_IOR_Manipulation::IORList *&> (
       _tao_elem
     );
 }
@@ -983,8 +801,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -1069,5 +885,4 @@ CORBA::Boolean operator>>= (
         TAO_IOP::TAO_IOR_Manipulation \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/IORManipulation/IORC.cpp b/TAO/tao/IORManipulation/IORC.cpp
index d579c25af93..16e113bf9f9 100644
--- a/TAO/tao/IORManipulation/IORC.cpp
+++ b/TAO/tao/IORManipulation/IORC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "IORManip_Loader.h"
@@ -39,11 +39,11 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "IORC.i"
+#include "IORC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -84,21 +84,20 @@ TAO_IOP::EmptyProfileList::operator= (const ::TAO_IOP::EmptyProfileList &_tao_ex
 void TAO_IOP::EmptyProfileList::_tao_any_destructor (void *_tao_void_pointer)
 {
   EmptyProfileList *_tao_tmp_pointer =
-    ACE_static_cast (EmptyProfileList*, _tao_void_pointer);
+    static_cast<EmptyProfileList *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 TAO_IOP::EmptyProfileList *
 TAO_IOP::EmptyProfileList::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/EmptyProfileList:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (EmptyProfileList *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<EmptyProfileList *> (_tao_excp);
+}
+
+const TAO_IOP::EmptyProfileList *
+TAO_IOP::EmptyProfileList::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const EmptyProfileList *> (_tao_excp);
 }
 
 CORBA::Exception *TAO_IOP::EmptyProfileList::_alloc (void)
@@ -154,15 +153,49 @@ void TAO_IOP::EmptyProfileList::_tao_decode (
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr TAO_IOP::EmptyProfileList::_type (void) const
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
   return ::TAO_IOP::_tc_EmptyProfileList;
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_TAO_IOP_EmptyProfileList[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  33,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x54414f5f),
+  ACE_NTOHL (0x494f502f),
+  ACE_NTOHL (0x456d7074),
+  ACE_NTOHL (0x7950726f),
+  ACE_NTOHL (0x66696c65),
+  ACE_NTOHL (0x4c697374),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/EmptyProfileList:1.0
+    17,
+  ACE_NTOHL (0x456d7074),
+  ACE_NTOHL (0x7950726f),
+  ACE_NTOHL (0x66696c65),
+  ACE_NTOHL (0x4c697374),
+  ACE_NTOHL (0x0),  // name = EmptyProfileList
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_EmptyProfileList (
+    CORBA::tk_except,
+    sizeof (_oc_TAO_IOP_EmptyProfileList),
+    (char *) &_oc_TAO_IOP_EmptyProfileList,
+    0,
+    0
+  );
+
+namespace TAO_IOP
+{
+  ::CORBA::TypeCode_ptr _tc_EmptyProfileList =
+    &_tc_TAO_tc_TAO_IOP_EmptyProfileList;
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::NotFound::NotFound (void)
@@ -195,21 +228,20 @@ TAO_IOP::NotFound::operator= (const ::TAO_IOP::NotFound &_tao_excp)
 void TAO_IOP::NotFound::_tao_any_destructor (void *_tao_void_pointer)
 {
   NotFound *_tao_tmp_pointer =
-    ACE_static_cast (NotFound*, _tao_void_pointer);
+    static_cast<NotFound *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 TAO_IOP::NotFound *
 TAO_IOP::NotFound::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/NotFound:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (NotFound *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<NotFound *> (_tao_excp);
+}
+
+const TAO_IOP::NotFound *
+TAO_IOP::NotFound::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const NotFound *> (_tao_excp);
 }
 
 CORBA::Exception *TAO_IOP::NotFound::_alloc (void)
@@ -245,7 +277,7 @@ void TAO_IOP::NotFound::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -258,22 +290,52 @@ void TAO_IOP::NotFound::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr TAO_IOP::NotFound::_type (void) const
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
   return ::TAO_IOP::_tc_NotFound;
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_TAO_IOP_NotFound[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  25,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x4e6f7446), 
+  ACE_NTOHL (0x6f756e64), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/NotFound:1.0
+    9,
+  ACE_NTOHL (0x4e6f7446), 
+  ACE_NTOHL (0x6f756e64), 
+  ACE_NTOHL (0x0),  // name = NotFound
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_NotFound (
+    CORBA::tk_except,
+    sizeof (_oc_TAO_IOP_NotFound),
+    (char *) &_oc_TAO_IOP_NotFound,
+    0,
+    0
+  );
+
+namespace TAO_IOP
+{
+  ::CORBA::TypeCode_ptr _tc_NotFound =
+    &_tc_TAO_tc_TAO_IOP_NotFound;
+}
+
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::Duplicate::Duplicate (void)
@@ -306,21 +368,20 @@ TAO_IOP::Duplicate::operator= (const ::TAO_IOP::Duplicate &_tao_excp)
 void TAO_IOP::Duplicate::_tao_any_destructor (void *_tao_void_pointer)
 {
   Duplicate *_tao_tmp_pointer =
-    ACE_static_cast (Duplicate*, _tao_void_pointer);
+    static_cast<Duplicate *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 TAO_IOP::Duplicate *
 TAO_IOP::Duplicate::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/Duplicate:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (Duplicate *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<Duplicate *> (_tao_excp);
+}
+
+const TAO_IOP::Duplicate *
+TAO_IOP::Duplicate::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const Duplicate *> (_tao_excp);
 }
 
 CORBA::Exception *TAO_IOP::Duplicate::_alloc (void)
@@ -356,7 +417,7 @@ void TAO_IOP::Duplicate::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -369,22 +430,52 @@ void TAO_IOP::Duplicate::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr TAO_IOP::Duplicate::_type (void) const
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
   return ::TAO_IOP::_tc_Duplicate;
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_TAO_IOP_Duplicate[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  26,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x4475706c), 
+  ACE_NTOHL (0x69636174), 
+  ACE_NTOHL (0x653a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:TAO_IOP/Duplicate:1.0
+    10,
+  ACE_NTOHL (0x4475706c), 
+  ACE_NTOHL (0x69636174), 
+  ACE_NTOHL (0x65000000),  // name = Duplicate
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_Duplicate (
+    CORBA::tk_except,
+    sizeof (_oc_TAO_IOP_Duplicate),
+    (char *) &_oc_TAO_IOP_Duplicate,
+    0,
+    0
+  );
+
+namespace TAO_IOP
+{
+  ::CORBA::TypeCode_ptr _tc_Duplicate =
+    &_tc_TAO_tc_TAO_IOP_Duplicate;
+}
+
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::Invalid_IOR::Invalid_IOR (void)
@@ -417,21 +508,20 @@ TAO_IOP::Invalid_IOR::operator= (const ::TAO_IOP::Invalid_IOR &_tao_excp)
 void TAO_IOP::Invalid_IOR::_tao_any_destructor (void *_tao_void_pointer)
 {
   Invalid_IOR *_tao_tmp_pointer =
-    ACE_static_cast (Invalid_IOR*, _tao_void_pointer);
+    static_cast<Invalid_IOR *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 TAO_IOP::Invalid_IOR *
 TAO_IOP::Invalid_IOR::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/Invalid_IOR:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (Invalid_IOR *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<Invalid_IOR *> (_tao_excp);
+}
+
+const TAO_IOP::Invalid_IOR *
+TAO_IOP::Invalid_IOR::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const Invalid_IOR *> (_tao_excp);
 }
 
 CORBA::Exception *TAO_IOP::Invalid_IOR::_alloc (void)
@@ -467,7 +557,7 @@ void TAO_IOP::Invalid_IOR::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -480,22 +570,52 @@ void TAO_IOP::Invalid_IOR::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr TAO_IOP::Invalid_IOR::_type (void) const
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
   return ::TAO_IOP::_tc_Invalid_IOR;
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_TAO_IOP_Invalid_IOR[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  28,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c69645f), 
+  ACE_NTOHL (0x494f523a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:TAO_IOP/Invalid_IOR:1.0
+    12,
+  ACE_NTOHL (0x496e7661), 
+  ACE_NTOHL (0x6c69645f), 
+  ACE_NTOHL (0x494f5200),  // name = Invalid_IOR
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_Invalid_IOR (
+    CORBA::tk_except,
+    sizeof (_oc_TAO_IOP_Invalid_IOR),
+    (char *) &_oc_TAO_IOP_Invalid_IOR,
+    0,
+    0
+  );
+
+namespace TAO_IOP
+{
+  ::CORBA::TypeCode_ptr _tc_Invalid_IOR =
+    &_tc_TAO_tc_TAO_IOP_Invalid_IOR;
+}
+
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
 TAO_IOP::MultiProfileList::MultiProfileList (void)
@@ -528,21 +648,20 @@ TAO_IOP::MultiProfileList::operator= (const ::TAO_IOP::MultiProfileList &_tao_ex
 void TAO_IOP::MultiProfileList::_tao_any_destructor (void *_tao_void_pointer)
 {
   MultiProfileList *_tao_tmp_pointer =
-    ACE_static_cast (MultiProfileList*, _tao_void_pointer);
+    static_cast<MultiProfileList *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 TAO_IOP::MultiProfileList *
 TAO_IOP::MultiProfileList::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:TAO_IOP/MultiProfileList:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (MultiProfileList *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<MultiProfileList *> (_tao_excp);
+}
+
+const TAO_IOP::MultiProfileList *
+TAO_IOP::MultiProfileList::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const MultiProfileList *> (_tao_excp);
 }
 
 CORBA::Exception *TAO_IOP::MultiProfileList::_alloc (void)
@@ -578,7 +697,7 @@ void TAO_IOP::MultiProfileList::_tao_encode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -591,22 +710,56 @@ void TAO_IOP::MultiProfileList::_tao_decode (
     {
       return;
     }
-
+  
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr TAO_IOP::MultiProfileList::_type (void) const
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
   return ::TAO_IOP::_tc_MultiProfileList;
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_TAO_IOP_MultiProfileList[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  33,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x54414f5f), 
+  ACE_NTOHL (0x494f502f), 
+  ACE_NTOHL (0x4d756c74), 
+  ACE_NTOHL (0x6950726f), 
+  ACE_NTOHL (0x66696c65), 
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:TAO_IOP/MultiProfileList:1.0
+    17,
+  ACE_NTOHL (0x4d756c74), 
+  ACE_NTOHL (0x6950726f), 
+  ACE_NTOHL (0x66696c65), 
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x0),  // name = MultiProfileList
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_TAO_IOP_MultiProfileList (
+    CORBA::tk_except,
+    sizeof (_oc_TAO_IOP_MultiProfileList),
+    (char *) &_oc_TAO_IOP_MultiProfileList,
+    0,
+    0
+  );
+
+namespace TAO_IOP
+{
+  ::CORBA::TypeCode_ptr _tc_MultiProfileList =
+    &_tc_TAO_tc_TAO_IOP_MultiProfileList;
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for TAO_IOP::TAO_IOR_Property.
@@ -646,23 +799,17 @@ TAO::Objref_Traits<TAO_IOP::TAO_IOR_Property>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*TAO_IOP__TAO_TAO_IOR_Property_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 TAO_IOP::TAO_IOR_Property::TAO_IOR_Property (void)
 {}
 
 TAO_IOP::TAO_IOR_Property::~TAO_IOR_Property (void)
 {}
 
-void
+void 
 TAO_IOP::TAO_IOR_Property::_tao_any_destructor (void *_tao_void_pointer)
 {
   TAO_IOR_Property *_tao_tmp_pointer =
-    ACE_static_cast (TAO_IOR_Property *, _tao_void_pointer);
+    static_cast<TAO_IOR_Property *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -676,10 +823,10 @@ TAO_IOP::TAO_IOR_Property::_narrow (
     {
       return TAO_IOR_Property::_nil ();
     }
-
+  
   TAO_IOR_Property_ptr proxy =
     dynamic_cast<TAO_IOR_Property_ptr> (_tao_objref);
-
+  
   return TAO_IOR_Property::_duplicate (proxy);
 }
 
@@ -693,10 +840,10 @@ TAO_IOP::TAO_IOR_Property::_unchecked_narrow (
     {
       return TAO_IOR_Property::_nil ();
     }
-
+  
   TAO_IOR_Property_ptr proxy =
     dynamic_cast<TAO_IOR_Property_ptr> (_tao_objref);
-
+  
   return TAO_IOR_Property::_duplicate (proxy);
 }
 
@@ -707,7 +854,7 @@ TAO_IOP::TAO_IOR_Property::_duplicate (TAO_IOR_Property_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -719,18 +866,18 @@ TAO_IOP::TAO_IOR_Property::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:TAO_IOP/TAO_IOR_Property:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -791,13 +938,7 @@ TAO::Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*TAO_IOP__TAO_TAO_IOR_Manipulation_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CS_)
@@ -844,7 +985,7 @@ void TAO_IOP::TAO_IOR_Manipulation::IORList::_tao_any_destructor (
   )
 {
   IORList * _tao_tmp_pointer =
-    ACE_static_cast (IORList *, _tao_void_pointer);
+    static_cast<IORList *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
@@ -856,11 +997,11 @@ TAO_IOP::TAO_IOR_Manipulation::TAO_IOR_Manipulation (void)
 TAO_IOP::TAO_IOR_Manipulation::~TAO_IOR_Manipulation (void)
 {}
 
-void
+void 
 TAO_IOP::TAO_IOR_Manipulation::_tao_any_destructor (void *_tao_void_pointer)
 {
   TAO_IOR_Manipulation *_tao_tmp_pointer =
-    ACE_static_cast (TAO_IOR_Manipulation *, _tao_void_pointer);
+    static_cast<TAO_IOR_Manipulation *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -874,10 +1015,10 @@ TAO_IOP::TAO_IOR_Manipulation::_narrow (
     {
       return TAO_IOR_Manipulation::_nil ();
     }
-
+  
   TAO_IOR_Manipulation_ptr proxy =
     dynamic_cast<TAO_IOR_Manipulation_ptr> (_tao_objref);
-
+  
   return TAO_IOR_Manipulation::_duplicate (proxy);
 }
 
@@ -891,10 +1032,10 @@ TAO_IOP::TAO_IOR_Manipulation::_unchecked_narrow (
     {
       return TAO_IOR_Manipulation::_nil ();
     }
-
+  
   TAO_IOR_Manipulation_ptr proxy =
     dynamic_cast<TAO_IOR_Manipulation_ptr> (_tao_objref);
-
+  
   return TAO_IOR_Manipulation::_duplicate (proxy);
 }
 
@@ -905,7 +1046,7 @@ TAO_IOP::TAO_IOR_Manipulation::_duplicate (TAO_IOR_Manipulation_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -917,18 +1058,18 @@ TAO_IOP::TAO_IOR_Manipulation::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -957,15 +1098,8 @@ CORBA::Boolean operator<< (
     const TAO_IOP::EmptyProfileList &_tao_aggregate
   )
 {
-  // First marshal the repository ID.
-  if (strm << _tao_aggregate._rep_id ())
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+  // Marshal the repository ID.
+  return (strm << _tao_aggregate._rep_id ());
 }
 
 CORBA::Boolean operator>> (
@@ -973,7 +1107,7 @@ CORBA::Boolean operator>> (
     TAO_IOP::EmptyProfileList&
   )
 {
-  return 1;
+  return true;
 }
 
 // TAO_IDL - Generated from
@@ -984,15 +1118,8 @@ CORBA::Boolean operator<< (
     const TAO_IOP::NotFound &_tao_aggregate
   )
 {
-  // First marshal the repository ID.
-  if (strm << _tao_aggregate._rep_id ())
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+  // Marshal the repository ID.
+  return (strm << _tao_aggregate._rep_id ());
 }
 
 CORBA::Boolean operator>> (
@@ -1000,7 +1127,7 @@ CORBA::Boolean operator>> (
     TAO_IOP::NotFound&
   )
 {
-  return 1;
+  return true;
 }
 
 // TAO_IDL - Generated from
@@ -1011,15 +1138,8 @@ CORBA::Boolean operator<< (
     const TAO_IOP::Duplicate &_tao_aggregate
   )
 {
-  // First marshal the repository ID.
-  if (strm << _tao_aggregate._rep_id ())
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+  // Marshal the repository ID.
+  return (strm << _tao_aggregate._rep_id ());
 }
 
 CORBA::Boolean operator>> (
@@ -1027,7 +1147,7 @@ CORBA::Boolean operator>> (
     TAO_IOP::Duplicate&
   )
 {
-  return 1;
+  return true;
 }
 
 // TAO_IDL - Generated from
@@ -1038,15 +1158,8 @@ CORBA::Boolean operator<< (
     const TAO_IOP::Invalid_IOR &_tao_aggregate
   )
 {
-  // First marshal the repository ID.
-  if (strm << _tao_aggregate._rep_id ())
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+  // Marshal the repository ID.
+  return (strm << _tao_aggregate._rep_id ());
 }
 
 CORBA::Boolean operator>> (
@@ -1054,7 +1167,7 @@ CORBA::Boolean operator>> (
     TAO_IOP::Invalid_IOR&
   )
 {
-  return 1;
+  return true;
 }
 
 // TAO_IDL - Generated from
@@ -1065,15 +1178,8 @@ CORBA::Boolean operator<< (
     const TAO_IOP::MultiProfileList &_tao_aggregate
   )
 {
-  // First marshal the repository ID.
-  if (strm << _tao_aggregate._rep_id ())
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+  // Marshal the repository ID.
+  return (strm << _tao_aggregate._rep_id ());
 }
 
 CORBA::Boolean operator>> (
@@ -1081,11 +1187,11 @@ CORBA::Boolean operator>> (
     TAO_IOP::MultiProfileList&
   )
 {
-  return 1;
+  return true;
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -1098,7 +1204,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         TAO_IOP::TAO_IOR_Property
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         TAO_IOP::TAO_IOR_Property
@@ -1143,7 +1249,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         TAO_IOP::TAO_IOR_Manipulation
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         TAO_IOP::TAO_IOR_Manipulation
@@ -1160,7 +1266,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         TAO_IOP::TAO_IOR_Property
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         TAO_IOP::TAO_IOR_Property
@@ -1200,10 +1306,10 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         TAO_IOP::TAO_IOR_Manipulation
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         TAO_IOP::TAO_IOR_Manipulation
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/IORManipulation/IORC.h b/TAO/tao/IORManipulation/IORC.h
index 6ff36e7447c..6cb934fd772 100644
--- a/TAO/tao/IORManipulation/IORC.h
+++ b/TAO/tao/IORManipulation/IORC.h
@@ -26,24 +26,27 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_IORC_H_
 #define _TAO_IDL_ORIG_IORC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
 
-#ifndef TAO_IORMANIP_SAFE_INCLUDE
-#error "You should not include IORC.h directly, use IORManip_Loader.h"
-#endif /* !TAO_IORMANIP_SAFE_INCLUDE */
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+ #ifndef TAO_IORMANIP_SAFE_INCLUDE
+ #error "You should not include IORC.h directly, use IORManip_Loader.h"
+ #endif /* !TAO_IORMANIP_SAFE_INCLUDE */
+
 #include "ior_manip_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Sequence_T.h"
@@ -64,9 +67,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -75,7 +76,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root_ch.cpp:63
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -110,6 +111,8 @@ namespace TAO_IOP
     static void _tao_any_destructor (void *);
 
     static EmptyProfileList *_downcast (CORBA::Exception *);
+    static const EmptyProfileList *_downcast (CORBA::Exception const *);
+
     static CORBA::Exception *_alloc (void);
 
     virtual CORBA::Exception *_tao_duplicate (void) const;
@@ -127,7 +130,7 @@ namespace TAO_IOP
       );
 
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:125
+    // be\be_visitor_exception/exception_ch.cpp:127
 
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
@@ -158,6 +161,8 @@ namespace TAO_IOP
     static void _tao_any_destructor (void *);
 
     static NotFound *_downcast (CORBA::Exception *);
+    static const NotFound *_downcast (CORBA::Exception const *);
+
     static CORBA::Exception *_alloc (void);
 
     virtual CORBA::Exception *_tao_duplicate (void) const;
@@ -175,7 +180,7 @@ namespace TAO_IOP
       );
 
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:125
+    // be\be_visitor_exception/exception_ch.cpp:127
 
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
@@ -202,12 +207,14 @@ namespace TAO_IOP
     ~Duplicate (void);
 
     Duplicate &operator= (const Duplicate &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static Duplicate *_downcast (CORBA::Exception *);
+    static const Duplicate *_downcast (CORBA::Exception const *);
+    
     static CORBA::Exception *_alloc (void);
-
+    
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -216,46 +223,48 @@ namespace TAO_IOP
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:125
-
+    // be\be_visitor_exception/exception_ch.cpp:127
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Duplicate;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_INVALID_IOR_CH_)
 #define _TAO_IOP_INVALID_IOR_CH_
-
+  
   class TAO_IORManip_Export Invalid_IOR : public CORBA::UserException
   {
   public:
-
+    
     Invalid_IOR (void);
     Invalid_IOR (const Invalid_IOR &);
     ~Invalid_IOR (void);
 
     Invalid_IOR &operator= (const Invalid_IOR &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static Invalid_IOR *_downcast (CORBA::Exception *);
+    static const Invalid_IOR *_downcast (CORBA::Exception const *);
+    
     static CORBA::Exception *_alloc (void);
-
+    
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -264,46 +273,48 @@ namespace TAO_IOP
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:125
-
+    // be\be_visitor_exception/exception_ch.cpp:127
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Invalid_IOR;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_TAO_IOP_MULTIPROFILELIST_CH_)
 #define _TAO_IOP_MULTIPROFILELIST_CH_
-
+  
   class TAO_IORManip_Export MultiProfileList : public CORBA::UserException
   {
   public:
-
+    
     MultiProfileList (void);
     MultiProfileList (const MultiProfileList &);
     ~MultiProfileList (void);
 
     MultiProfileList &operator= (const MultiProfileList &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static MultiProfileList *_downcast (CORBA::Exception *);
+    static const MultiProfileList *_downcast (CORBA::Exception const *);
+    
     static CORBA::Exception *_alloc (void);
-
+    
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -312,40 +323,40 @@ namespace TAO_IOP
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:125
-
+    // be\be_visitor_exception/exception_ch.cpp:127
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultiProfileList;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY__VAR_OUT_CH_)
 #define _TAO_IOP_TAO_IOR_PROPERTY__VAR_OUT_CH_
-
+  
   class TAO_IOR_Property;
   typedef TAO_IOR_Property *TAO_IOR_Property_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         TAO_IOR_Property
       >
     TAO_IOR_Property_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         TAO_IOR_Property
@@ -353,147 +364,147 @@ namespace TAO_IOP
     TAO_IOR_Property_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY_CH_)
 #define _TAO_IOP_TAO_IOR_PROPERTY_CH_
-
+  
   class TAO_IORManip_Export TAO_IOR_Property
     : public virtual CORBA::Object
   {
   public:
     typedef TAO_IOR_Property_ptr _ptr_type;
     typedef TAO_IOR_Property_var _var_type;
-
+    
     // The static operations.
     static TAO_IOR_Property_ptr _duplicate (TAO_IOR_Property_ptr obj);
-
+    
     static TAO_IOR_Property_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TAO_IOR_Property_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TAO_IOR_Property_ptr _nil (void)
     {
-      return (TAO_IOR_Property_ptr)0;
+      return static_cast<TAO_IOR_Property_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean set_property (
-        CORBA::Object_ptr & ior
+        ::CORBA::Object_ptr & ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , TAO_IOP::Invalid_IOR
+        CORBA::SystemException,
+        ::TAO_IOP::Invalid_IOR
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean set_primary (
-        CORBA::Object_ptr & ior1,
-        CORBA::Object_ptr ior2
+        ::CORBA::Object_ptr & ior1,
+        ::CORBA::Object_ptr ior2
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , TAO_IOP::Duplicate
-        , TAO_IOP::NotFound
+        CORBA::SystemException,
+        ::TAO_IOP::Duplicate,
+        ::TAO_IOP::NotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Object_ptr get_primary (
-        CORBA::Object_ptr ior
+        ::CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , TAO_IOP::NotFound
+        CORBA::SystemException,
+        ::TAO_IOP::NotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean is_primary_set (
-        CORBA::Object_ptr ior
+        ::CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean remove_primary_tag (
-        CORBA::Object_ptr & iogr
+        ::CORBA::Object_ptr & iogr
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , TAO_IOP::NotFound
+        CORBA::SystemException,
+        ::TAO_IOP::NotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     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:
     // Abstract or local interface only.
     TAO_IOR_Property (void);
-
+    
     virtual ~TAO_IOR_Property (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     TAO_IOR_Property (const TAO_IOR_Property &);
-
+    
     void operator= (const TAO_IOR_Property &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TAO_IOR_Property;
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION__VAR_OUT_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION__VAR_OUT_CH_
-
+  
   class TAO_IOR_Manipulation;
   typedef TAO_IOR_Manipulation *TAO_IOR_Manipulation_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         TAO_IOR_Manipulation
       >
     TAO_IOR_Manipulation_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         TAO_IOR_Manipulation
@@ -501,48 +512,48 @@ namespace TAO_IOP
     TAO_IOR_Manipulation_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_CH_
-
+  
   class TAO_IORManip_Export TAO_IOR_Manipulation
     : public virtual CORBA::Object
   {
   public:
     typedef TAO_IOR_Manipulation_ptr _ptr_type;
     typedef TAO_IOR_Manipulation_var _var_type;
-
+    
     // The static operations.
     static TAO_IOR_Manipulation_ptr _duplicate (TAO_IOR_Manipulation_ptr obj);
-
+    
     static TAO_IOR_Manipulation_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TAO_IOR_Manipulation_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TAO_IOR_Manipulation_ptr _nil (void)
     {
-      return (TAO_IOR_Manipulation_ptr)0;
+      return static_cast<TAO_IOR_Manipulation_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION_IORLIST_CH_
-
+    
     class IORList;
-
+    
     typedef
       TAO_MngSeq_Var_T<
           IORList,
@@ -551,7 +562,7 @@ namespace TAO_IOP
             >
         >
       IORList_var;
-
+    
     typedef
       TAO_MngSeq_Out_T<
           IORList,
@@ -561,7 +572,7 @@ namespace TAO_IOP
             >
         >
       IORList_out;
-
+    
     class TAO_IORManip_Export IORList
       : public
           TAO_Unbounded_Pseudo_Sequence<
@@ -574,190 +585,190 @@ namespace TAO_IOP
       IORList (
           CORBA::ULong max,
           CORBA::ULong length,
-          CORBA::Object_ptr* buffer,
+          CORBA::Object_ptr* buffer, 
           CORBA::Boolean release = 0
         );
       IORList (const IORList &);
       ~IORList (void);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       typedef IORList_var _var_type;
     };
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_IORList;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Object_ptr merge_iors (
-        const TAO_IOP::TAO_IOR_Manipulation::IORList & iors
+        const ::TAO_IOP::TAO_IOR_Manipulation::IORList & iors
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , TAO_IOP::EmptyProfileList
-        , TAO_IOP::Duplicate
-        , TAO_IOP::Invalid_IOR
+        CORBA::SystemException,
+        ::TAO_IOP::EmptyProfileList,
+        ::TAO_IOP::Duplicate,
+        ::TAO_IOP::Invalid_IOR
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Object_ptr add_profiles (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2
+        ::CORBA::Object_ptr ior1,
+        ::CORBA::Object_ptr ior2
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , TAO_IOP::EmptyProfileList
-        , TAO_IOP::Duplicate
-        , TAO_IOP::Invalid_IOR
+        CORBA::SystemException,
+        ::TAO_IOP::EmptyProfileList,
+        ::TAO_IOP::Duplicate,
+        ::TAO_IOP::Invalid_IOR
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Object_ptr remove_profiles (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2
+        ::CORBA::Object_ptr ior1,
+        ::CORBA::Object_ptr ior2
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , TAO_IOP::Invalid_IOR
-        , TAO_IOP::EmptyProfileList
-        , TAO_IOP::NotFound
+        CORBA::SystemException,
+        ::TAO_IOP::Invalid_IOR,
+        ::TAO_IOP::EmptyProfileList,
+        ::TAO_IOP::NotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean set_property (
-        TAO_IOP::TAO_IOR_Property_ptr prop,
-        CORBA::Object_ptr ior
+        ::TAO_IOP::TAO_IOR_Property_ptr prop,
+        ::CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , TAO_IOP::Invalid_IOR
-        , TAO_IOP::Duplicate
+        CORBA::SystemException,
+        ::TAO_IOP::Invalid_IOR,
+        ::TAO_IOP::Duplicate
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean set_primary (
-        TAO_IOP::TAO_IOR_Property_ptr prop,
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2
+        ::TAO_IOP::TAO_IOR_Property_ptr prop,
+        ::CORBA::Object_ptr ior1,
+        ::CORBA::Object_ptr ior2
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , TAO_IOP::Invalid_IOR
-        , TAO_IOP::Duplicate
-        , TAO_IOP::MultiProfileList
-        , TAO_IOP::NotFound
+        CORBA::SystemException,
+        ::TAO_IOP::Invalid_IOR,
+        ::TAO_IOP::Duplicate,
+        ::TAO_IOP::MultiProfileList,
+        ::TAO_IOP::NotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean remove_primary_tag (
-        TAO_IOP::TAO_IOR_Property_ptr prop,
-        CORBA::Object_ptr ior
+        ::TAO_IOP::TAO_IOR_Property_ptr prop,
+        ::CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Object_ptr get_primary (
-        TAO_IOP::TAO_IOR_Property_ptr prop,
-        CORBA::Object_ptr ior
+        ::TAO_IOP::TAO_IOR_Property_ptr prop,
+        ::CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , TAO_IOP::NotFound
+        CORBA::SystemException,
+        ::TAO_IOP::NotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean is_primary_set (
-        TAO_IOP::TAO_IOR_Property_ptr prop,
-        CORBA::Object_ptr ior
+        ::TAO_IOP::TAO_IOR_Property_ptr prop,
+        ::CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::ULong is_in_ior (
-        CORBA::Object_ptr ior1,
-        CORBA::Object_ptr ior2
+        ::CORBA::Object_ptr ior1,
+        ::CORBA::Object_ptr ior2
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , TAO_IOP::NotFound
+        CORBA::SystemException,
+        ::TAO_IOP::NotFound
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::ULong get_profile_count (
-        CORBA::Object_ptr ior
+        ::CORBA::Object_ptr ior
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , TAO_IOP::EmptyProfileList
+        CORBA::SystemException,
+        ::TAO_IOP::EmptyProfileList
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     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:
     // Abstract or local interface only.
     TAO_IOR_Manipulation (void);
-
+    
     virtual ~TAO_IOR_Manipulation (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     TAO_IOR_Manipulation (const TAO_IOR_Manipulation &);
-
+    
     void operator= (const TAO_IOR_Manipulation &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TAO_IOR_Manipulation;
 
 // TAO_IDL - Generated from
@@ -774,19 +785,19 @@ namespace TAO
 
 #if !defined (_TAO_IOP_TAO_IOR_PROPERTY__TRAITS_CH_)
 #define _TAO_IOP_TAO_IOR_PROPERTY__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IORManip_Export Objref_Traits<TAO_IOP::TAO_IOR_Property>
+  struct TAO_IORManip_Export Objref_Traits< ::TAO_IOP::TAO_IOR_Property>
   {
-    static TAO_IOP::TAO_IOR_Property_ptr duplicate (
-        TAO_IOP::TAO_IOR_Property_ptr
+    static ::TAO_IOP::TAO_IOR_Property_ptr duplicate (
+        ::TAO_IOP::TAO_IOR_Property_ptr
       );
     static void release (
-        TAO_IOP::TAO_IOR_Property_ptr
+        ::TAO_IOP::TAO_IOR_Property_ptr
       );
-    static TAO_IOP::TAO_IOR_Property_ptr nil (void);
+    static ::TAO_IOP::TAO_IOR_Property_ptr nil (void);
     static CORBA::Boolean marshal (
-        TAO_IOP::TAO_IOR_Property_ptr p,
+        ::TAO_IOP::TAO_IOR_Property_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -795,19 +806,19 @@ namespace TAO
 
 #if !defined (_TAO_IOP_TAO_IOR_MANIPULATION__TRAITS_CH_)
 #define _TAO_IOP_TAO_IOR_MANIPULATION__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IORManip_Export Objref_Traits<TAO_IOP::TAO_IOR_Manipulation>
+  struct TAO_IORManip_Export Objref_Traits< ::TAO_IOP::TAO_IOR_Manipulation>
   {
-    static TAO_IOP::TAO_IOR_Manipulation_ptr duplicate (
-        TAO_IOP::TAO_IOR_Manipulation_ptr
+    static ::TAO_IOP::TAO_IOR_Manipulation_ptr duplicate (
+        ::TAO_IOP::TAO_IOR_Manipulation_ptr
       );
     static void release (
-        TAO_IOP::TAO_IOR_Manipulation_ptr
+        ::TAO_IOP::TAO_IOR_Manipulation_ptr
       );
-    static TAO_IOP::TAO_IOR_Manipulation_ptr nil (void);
+    static ::TAO_IOP::TAO_IOR_Manipulation_ptr nil (void);
     static CORBA::Boolean marshal (
-        TAO_IOP::TAO_IOR_Manipulation_ptr p,
+        ::TAO_IOP::TAO_IOR_Manipulation_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -908,13 +919,13 @@ TAO_IORManip_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_IOP::M
 TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::MultiProfileList &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "IORC.i"
+#include "IORC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -925,3 +936,5 @@ TAO_IORManip_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_IOP::MultiPro
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/IORManipulation/IORC.i b/TAO/tao/IORManipulation/IORC.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/tao/IORManipulation/IORC.i
+++ b/TAO/tao/IORManipulation/IORC.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/tao/IORManipulation/diffs/IOR.diff b/TAO/tao/IORManipulation/diffs/IOR.diff
index 9a7bf0ac79b..6c302a23cf8 100644
--- a/TAO/tao/IORManipulation/diffs/IOR.diff
+++ b/TAO/tao/IORManipulation/diffs/IOR.diff
@@ -1,35 +1,35 @@
---- orig/IORC.h	Wed Feb  6 13:29:21 2002
-+++ IORC.h	Wed Feb  6 13:30:34 2002
-@@ -23,13 +23,20 @@
- #define _TAO_IDL_ORIG_IORC_H_
- 
- #include "ace/pre.h"
--#include "tao/corba.h"
-+#include "tao/corbafwd.h"
-+
-+#ifndef TAO_IORMANIP_SAFE_INCLUDE
-+#error "You should not include IORC.h directly, use IORManip_Loader.h"
-+#endif /* !TAO_IORMANIP_SAFE_INCLUDE */
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
+--- orig/IORC.h	2005-02-14 14:33:17.541928300 +0100
++++ IORC.h	2005-02-14 14:35:33.857941100 +0100
+@@ -40,6 +40,10 @@
  # pragma once
  #endif /* ACE_LACKS_PRAGMA_ONCE */
  
++ #ifndef TAO_IORMANIP_SAFE_INCLUDE
++ #error "You should not include IORC.h directly, use IORManip_Loader.h"
++ #endif /* !TAO_IORMANIP_SAFE_INCLUDE */
++
  #include "ior_manip_export.h"
-+#include "tao/Exception.h"
-+#include "tao/Object.h"
-+#include "tao/Sequence.h"
+ #include "tao/ORB.h"
+ #include "tao/SystemException.h"
+--- orig/IORC.cpp	2005-02-14 14:33:17.541928300 +0100
++++ IORC.cpp	2005-02-14 14:33:48.095862700 +0100
+@@ -29,7 +29,7 @@
+ // be\be_codegen.cpp:302
  
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
---- orig/IORC.cpp	Wed Feb  6 13:29:21 2002
-+++ IORC.cpp	Wed Feb  6 13:30:56 2002
-@@ -19,7 +19,7 @@
+ 
+-#include "IORC.h"
++#include "IORManip_Loader.h"
+ #include "tao/CDR.h"
+ #include "tao/Typecode.h"
+ #include "ace/OS_NS_string.h"
+--- orig/IORA.cpp	2005-02-14 14:33:17.541928300 +0100
++++ IORA.cpp	2005-02-14 14:38:14.699219500 +0100
+@@ -25,7 +25,7 @@
  // Information about TAO is available at:
  //     http://www.cs.wustl.edu/~schmidt/TAO.html
  
 -#include "IORC.h"
 +#include "IORManip_Loader.h"
- 
- #include "tao/Stub.h"
- #include "tao/Invocation.h"
+ #include "tao/Typecode.h"
+ #include "tao/CDR.h"
+ #include "tao/Any.h"
diff --git a/TAO/tao/IORTable/IORTableC.cpp b/TAO/tao/IORTable/IORTableC.cpp
index 2ee31f9dcb2..0a36921a60c 100644
--- a/TAO/tao/IORTable/IORTableC.cpp
+++ b/TAO/tao/IORTable/IORTableC.cpp
@@ -26,12 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
-#include "IORTableC.h"
+#include "IORTable.h"
 #include "tao/CDR.h"
-#include "tao/SystemException.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -39,11 +38,11 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "IORTableC.i"
+#include "IORTableC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -84,14 +83,13 @@ IORTable::AlreadyBound::operator= (const ::IORTable::AlreadyBound &_tao_excp)
 IORTable::AlreadyBound *
 IORTable::AlreadyBound::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:IORTable/AlreadyBound:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (AlreadyBound *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<AlreadyBound *> (_tao_excp);
+}
+
+const IORTable::AlreadyBound *
+IORTable::AlreadyBound::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const AlreadyBound *> (_tao_excp);
 }
 
 CORBA::Exception *IORTable::AlreadyBound::_alloc (void)
@@ -179,14 +177,13 @@ IORTable::NotFound::operator= (const ::IORTable::NotFound &_tao_excp)
 IORTable::NotFound *
 IORTable::NotFound::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:IORTable/NotFound:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (NotFound *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<NotFound *> (_tao_excp);
+}
+
+const IORTable::NotFound *
+IORTable::NotFound::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const NotFound *> (_tao_excp);
 }
 
 CORBA::Exception *IORTable::NotFound::_alloc (void)
@@ -281,12 +278,6 @@ TAO::Objref_Traits<IORTable::Table>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*IORTable__TAO_Table_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 IORTable::Table::Table (void)
 {}
 
@@ -346,18 +337,18 @@ IORTable::Table::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:IORTable/Table:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -418,12 +409,6 @@ TAO::Objref_Traits<IORTable::Locator>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*IORTable__TAO_Locator_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 IORTable::Locator::Locator (void)
 {}
 
@@ -483,18 +468,18 @@ IORTable::Locator::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:IORTable/Locator:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -523,15 +508,8 @@ CORBA::Boolean operator<< (
     const IORTable::AlreadyBound &_tao_aggregate
   )
 {
-  // First marshal the repository ID.
-  if (strm << _tao_aggregate._rep_id ())
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+  // Marshal the repository ID.
+  return (strm << _tao_aggregate._rep_id ());
 }
 
 CORBA::Boolean operator>> (
@@ -539,7 +517,7 @@ CORBA::Boolean operator>> (
     IORTable::AlreadyBound&
   )
 {
-  return 1;
+  return true;
 }
 
 // TAO_IDL - Generated from
@@ -550,15 +528,8 @@ CORBA::Boolean operator<< (
     const IORTable::NotFound &_tao_aggregate
   )
 {
-  // First marshal the repository ID.
-  if (strm << _tao_aggregate._rep_id ())
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+  // Marshal the repository ID.
+  return (strm << _tao_aggregate._rep_id ());
 }
 
 CORBA::Boolean operator>> (
@@ -566,11 +537,11 @@ CORBA::Boolean operator>> (
     IORTable::NotFound&
   )
 {
-  return 1;
+  return true;
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -583,7 +554,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         IORTable::Locator
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         IORTable::Locator
@@ -598,7 +569,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T<
         IORTable::Table
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         IORTable::Table
@@ -615,7 +586,7 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         IORTable::Locator
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         IORTable::Locator
@@ -630,10 +601,10 @@ CORBA::Boolean operator>> (
     TAO_Objref_Var_T< \
         IORTable::Table
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         IORTable::Table
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/IORTable/IORTableC.h b/TAO/tao/IORTable/IORTableC.h
index 8b22ddb0d82..c19ba7110c5 100644
--- a/TAO/tao/IORTable/IORTableC.h
+++ b/TAO/tao/IORTable/IORTableC.h
@@ -26,23 +26,29 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_IORTABLEC_H_
 #define _TAO_IDL_ORIG_IORTABLEC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "iortable_export.h"
+
+#include "ace/config-all.h"
+
+ #ifndef TAO_IORTABLE_SAFE_INCLUDE
+ #error "You should not include IORTableC.h directly, use IORTable.h"
+ #endif /* !TAO_IORTABLE_SAFE_INCLUDE */
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "iortable_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/SystemException.h"
-#include "tao/UserException.h"
 #include "tao/Objref_VarOut_T.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -58,9 +64,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -69,7 +73,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root_ch.cpp:63
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -86,7 +90,7 @@ namespace IORTable
 {
 
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_IORTABLE_LOCATOR__VAR_OUT_CH_)
 #define _IORTABLE_LOCATOR__VAR_OUT_CH_
@@ -125,6 +129,8 @@ namespace IORTable
     AlreadyBound &operator= (const AlreadyBound &);
 
     static AlreadyBound *_downcast (CORBA::Exception *);
+    static const AlreadyBound *_downcast (CORBA::Exception const *);
+
     static CORBA::Exception *_alloc (void);
 
     virtual CORBA::Exception *_tao_duplicate (void) const;
@@ -142,7 +148,7 @@ namespace IORTable
       );
 
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:125
+    // be\be_visitor_exception/exception_ch.cpp:127
   };
 
 #endif /* end #if !defined */
@@ -164,6 +170,8 @@ namespace IORTable
     NotFound &operator= (const NotFound &);
 
     static NotFound *_downcast (CORBA::Exception *);
+    static const NotFound *_downcast (CORBA::Exception const *);
+
     static CORBA::Exception *_alloc (void);
 
     virtual CORBA::Exception *_tao_duplicate (void) const;
@@ -181,13 +189,13 @@ namespace IORTable
       );
 
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:125
+    // be\be_visitor_exception/exception_ch.cpp:127
   };
 
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_IORTABLE_TABLE__VAR_OUT_CH_)
 #define _IORTABLE_TABLE__VAR_OUT_CH_
@@ -237,7 +245,7 @@ namespace IORTable
 
     static Table_ptr _nil (void)
     {
-      return (Table_ptr)0;
+      return static_cast<Table_ptr> (0);
     }
 
 
@@ -251,8 +259,8 @@ namespace IORTable
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , IORTable::AlreadyBound
+        CORBA::SystemException,
+        ::IORTable::AlreadyBound
       )) = 0;
 
     // TAO_IDL - Generated from
@@ -275,15 +283,15 @@ namespace IORTable
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , IORTable::NotFound
+        CORBA::SystemException,
+        ::IORTable::NotFound
       )) = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void set_locator (
-        IORTable::Locator_ptr the_locator
+        ::IORTable::Locator_ptr the_locator
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -344,7 +352,7 @@ namespace IORTable
 
     static Locator_ptr _nil (void)
     {
-      return (Locator_ptr)0;
+      return static_cast<Locator_ptr> (0);
     }
 
 
@@ -357,8 +365,8 @@ namespace IORTable
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , IORTable::NotFound
+        CORBA::SystemException,
+        ::IORTable::NotFound
       )) = 0;
 
     // TAO_IDL - Generated from
@@ -403,17 +411,17 @@ namespace TAO
 #define _IORTABLE_LOCATOR__TRAITS_CH_
 
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IORTable_Export Objref_Traits<IORTable::Locator>
+  struct TAO_IORTable_Export Objref_Traits< ::IORTable::Locator>
   {
-    static IORTable::Locator_ptr duplicate (
-        IORTable::Locator_ptr
+    static ::IORTable::Locator_ptr duplicate (
+        ::IORTable::Locator_ptr
       );
     static void release (
-        IORTable::Locator_ptr
+        ::IORTable::Locator_ptr
       );
-    static IORTable::Locator_ptr nil (void);
+    static ::IORTable::Locator_ptr nil (void);
     static CORBA::Boolean marshal (
-        IORTable::Locator_ptr p,
+        ::IORTable::Locator_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -424,17 +432,17 @@ namespace TAO
 #define _IORTABLE_TABLE__TRAITS_CH_
 
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_IORTable_Export Objref_Traits<IORTable::Table>
+  struct TAO_IORTable_Export Objref_Traits< ::IORTable::Table>
   {
-    static IORTable::Table_ptr duplicate (
-        IORTable::Table_ptr
+    static ::IORTable::Table_ptr duplicate (
+        ::IORTable::Table_ptr
       );
     static void release (
-        IORTable::Table_ptr
+        ::IORTable::Table_ptr
       );
-    static IORTable::Table_ptr nil (void);
+    static ::IORTable::Table_ptr nil (void);
     static CORBA::Boolean marshal (
-        IORTable::Table_ptr p,
+        ::IORTable::Table_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -455,13 +463,13 @@ TAO_IORTable_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IORTable::
 TAO_IORTable_Export CORBA::Boolean operator>> (TAO_InputCDR &, IORTable::NotFound &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "IORTableC.i"
+#include "IORTableC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -472,3 +480,5 @@ TAO_IORTable_Export CORBA::Boolean operator>> (TAO_InputCDR &, IORTable::NotFoun
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/IORTable/IORTableC.i b/TAO/tao/IORTable/IORTableC.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/tao/IORTable/IORTableC.i
+++ b/TAO/tao/IORTable/IORTableC.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/tao/IORTable/IOR_Table_Impl.cpp b/TAO/tao/IORTable/IOR_Table_Impl.cpp
index 336a58d935e..7b0d6bb538a 100644
--- a/TAO/tao/IORTable/IOR_Table_Impl.cpp
+++ b/TAO/tao/IORTable/IOR_Table_Impl.cpp
@@ -10,7 +10,6 @@
 #include "IOR_Table_Impl.h"
 #include "ace/Guard_T.h"
 
-
 ACE_RCSID (IORTable,
            IOR_Table_Impl,
            "$Id$")
diff --git a/TAO/tao/IORTable/IOR_Table_Impl.h b/TAO/tao/IORTable/IOR_Table_Impl.h
index 4189aa2ccc3..acdcebdfa11 100644
--- a/TAO/tao/IORTable/IOR_Table_Impl.h
+++ b/TAO/tao/IORTable/IOR_Table_Impl.h
@@ -28,9 +28,7 @@
 #include "ace/SString.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -108,7 +106,7 @@ private:
   TAO_SYNCH_MUTEX lock_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/ImR_Client.mpc b/TAO/tao/ImR_Client.mpc
new file mode 100644
index 00000000000..ecd9fd48dbf
--- /dev/null
+++ b/TAO/tao/ImR_Client.mpc
@@ -0,0 +1,29 @@
+//$Id$
+project : taolib, core, portableserver {
+  sharedname   = TAO_ImR_Client
+  dynamicflags = TAO_IMR_CLIENT_BUILD_DLL
+
+  Source_Files {
+    ImR_Client
+  }
+
+  Header_Files {
+    ImR_Client
+  }
+
+  Inline_Files {
+    ImR_Client
+  }
+
+  Template_Files {
+    ImR_Client
+  }
+
+  Resource_Files {
+    ImR_Client
+  }
+
+  PIDL_Files {
+    ImR_Client
+  }
+}
diff --git a/TAO/tao/ImR_Client/ImR_Client_Adapter_Impl.cpp b/TAO/tao/ImR_Client/ImR_Client_Adapter_Impl.cpp
new file mode 100644
index 00000000000..e6fe32e4a2b
--- /dev/null
+++ b/TAO/tao/ImR_Client/ImR_Client_Adapter_Impl.cpp
@@ -0,0 +1,220 @@
+// $Id$
+
+#include "ImR_Client_Adapter_Impl.h"
+
+#include "tao/debug.h"
+#include "tao/ORB_Core.h"
+#include "tao/Stub.h"
+#include "tao/Profile.h"
+#include "tao/PortableServer/Root_POA.h"
+#include "tao/PortableServer/Non_Servant_Upcall.h"
+#include "tao/ImR_Client/ServerObject_i.h"
+#include "tao/ImR_Client/ImplRepoC.h"
+
+ACE_RCSID (IFR_Client,
+           IFR_Client_Adapter_Impl,
+           "$Id$")
+
+namespace TAO
+{
+  namespace ImR_Client
+  {
+    ImR_Client_Adapter_Impl::~ImR_Client_Adapter_Impl (void)
+    {
+    }
+
+    void
+    ImR_Client_Adapter_Impl::imr_notify_startup (
+      TAO_Root_POA* poa ACE_ENV_ARG_DECL)
+    {
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG, "Notifying ImR of startup\n"));
+
+      CORBA::Object_var imr = poa->orb_core ().implrepo_service ();
+
+      if (CORBA::is_nil (imr.in ()))
+          return;
+
+      ImplementationRepository::Administration_var imr_locator;
+
+      {
+        // ATTENTION: Trick locking here, see class header for details
+        TAO::Portable_Server::Non_Servant_Upcall non_servant_upcall (*poa);
+        ACE_UNUSED_ARG (non_servant_upcall);
+
+        imr_locator =
+          ImplementationRepository::Administration::_narrow (imr.in () ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK;
+      }
+
+      if (CORBA::is_nil(imr_locator.in ()))
+          return;
+
+      TAO_Root_POA *root_poa = poa->object_adapter ().root_poa ();
+      ACE_NEW_THROW_EX (this->server_object_,
+                        ServerObject_i (poa->orb_core ().orb (),
+                                        root_poa),
+                        CORBA::NO_MEMORY ());
+      ACE_CHECK;
+
+      PortableServer::ServantBase_var safe_servant (this->server_object_);
+      ACE_UNUSED_ARG (safe_servant);
+
+      // Since this method is called from the POA constructor, there
+      // shouldn't be any waiting required.  Therefore,
+      // <wait_occurred_restart_call_ignored> can be ignored.
+      int wait_occurred_restart_call_ignored = 0;
+
+      // Activate the servant in the root poa.
+      PortableServer::ObjectId_var id =
+        root_poa->activate_object_i (this->server_object_,
+                                     poa->server_priority (),
+                                     wait_occurred_restart_call_ignored
+                                     ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      CORBA::Object_var obj = root_poa->id_to_reference_i (id.in  ()
+                                                           ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      ImplementationRepository::ServerObject_var svr
+        = ImplementationRepository::ServerObject::_narrow (obj.in ()
+                                                           ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      if (!svr->_stubobj () || !svr->_stubobj ()->profile_in_use ())
+        {
+          ACE_ERROR ((LM_ERROR, "Invalid ImR ServerObject, bailing out.\n"));
+          return;
+        }
+
+      CORBA::String_var ior =
+        svr->_stubobj ()->profile_in_use ()->to_string (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+
+      // Search for "corbaloc:" alone, without the protocol.  This code
+      // should be protocol neutral.
+      const char corbaloc[] = "corbaloc:";
+      char *pos = ACE_OS::strstr (ior.inout (), corbaloc);
+      pos = ACE_OS::strchr (pos + sizeof (corbaloc), ':');
+
+      pos = ACE_OS::strchr (pos + 1,
+                            svr->_stubobj ()->profile_in_use ()->object_key_delimiter ());
+
+      ACE_CString partial_ior(ior.in (), (pos - ior.in()) + 1);
+
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "Informing IMR that we are running at: %s\n",
+                    ACE_TEXT_CHAR_TO_TCHAR (partial_ior.c_str())));
+
+      ACE_TRY
+        {
+          // ATTENTION: Trick locking here, see class header for details
+          TAO::Portable_Server::Non_Servant_Upcall non_servant_upcall (*poa);
+          ACE_UNUSED_ARG (non_servant_upcall);
+
+          imr_locator->server_is_running (poa->name().c_str (),
+                                          partial_ior.c_str(),
+                                          svr.in()
+                                          ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCH (CORBA::SystemException, sysex)
+        {
+          // Avoid warnings on platforms with native C++ exceptions
+          ACE_UNUSED_ARG (sysex);
+          ACE_RE_THROW;
+        }
+      ACE_CATCHANY
+        {
+          ACE_TRY_THROW (CORBA::TRANSIENT (
+              CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
+              CORBA::COMPLETED_NO));
+        }
+      ACE_ENDTRY;
+      ACE_CHECK;
+
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG, "Successfully notified ImR of Startup\n"));
+    }
+
+    void
+    ImR_Client_Adapter_Impl::imr_notify_shutdown (
+      TAO_Root_POA* poa ACE_ENV_ARG_DECL)
+    {
+      // Notify the Implementation Repository about shutting down.
+      CORBA::Object_var imr = poa->orb_core ().implrepo_service ();
+
+      // Check to see if there was an imr returned.
+      // If none, return ourselves.
+      if (CORBA::is_nil (imr.in ()))
+        return;
+
+      ACE_TRY_NEW_ENV
+        {
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG, "Notifing IMR of Shutdown server:%s\n", poa->the_name()));
+
+          // ATTENTION: Trick locking here, see class header for details
+          TAO::Portable_Server::Non_Servant_Upcall non_servant_upcall (*poa);
+          ACE_UNUSED_ARG (non_servant_upcall);
+
+          // Get the IMR's administrative object and call shutting_down on it
+          ImplementationRepository::Administration_var imr_locator =
+            ImplementationRepository::Administration::_narrow (imr.in () ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          imr_locator->server_is_shutting_down (poa->the_name () ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY
+        {
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "POA::imr_notify_shutdown()");
+          // Ignore exceptions
+        }
+      ACE_ENDTRY;
+
+      if (this->server_object_)
+        {
+          TAO_Root_POA *root_poa = poa->object_adapter ().root_poa ();
+
+          if (!root_poa)
+            {
+              ACE_THROW (CORBA::OBJ_ADAPTER ());
+            }
+
+          PortableServer::ObjectId_var id =
+            root_poa->servant_to_id_i (this->server_object_
+                                       ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+
+          root_poa->deactivate_object_i (id.in() ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+    }
+
+    // *********************************************************************
+
+    // Initialization and registration of dynamic service object.
+
+    int
+    ImR_Client_Adapter_Impl::Initializer (void)
+    {
+      TAO_Root_POA::imr_client_adapter_name ("Concrete_ImR_Client_Adapter");
+
+      return ACE_Service_Config::process_directive (ace_svc_desc_ImR_Client_Adapter_Impl);
+    }
+
+    ACE_STATIC_SVC_DEFINE (
+        ImR_Client_Adapter_Impl,
+        ACE_TEXT ("Concrete_ImR_Client_Adapter"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (ImR_Client_Adapter_Impl),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+
+    ACE_FACTORY_DEFINE (TAO_IMR_Client, ImR_Client_Adapter_Impl)
+  }
+}
diff --git a/TAO/tao/ImR_Client/ImR_Client_Adapter_Impl.h b/TAO/tao/ImR_Client/ImR_Client_Adapter_Impl.h
new file mode 100644
index 00000000000..7bba1f8d399
--- /dev/null
+++ b/TAO/tao/ImR_Client/ImR_Client_Adapter_Impl.h
@@ -0,0 +1,88 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    ImR_Client_Adapter_Impl.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+
+#ifndef TAO_IMR_CLIENT_ADAPTER_IMPL_H
+#define TAO_IMR_CLIENT_ADAPTER_IMPL_H
+
+#include /**/ "ace/pre.h"
+
+#include "imr_client_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/PortableServer/ImR_Client_Adapter.h"
+
+#include "ace/Service_Config.h"
+
+class ServerObject_i;
+
+namespace TAO
+{
+  namespace ImR_Client
+  {
+    /**
+     * @class IFR_Client_Adapter_Impl
+     *
+     * @brief IFR_Client_Adapter_Impl.
+     *
+     * Class that adapts various functions in the PortableServer library
+     * which use the Implementation Repository. This is the derived class
+     * that contains the actual implementations.
+     */
+    class TAO_IMR_Client_Export ImR_Client_Adapter_Impl
+      : public ::TAO::Portable_Server::ImR_Client_Adapter
+    {
+    public:
+      virtual ~ImR_Client_Adapter_Impl (void);
+
+      // Used to force the initialization of the PortableServer code.
+      static int Initializer (void);
+
+      /// ImplRepo helper method, notify the ImplRepo on startup
+      virtual void imr_notify_startup (TAO_Root_POA* poa ACE_ENV_ARG_DECL);
+
+      /// ImplRepo helper method, notify the ImplRepo on shutdown
+      virtual void imr_notify_shutdown (TAO_Root_POA* poa ACE_ENV_ARG_DECL);
+
+    private:
+      /// Implementation Repository Server Object
+      ServerObject_i *server_object_;
+    };
+
+    ACE_STATIC_SVC_DECLARE (ImR_Client_Adapter_Impl)
+    ACE_FACTORY_DECLARE (TAO_IMR_Client, ImR_Client_Adapter_Impl)
+
+    #if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
+
+    typedef int (*TAO_Module_Initializer) (void);
+
+    static TAO_Module_Initializer
+    TAO_Requires_ImR_Client_Initializer =
+      &TAO::ImR_Client::ImR_Client_Adapter_Impl::Initializer;
+
+    #else
+
+    static int
+    TAO_Requires_ImR_Client_Initializer =
+      TAO::ImR_Client::ImR_Client_Adapter_Impl::Initializer ();
+
+    #endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
+
+  }
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_IMR_CLIENT_ADAPTER_IMPL_H */
diff --git a/TAO/tao/PortableServer/ImplRepo.pidl b/TAO/tao/ImR_Client/ImplRepo.pidl
index 85851eba429..475f22faf45 100644
--- a/TAO/tao/PortableServer/ImplRepo.pidl
+++ b/TAO/tao/ImR_Client/ImplRepo.pidl
@@ -6,20 +6,16 @@
  *
  * $Id$
  *
- * This file was used to generate the code in ImplRepo{C,S,S_T}.{h,i,cpp}
+ * This file was used to generate the code in ImplRepo{C,S}.{h,inl,cpp}
  *
  * The command used to generate code from this file is:
  *
- *   tao_idl -Gp -Gd -Ge 1 -Sc -GT -o orig
- *       -Wb,export_macro=TAO_PortableServer_Export
- *       -Wb,export_include=portableserver_export.h
- *       -Wb,pre_include="ace/pre.h"
- *       -Wb,post_include="ace/post.h" ImplRepo.pidl
+ *   tao_idl -Gp -Gd -Ge 1 -Sc -GT -Wb,export_macro=TAO_IMR_Client_Export -Wb,export_include=imr_client_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" ImplRepo.pidl
  *
  */
 //=============================================================================
 
-#include "tao/PortableServer/ServerObject.pidl"
+#include <tao/ImR_Client/ServerObject.pidl>
 
 module ImplementationRepository
 {
diff --git a/TAO/tao/PortableServer/ImplRepoA.cpp b/TAO/tao/ImR_Client/ImplRepoA.cpp
index 978485a6b33..978485a6b33 100644
--- a/TAO/tao/PortableServer/ImplRepoA.cpp
+++ b/TAO/tao/ImR_Client/ImplRepoA.cpp
diff --git a/TAO/tao/PortableServer/ImplRepoC.cpp b/TAO/tao/ImR_Client/ImplRepoC.cpp
index af29fe20187..741bb0a51d5 100644
--- a/TAO/tao/PortableServer/ImplRepoC.cpp
+++ b/TAO/tao/ImR_Client/ImplRepoC.cpp
@@ -51,7 +51,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -61,7 +61,7 @@ namespace TAO
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_CS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerObject>
+  class TAO_IMR_Client_Export Arg_Traits<ImplementationRepository::ServerObject>
     : public
         Object_Arg_Traits_T<
             ImplementationRepository::ServerObject_ptr,
@@ -75,13 +75,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:612
+  // be\be_visitor_arg_traits.cpp:662
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::StartupOptions>
+  class TAO_IMR_Client_Export Arg_Traits<ImplementationRepository::StartupOptions>
     : public
         Var_Size_Arg_Traits_T<
             ImplementationRepository::StartupOptions,
@@ -94,13 +94,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:612
+  // be\be_visitor_arg_traits.cpp:662
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_CS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformation>
+  class TAO_IMR_Client_Export Arg_Traits<ImplementationRepository::ServerInformation>
     : public
         Var_Size_Arg_Traits_T<
             ImplementationRepository::ServerInformation,
@@ -113,13 +113,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_CS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationList>
+  class TAO_IMR_Client_Export Arg_Traits<ImplementationRepository::ServerInformationList>
     : public
         Var_Size_Arg_Traits_T<
             ImplementationRepository::ServerInformationList,
@@ -135,7 +135,7 @@ namespace TAO
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_CS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationIterator>
+  class TAO_IMR_Client_Export Arg_Traits<ImplementationRepository::ServerInformationIterator>
     : public
         Object_Arg_Traits_T<
             ImplementationRepository::ServerInformationIterator_ptr,
diff --git a/TAO/tao/PortableServer/ImplRepoC.h b/TAO/tao/ImR_Client/ImplRepoC.h
index 7242d3bcd7c..13f9d7c4ab5 100644
--- a/TAO/tao/PortableServer/ImplRepoC.h
+++ b/TAO/tao/ImR_Client/ImplRepoC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "portableserver_export.h"
+#include "imr_client_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -51,18 +51,18 @@
 #include "tao/Seq_Out_T.h"
 #include "tao/VarOut_T.h"
 
-#include "tao/PortableServer/ServerObjectC.h"
+#include "tao/ImR_Client/ServerObjectC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
-#define TAO_EXPORT_MACRO TAO_PortableServer_Export
+#define TAO_EXPORT_MACRO TAO_IMR_Client_Export
 
 #if defined (TAO_EXPORT_NESTED_CLASSES)
 #  if defined (TAO_EXPORT_NESTED_MACRO)
 #    undef TAO_EXPORT_NESTED_MACRO
 #  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
+#  define TAO_EXPORT_NESTED_MACRO TAO_IMR_Client_Export
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
@@ -97,7 +97,7 @@ namespace ImplementationRepository
 #if !defined (_IMPLEMENTATIONREPOSITORY_ALREADYREGISTERED_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ALREADYREGISTERED_CH_
   
-  class TAO_PortableServer_Export AlreadyRegistered : public CORBA::UserException
+  class TAO_IMR_Client_Export AlreadyRegistered : public CORBA::UserException
   {
   public:
     
@@ -147,7 +147,7 @@ namespace ImplementationRepository
 #if !defined (_IMPLEMENTATIONREPOSITORY_CANNOTACTIVATE_CH_)
 #define _IMPLEMENTATIONREPOSITORY_CANNOTACTIVATE_CH_
   
-  class TAO_PortableServer_Export CannotActivate : public CORBA::UserException
+  class TAO_IMR_Client_Export CannotActivate : public CORBA::UserException
   {
   public:
     
@@ -205,7 +205,7 @@ namespace ImplementationRepository
 #if !defined (_IMPLEMENTATIONREPOSITORY_NOTFOUND_CH_)
 #define _IMPLEMENTATIONREPOSITORY_NOTFOUND_CH_
   
-  class TAO_PortableServer_Export NotFound : public CORBA::UserException
+  class TAO_IMR_Client_Export NotFound : public CORBA::UserException
   {
   public:
     
@@ -270,7 +270,7 @@ namespace ImplementationRepository
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
   
-  struct TAO_PortableServer_Export EnvironmentVariable
+  struct TAO_IMR_Client_Export EnvironmentVariable
   {
     typedef EnvironmentVariable_var _var_type;
     
@@ -307,7 +307,7 @@ namespace ImplementationRepository
       >
     EnvironmentList_out;
   
-  class TAO_PortableServer_Export EnvironmentList
+  class TAO_IMR_Client_Export EnvironmentList
     : public
         TAO_Unbounded_Sequence<
             EnvironmentVariable
@@ -376,7 +376,7 @@ namespace ImplementationRepository
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
   
-  struct TAO_PortableServer_Export StartupOptions
+  struct TAO_IMR_Client_Export StartupOptions
   {
     typedef StartupOptions_var _var_type;
     
@@ -415,7 +415,7 @@ namespace ImplementationRepository
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
   
-  struct TAO_PortableServer_Export ServerInformation
+  struct TAO_IMR_Client_Export ServerInformation
   {
     typedef ServerInformation_var _var_type;
     
@@ -453,7 +453,7 @@ namespace ImplementationRepository
       >
     ServerInformationList_out;
   
-  class TAO_PortableServer_Export ServerInformationList
+  class TAO_IMR_Client_Export ServerInformationList
     : public
         TAO_Unbounded_Sequence<
             ServerInformation
@@ -512,7 +512,7 @@ namespace ImplementationRepository
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR_CH_
   
-  class TAO_PortableServer_Export ServerInformationIterator
+  class TAO_IMR_Client_Export ServerInformationIterator
     : public virtual CORBA::Object
   {
   public:
@@ -642,7 +642,7 @@ namespace ImplementationRepository
 #if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_)
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CH_
   
-  class TAO_PortableServer_Export Administration
+  class TAO_IMR_Client_Export Administration
     : public virtual CORBA::Object
   {
   public:
@@ -848,13 +848,13 @@ namespace ImplementationRepository
 // TAO_IDL - Generated from
 // be\be_visitor_root/root.cpp:120
 
-extern TAO_PortableServer_Export
+extern TAO_IMR_Client_Export
 TAO::Collocation_Proxy_Broker *
 (*ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   );
 
-extern TAO_PortableServer_Export
+extern TAO_IMR_Client_Export
 TAO::Collocation_Proxy_Broker *
 (*ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
@@ -871,7 +871,7 @@ namespace TAO
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_PortableServer_Export Objref_Traits< ::ImplementationRepository::ServerInformationIterator>
+  struct TAO_IMR_Client_Export Objref_Traits< ::ImplementationRepository::ServerInformationIterator>
   {
     static ::ImplementationRepository::ServerInformationIterator_ptr duplicate (
         ::ImplementationRepository::ServerInformationIterator_ptr
@@ -892,7 +892,7 @@ namespace TAO
 #define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_PortableServer_Export Objref_Traits< ::ImplementationRepository::Administration>
+  struct TAO_IMR_Client_Export Objref_Traits< ::ImplementationRepository::Administration>
   {
     static ::ImplementationRepository::Administration_ptr duplicate (
         ::ImplementationRepository::Administration_ptr
@@ -913,110 +913,110 @@ namespace TAO
 // TAO_IDL - Generated from
 // 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
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::AlreadyRegistered *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::AlreadyRegistered *&);
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::AlreadyRegistered &); // copying version
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::AlreadyRegistered*); // noncopying version
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::AlreadyRegistered *&); // deprecated
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::AlreadyRegistered *&);
 
 // TAO_IDL - Generated from
 // 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
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::CannotActivate *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::CannotActivate *&);
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::CannotActivate &); // copying version
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::CannotActivate*); // noncopying version
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::CannotActivate *&); // deprecated
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::CannotActivate *&);
 
 // TAO_IDL - Generated from
 // 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
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::NotFound *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::NotFound *&);
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::NotFound &); // copying version
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::NotFound*); // noncopying version
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::NotFound *&); // deprecated
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::NotFound *&);
 
 // TAO_IDL - Generated from
 // 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
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentVariable *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentVariable *&);
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentVariable &); // copying version
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentVariable*); // noncopying version
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentVariable *&); // deprecated
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentVariable *&);
 
 // TAO_IDL - Generated from
 // 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
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentList *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentList *&);
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentList &); // copying version
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentList*); // noncopying version
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentList *&); // deprecated
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentList *&);
 
 // TAO_IDL - Generated from
 // 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_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ActivationMode);
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ActivationMode &);
 
 // TAO_IDL - Generated from
 // 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
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::StartupOptions *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::StartupOptions *&);
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::StartupOptions &); // copying version
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::StartupOptions*); // noncopying version
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::StartupOptions *&); // deprecated
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::StartupOptions *&);
 
 // TAO_IDL - Generated from
 // 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
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformation *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformation *&);
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformation &); // copying version
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformation*); // noncopying version
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformation *&); // deprecated
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformation *&);
 
 // TAO_IDL - Generated from
 // 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
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationList *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformationList *&);
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformationList &); // copying version
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationList*); // noncopying version
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationList *&); // deprecated
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformationList *&);
 
 // TAO_IDL - Generated from
 // 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_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr); // copying
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr *); // non-copying
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr &);
 
 // TAO_IDL - Generated from
 // 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_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr); // copying
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr *); // non-copying
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration_ptr &);
 
 // TAO_IDL - Generated from
 // 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_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::AlreadyRegistered &);
+TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::AlreadyRegistered &);
 
 // TAO_IDL - Generated from
 // 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_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::CannotActivate &);
+TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::CannotActivate &);
 
 // TAO_IDL - Generated from
 // 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_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::NotFound &);
+TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::NotFound &);
 
 // TAO_IDL - Generated from
 // be\be_visitor_structure/cdr_op_ch.cpp:54
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::EnvironmentVariable &);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::EnvironmentVariable &);
+TAO_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::EnvironmentVariable &);
+TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::EnvironmentVariable &);
 
 // TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
@@ -1024,11 +1024,11 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, Implementat
 #if !defined _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_
 #define _TAO_CDR_OP_ImplementationRepository_EnvironmentList_H_
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (
+TAO_IMR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const ImplementationRepository::EnvironmentList &
   );
-TAO_PortableServer_Export CORBA::Boolean operator>> (
+TAO_IMR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     ImplementationRepository::EnvironmentList &
   );
@@ -1038,20 +1038,20 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // 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_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ActivationMode &);
+TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ActivationMode &);
 
 // TAO_IDL - Generated from
 // be\be_visitor_structure/cdr_op_ch.cpp:54
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::StartupOptions &);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::StartupOptions &);
+TAO_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::StartupOptions &);
+TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::StartupOptions &);
 
 // TAO_IDL - Generated from
 // be\be_visitor_structure/cdr_op_ch.cpp:54
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformation &);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformation &);
+TAO_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformation &);
+TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformation &);
 
 // TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
@@ -1059,11 +1059,11 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, Implementat
 #if !defined _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_
 #define _TAO_CDR_OP_ImplementationRepository_ServerInformationList_H_
 
-TAO_PortableServer_Export CORBA::Boolean operator<< (
+TAO_IMR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const ImplementationRepository::ServerInformationList &
   );
-TAO_PortableServer_Export CORBA::Boolean operator>> (
+TAO_IMR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     ImplementationRepository::ServerInformationList &
   );
@@ -1073,14 +1073,14 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // 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_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerInformationIterator_ptr );
+TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerInformationIterator_ptr &);
 
 // TAO_IDL - Generated from
 // 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_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::Administration_ptr );
+TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::Administration_ptr &);
 
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:961
diff --git a/TAO/tao/PortableServer/ImplRepoC.inl b/TAO/tao/ImR_Client/ImplRepoC.inl
index 7b37ccdeaac..7b37ccdeaac 100644
--- a/TAO/tao/PortableServer/ImplRepoC.inl
+++ b/TAO/tao/ImR_Client/ImplRepoC.inl
diff --git a/TAO/tao/PortableServer/ImplRepoS.cpp b/TAO/tao/ImR_Client/ImplRepoS.cpp
index 07d14db1dda..cdc16592d52 100644
--- a/TAO/tao/PortableServer/ImplRepoS.cpp
+++ b/TAO/tao/ImR_Client/ImplRepoS.cpp
@@ -34,7 +34,8 @@
 
 
 #include "ImplRepoS.h"
-#include "tao/PortableServer/Object_Adapter.h"
+#include "tao/PortableServer/Servant_Upcall.h"
+#include "tao/PortableServer/ForwardRequestC.h"
 #include "tao/PortableServer/Operation_Table.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/ORB_Core.h"
@@ -70,7 +71,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -80,7 +81,7 @@ namespace TAO
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerObject>
+  class TAO_IMR_Client_Export Arg_Traits<ImplementationRepository::ServerObject>
     : public
         Object_Arg_Traits_T<
             ImplementationRepository::ServerObject_ptr,
@@ -94,13 +95,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:612
+  // be\be_visitor_arg_traits.cpp:662
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::StartupOptions>
+  class TAO_IMR_Client_Export Arg_Traits<ImplementationRepository::StartupOptions>
     : public
         Var_Size_Arg_Traits_T<
             ImplementationRepository::StartupOptions,
@@ -113,13 +114,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:612
+  // be\be_visitor_arg_traits.cpp:662
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformation>
+  class TAO_IMR_Client_Export Arg_Traits<ImplementationRepository::ServerInformation>
     : public
         Var_Size_Arg_Traits_T<
             ImplementationRepository::ServerInformation,
@@ -132,13 +133,13 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:383
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationList>
+  class TAO_IMR_Client_Export Arg_Traits<ImplementationRepository::ServerInformationList>
     : public
         Var_Size_Arg_Traits_T<
             ImplementationRepository::ServerInformationList,
@@ -154,7 +155,7 @@ namespace TAO
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_SS_
   
   ACE_TEMPLATE_SPECIALIZATION
-  class TAO_PortableServer_Export Arg_Traits<ImplementationRepository::ServerInformationIterator>
+  class TAO_IMR_Client_Export Arg_Traits<ImplementationRepository::ServerInformationIterator>
     : public
         Object_Arg_Traits_T<
             ImplementationRepository::ServerInformationIterator_ptr,
@@ -183,7 +184,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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)
 {
@@ -294,7 +295,7 @@ class TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_n
 public:
   TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_ImplementationRepository::ServerInformationIterator *tao_impl,
       const ::CORBA::ULong & how_many
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -349,7 +350,7 @@ private:
 
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_next_n (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::ServerInformationIterator *tao_impl,
     const ::CORBA::ULong & how_many
     ACE_ENV_ARG_DECL_NOT_USED
@@ -449,7 +450,7 @@ class TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_d
 public:
   TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_ImplementationRepository::ServerInformationIterator *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -499,7 +500,7 @@ private:
 
 TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy::TAO_ServerRequestInfo_ImplementationRepository_ServerInformationIterator_destroy (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::ServerInformationIterator *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -624,7 +625,7 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -901,9 +902,9 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -1042,9 +1043,9 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
   
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -1364,7 +1365,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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)
 {
@@ -1485,7 +1486,7 @@ class TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_ser
 public:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_ImplementationRepository::Administration *tao_impl,
       const char * server
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1537,7 +1538,7 @@ private:
 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_activate_server (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
     const char * server
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1642,7 +1643,7 @@ class TAO_ServerRequestInfo_ImplementationRepository_Administration_register_ser
 public:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_ImplementationRepository::Administration *tao_impl,
       const char * server,
       const ::ImplementationRepository::StartupOptions & options
@@ -1696,7 +1697,7 @@ private:
 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_register_server (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
     const char * server,
     const ::ImplementationRepository::StartupOptions & options
@@ -1807,7 +1808,7 @@ class TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_s
 public:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_ImplementationRepository::Administration *tao_impl,
       const char * server,
       const ::ImplementationRepository::StartupOptions & options
@@ -1861,7 +1862,7 @@ private:
 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_reregister_server (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
     const char * server,
     const ::ImplementationRepository::StartupOptions & options
@@ -1972,7 +1973,7 @@ class TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_serve
 public:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_ImplementationRepository::Administration *tao_impl,
       const char * server
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2024,7 +2025,7 @@ private:
 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_remove_server (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
     const char * server
     ACE_ENV_ARG_DECL_NOT_USED
@@ -2128,7 +2129,7 @@ class TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_ser
 public:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_ImplementationRepository::Administration *tao_impl,
       const char * server
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2180,7 +2181,7 @@ private:
 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server::TAO_ServerRequestInfo_ImplementationRepository_Administration_shutdown_server (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
     const char * server
     ACE_ENV_ARG_DECL_NOT_USED
@@ -2284,7 +2285,7 @@ class TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_ru
 public:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_ImplementationRepository::Administration *tao_impl,
       const char * server,
       const char * partial_ior,
@@ -2340,7 +2341,7 @@ private:
 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_running (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
     const char * server,
     const char * partial_ior,
@@ -2456,7 +2457,7 @@ class TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_sh
 public:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_ImplementationRepository::Administration *tao_impl,
       const char * server
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2508,7 +2509,7 @@ private:
 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down::TAO_ServerRequestInfo_ImplementationRepository_Administration_server_is_shutting_down (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
     const char * server
     ACE_ENV_ARG_DECL_NOT_USED
@@ -2612,7 +2613,7 @@ class TAO_ServerRequestInfo_ImplementationRepository_Administration_find : publi
 public:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_find (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_ImplementationRepository::Administration *tao_impl,
       const char * server
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2664,7 +2665,7 @@ private:
 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_find::TAO_ServerRequestInfo_ImplementationRepository_Administration_find (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
     const char * server
     ACE_ENV_ARG_DECL_NOT_USED
@@ -2768,7 +2769,7 @@ class TAO_ServerRequestInfo_ImplementationRepository_Administration_list : publi
 public:
   TAO_ServerRequestInfo_ImplementationRepository_Administration_list (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_ImplementationRepository::Administration *tao_impl,
       const ::CORBA::ULong & how_many      
 
@@ -2822,7 +2823,7 @@ private:
 
 TAO_ServerRequestInfo_ImplementationRepository_Administration_list::TAO_ServerRequestInfo_ImplementationRepository_Administration_list (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::Administration *tao_impl,
     const ::CORBA::ULong & how_many    
 
@@ -2960,7 +2961,7 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::disp
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -3620,9 +3621,9 @@ void POA_ImplementationRepository::Administration::activate_server_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -3751,9 +3752,9 @@ void POA_ImplementationRepository::Administration::register_server_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -3886,9 +3887,9 @@ void POA_ImplementationRepository::Administration::reregister_server_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -4019,9 +4020,9 @@ void POA_ImplementationRepository::Administration::remove_server_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -4148,9 +4149,9 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -4281,9 +4282,9 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -4418,9 +4419,9 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -4547,9 +4548,9 @@ void POA_ImplementationRepository::Administration::find_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -4697,9 +4698,9 @@ void POA_ImplementationRepository::Administration::list_skel (
     }
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
diff --git a/TAO/tao/PortableServer/ImplRepoS.h b/TAO/tao/ImR_Client/ImplRepoS.h
index 79524e52fe1..fa566c3ab7a 100644
--- a/TAO/tao/PortableServer/ImplRepoS.h
+++ b/TAO/tao/ImR_Client/ImplRepoS.h
@@ -33,7 +33,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/ServerObjectS.h"
+#include "tao/ImR_Client/ServerObjectS.h"
 #include "ImplRepoC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -70,7 +70,7 @@ namespace POA_ImplementationRepository
   class _TAO_ServerInformationIterator_Direct_Proxy_Impl;
   class _TAO_ServerInformationIterator_Strategized_Proxy_Broker;
   
-  class TAO_PortableServer_Export ServerInformationIterator
+  class TAO_IMR_Client_Export ServerInformationIterator
     : public virtual PortableServer::ServantBase
   {
   protected:
@@ -178,7 +178,7 @@ namespace POA_ImplementationRepository
   // TAO_IDL - Generated from
   // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
-  class TAO_PortableServer_Export _TAO_ServerInformationIterator_Strategized_Proxy_Broker
+  class TAO_IMR_Client_Export _TAO_ServerInformationIterator_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
   public: 
@@ -222,7 +222,7 @@ namespace POA_ImplementationRepository
   // TAO_IDL - Generated from
   // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
-  class TAO_PortableServer_Export _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl
+  class TAO_IMR_Client_Export _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl
   {
   public:
     _TAO_ServerInformationIterator_ThruPOA_Proxy_Impl (void);
@@ -269,7 +269,7 @@ namespace POA_ImplementationRepository
   //                    Direct  Impl. Declaration
   //
   
-  class TAO_PortableServer_Export _TAO_ServerInformationIterator_Direct_Proxy_Impl
+  class TAO_IMR_Client_Export _TAO_ServerInformationIterator_Direct_Proxy_Impl
   {
   public:
     _TAO_ServerInformationIterator_Direct_Proxy_Impl (void);
@@ -321,7 +321,7 @@ namespace POA_ImplementationRepository
   class _TAO_Administration_Direct_Proxy_Impl;
   class _TAO_Administration_Strategized_Proxy_Broker;
   
-  class TAO_PortableServer_Export Administration
+  class TAO_IMR_Client_Export Administration
     : public virtual PortableServer::ServantBase
   {
   protected:
@@ -573,7 +573,7 @@ namespace POA_ImplementationRepository
   // TAO_IDL - Generated from
   // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
-  class TAO_PortableServer_Export _TAO_Administration_Strategized_Proxy_Broker
+  class TAO_IMR_Client_Export _TAO_Administration_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
   public: 
@@ -617,7 +617,7 @@ namespace POA_ImplementationRepository
   // TAO_IDL - Generated from
   // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
-  class TAO_PortableServer_Export _TAO_Administration_ThruPOA_Proxy_Impl
+  class TAO_IMR_Client_Export _TAO_Administration_ThruPOA_Proxy_Impl
   {
   public:
     _TAO_Administration_ThruPOA_Proxy_Impl (void);
@@ -773,7 +773,7 @@ namespace POA_ImplementationRepository
   //                    Direct  Impl. Declaration
   //
   
-  class TAO_PortableServer_Export _TAO_Administration_Direct_Proxy_Impl
+  class TAO_IMR_Client_Export _TAO_Administration_Direct_Proxy_Impl
   {
   public:
     _TAO_Administration_Direct_Proxy_Impl (void);
diff --git a/TAO/tao/ImR_Client/ImplRepoS.inl b/TAO/tao/ImR_Client/ImplRepoS.inl
new file mode 100644
index 00000000000..c944d806c1f
--- /dev/null
+++ b/TAO/tao/ImR_Client/ImplRepoS.inl
@@ -0,0 +1,27 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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/ServerObject.pidl b/TAO/tao/ImR_Client/ServerObject.pidl
index 04612f36c56..9ed92faeb73 100644
--- a/TAO/tao/PortableServer/ServerObject.pidl
+++ b/TAO/tao/ImR_Client/ServerObject.pidl
@@ -10,11 +10,7 @@
  *
  * The command used to generate code from this file is:
  *
- *   tao_idl -Gp -Gd -Ge 1 -Sc -GT -o orig
- *       -Wb,export_macro=TAO_PortableServer_Export
- *       -Wb,export_include=portableserver_export.h
- *       -Wb,pre_include="ace/pre.h"
- *       -Wb,post_include="ace/post.h" ServerObject.pidl
+ *   tao_idl -Gp -Gd -Ge 1 -Sc -GT -Wb,export_macro=TAO_IMR_Client_Export -Wb,export_include=imr_client_export.h -Wb,pre_include="ace/pre.h" -Wb,post_include="ace/post.h" ServerObject.pidl
  *
  */
 //=============================================================================
diff --git a/TAO/tao/PortableServer/ServerObjectA.cpp b/TAO/tao/ImR_Client/ServerObjectA.cpp
index 714d2b0801b..714d2b0801b 100644
--- a/TAO/tao/PortableServer/ServerObjectA.cpp
+++ b/TAO/tao/ImR_Client/ServerObjectA.cpp
diff --git a/TAO/tao/PortableServer/ServerObjectC.cpp b/TAO/tao/ImR_Client/ServerObjectC.cpp
index 2980c26874e..5ba981694ba 100644
--- a/TAO/tao/PortableServer/ServerObjectC.cpp
+++ b/TAO/tao/ImR_Client/ServerObjectC.cpp
@@ -46,7 +46,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/PortableServer/ServerObjectC.h b/TAO/tao/ImR_Client/ServerObjectC.h
index 4d1c3cf25b3..2b7620c4918 100644
--- a/TAO/tao/PortableServer/ServerObjectC.h
+++ b/TAO/tao/ImR_Client/ServerObjectC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "portableserver_export.h"
+#include "imr_client_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -50,13 +50,13 @@
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
-#define TAO_EXPORT_MACRO TAO_PortableServer_Export
+#define TAO_EXPORT_MACRO TAO_IMR_Client_Export
 
 #if defined (TAO_EXPORT_NESTED_CLASSES)
 #  if defined (TAO_EXPORT_NESTED_MACRO)
 #    undef TAO_EXPORT_NESTED_MACRO
 #  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
+#  define TAO_EXPORT_NESTED_MACRO TAO_IMR_Client_Export
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
@@ -114,7 +114,7 @@ namespace ImplementationRepository
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT_CH_
   
-  class TAO_PortableServer_Export ServerObject
+  class TAO_IMR_Client_Export ServerObject
     : public virtual CORBA::Object
   {
   public:
@@ -223,7 +223,7 @@ namespace ImplementationRepository
 // TAO_IDL - Generated from
 // be\be_visitor_root/root.cpp:120
 
-extern TAO_PortableServer_Export
+extern TAO_IMR_Client_Export
 TAO::Collocation_Proxy_Broker *
 (*ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
@@ -240,7 +240,7 @@ namespace TAO
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_PortableServer_Export Objref_Traits< ::ImplementationRepository::ServerObject>
+  struct TAO_IMR_Client_Export Objref_Traits< ::ImplementationRepository::ServerObject>
   {
     static ::ImplementationRepository::ServerObject_ptr duplicate (
         ::ImplementationRepository::ServerObject_ptr
@@ -261,15 +261,15 @@ namespace TAO
 // TAO_IDL - Generated from
 // 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_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr); // copying
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr *); // non-copying
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerObject_ptr &);
 
 // TAO_IDL - Generated from
 // 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_IMR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const ImplementationRepository::ServerObject_ptr );
+TAO_IMR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, ImplementationRepository::ServerObject_ptr &);
 
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:961
diff --git a/TAO/tao/PortableServer/ServerObjectC.inl b/TAO/tao/ImR_Client/ServerObjectC.inl
index 7e8263d8d30..7e8263d8d30 100644
--- a/TAO/tao/PortableServer/ServerObjectC.inl
+++ b/TAO/tao/ImR_Client/ServerObjectC.inl
diff --git a/TAO/tao/PortableServer/ServerObjectS.cpp b/TAO/tao/ImR_Client/ServerObjectS.cpp
index d9fd6bd5281..f8ebdd3ea44 100644
--- a/TAO/tao/PortableServer/ServerObjectS.cpp
+++ b/TAO/tao/ImR_Client/ServerObjectS.cpp
@@ -34,7 +34,8 @@
 
 
 #include "ServerObjectS.h"
-#include "tao/PortableServer/Object_Adapter.h"
+#include "tao/PortableServer/Servant_Upcall.h"
+#include "tao/PortableServer/ForwardRequestC.h"
 #include "tao/PortableServer/Operation_Table.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/ORB_Core.h"
@@ -66,7 +67,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -88,7 +89,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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)
 {
@@ -200,7 +201,7 @@ class TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping : public
 public:
   TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_ImplementationRepository::ServerObject *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -250,7 +251,7 @@ private:
 
 TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_ping (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::ServerObject *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -329,7 +330,7 @@ class TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown : pub
 public:
   TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_ImplementationRepository::ServerObject *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -379,7 +380,7 @@ private:
 
 TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown::TAO_ServerRequestInfo_ImplementationRepository_ServerObject_shutdown (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_ImplementationRepository::ServerObject *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -504,7 +505,7 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::dispat
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -764,9 +765,9 @@ void POA_ImplementationRepository::ServerObject::ping_skel (
   
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -880,9 +881,9 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel (
   
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
diff --git a/TAO/tao/PortableServer/ServerObjectS.h b/TAO/tao/ImR_Client/ServerObjectS.h
index d11db240010..5612a1bc713 100644
--- a/TAO/tao/PortableServer/ServerObjectS.h
+++ b/TAO/tao/ImR_Client/ServerObjectS.h
@@ -69,7 +69,7 @@ namespace POA_ImplementationRepository
   class _TAO_ServerObject_Direct_Proxy_Impl;
   class _TAO_ServerObject_Strategized_Proxy_Broker;
   
-  class TAO_PortableServer_Export ServerObject
+  class TAO_IMR_Client_Export ServerObject
     : public virtual PortableServer::ServantBase
   {
   protected:
@@ -175,7 +175,7 @@ namespace POA_ImplementationRepository
   // TAO_IDL - Generated from
   // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
   
-  class TAO_PortableServer_Export _TAO_ServerObject_Strategized_Proxy_Broker
+  class TAO_IMR_Client_Export _TAO_ServerObject_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
   public: 
@@ -219,7 +219,7 @@ namespace POA_ImplementationRepository
   // TAO_IDL - Generated from
   // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
   
-  class TAO_PortableServer_Export _TAO_ServerObject_ThruPOA_Proxy_Impl
+  class TAO_IMR_Client_Export _TAO_ServerObject_ThruPOA_Proxy_Impl
   {
   public:
     _TAO_ServerObject_ThruPOA_Proxy_Impl (void);
@@ -266,7 +266,7 @@ namespace POA_ImplementationRepository
   //                    Direct  Impl. Declaration
   //
   
-  class TAO_PortableServer_Export _TAO_ServerObject_Direct_Proxy_Impl
+  class TAO_IMR_Client_Export _TAO_ServerObject_Direct_Proxy_Impl
   {
   public:
     _TAO_ServerObject_Direct_Proxy_Impl (void);
diff --git a/TAO/tao/ImR_Client/ServerObjectS.inl b/TAO/tao/ImR_Client/ServerObjectS.inl
new file mode 100644
index 00000000000..c944d806c1f
--- /dev/null
+++ b/TAO/tao/ImR_Client/ServerObjectS.inl
@@ -0,0 +1,27 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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/ImplRepo_i.cpp b/TAO/tao/ImR_Client/ServerObject_i.cpp
index 4de7a2ece9e..fad07c11dca 100644
--- a/TAO/tao/PortableServer/ImplRepo_i.cpp
+++ b/TAO/tao/ImR_Client/ServerObject_i.cpp
@@ -5,9 +5,8 @@
 ///
 /// ImplRepo related.
 ///
-#if (TAO_HAS_MINIMUM_CORBA == 0)
 
-#include "tao/PortableServer/ImplRepo_i.h"
+#include "tao/ImR_Client/ServerObject_i.h"
 
 ServerObject_i::ServerObject_i (CORBA::ORB_ptr orb,
                                 PortableServer::POA_ptr poa)
@@ -36,4 +35,3 @@ ServerObject_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ImplRepo_i.h b/TAO/tao/ImR_Client/ServerObject_i.h
index fa15f3c0646..e1266d1e8db 100644
--- a/TAO/tao/PortableServer/ImplRepo_i.h
+++ b/TAO/tao/ImR_Client/ServerObject_i.h
@@ -1,6 +1,6 @@
 //=============================================================================
 /**
- *  @file    ImplRepo_i.h
+ *  @file    ServerObject_i.h
  *
  *  $Id$
  *
@@ -12,14 +12,15 @@
 #define TAO_IMPLREPO_I_H
 
 #include /**/ "ace/pre.h"
-#include "tao/orbconf.h"
+
+#include "tao/ORB.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/ServerObjectS.h"
-#include "tao/ORB.h"
+#include "tao/ImR_Client/ServerObjectS.h"
+#include "tao/ImR_Client/imr_client_export.h"
 
 /**
  * @class ServerObject_i
@@ -30,18 +31,17 @@
  * \nosubgrouping
  *
  **/
-class TAO_PortableServer_Export ServerObject_i
+class TAO_IMR_Client_Export ServerObject_i
   : public POA_ImplementationRepository::ServerObject,
     public PortableServer::RefCountServantBase
 {
 public:
-
   /// Constructor.
   ServerObject_i (CORBA::ORB_ptr orb,
                   PortableServer::POA_ptr poa);
 
   /// Ping method.
-  void ping (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  void ping (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Shutdown the server.
@@ -49,7 +49,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Returns the default POA for this servant.
-  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
 
 protected:
   /// Our ORB.  We need this member in case we need to shutdown the
diff --git a/TAO/tao/ImR_Client/TAO_IMR_Client.rc b/TAO/tao/ImR_Client/TAO_IMR_Client.rc
new file mode 100644
index 00000000000..64272160de5
--- /dev/null
+++ b/TAO/tao/ImR_Client/TAO_IMR_Client.rc
@@ -0,0 +1,30 @@
+#include "..\Version.h"
+
+1 VERSIONINFO
+ FILEVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ PRODUCTVERSION TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"
+        BEGIN
+            VALUE "FileDescription", "IMR_Client\0"
+            VALUE "FileVersion", TAO_VERSION "\0"
+            VALUE "InternalName", "TAO_IMR_ClientDLL\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "TAO_IMR_Client.DLL\0"
+            VALUE "ProductName", "TAO\0"
+            VALUE "ProductVersion", TAO_VERSION "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
diff --git a/TAO/tao/ImR_Client/imr_client_export.h b/TAO/tao/ImR_Client/imr_client_export.h
new file mode 100644
index 00000000000..be4ed299190
--- /dev/null
+++ b/TAO/tao/ImR_Client/imr_client_export.h
@@ -0,0 +1,39 @@
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl
+// ------------------------------
+#ifndef TAO_IMR_CLIENT_EXPORT_H
+#define TAO_IMR_CLIENT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (TAO_AS_STATIC_LIBS)
+#  if !defined (TAO_IMR_CLIENT_HAS_DLL)
+#    define TAO_IMR_CLIENT_HAS_DLL 0
+#  endif /* ! TAO_IMR_CLIENT_HAS_DLL */
+#else
+#  if !defined (TAO_IMR_CLIENT_HAS_DLL)
+#    define TAO_IMR_CLIENT_HAS_DLL 1
+#  endif /* ! TAO_IMR_CLIENT_HAS_DLL */
+#endif
+
+#if defined (TAO_IMR_CLIENT_HAS_DLL) && (TAO_IMR_CLIENT_HAS_DLL == 1)
+#  if defined (TAO_IMR_CLIENT_BUILD_DLL)
+#    define TAO_IMR_Client_Export ACE_Proper_Export_Flag
+#    define TAO_IMR_CLIENT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define TAO_IMR_CLIENT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* TAO_IMR_CLIENT_BUILD_DLL */
+#    define TAO_IMR_Client_Export ACE_Proper_Import_Flag
+#    define TAO_IMR_CLIENT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define TAO_IMR_CLIENT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* TAO_IMR_CLIENT_BUILD_DLL */
+#else /* TAO_IMR_CLIENT_HAS_DLL == 1 */
+#  define TAO_IMR_Client_Export
+#  define TAO_IMR_CLIENT_SINGLETON_DECLARATION(T)
+#  define TAO_IMR_CLIENT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* TAO_IMR_CLIENT_HAS_DLL == 1 */
+
+#endif /* TAO_IMR_CLIENT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp
index 6331f852eca..ceac1257dd7 100644
--- a/TAO/tao/Invocation_Adapter.cpp
+++ b/TAO/tao/Invocation_Adapter.cpp
@@ -135,7 +135,7 @@ namespace TAO
     if (stub == 0)
       ACE_THROW_RETURN (CORBA::INTERNAL (
                           CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             EINVAL),
                           CORBA::COMPLETED_NO),
                         stub);
@@ -195,7 +195,7 @@ namespace TAO
         {
           // Grab the syncscope policy from the ORB.
           Messaging::SyncScope sync_scope;
-    
+
           bool has_synchronization = false;
 
           stub->orb_core ()->call_sync_scope_hook (stub,
@@ -287,7 +287,7 @@ namespace TAO
       {
         ACE_THROW_RETURN (CORBA::INTERNAL (
             CORBA::SystemException::_tao_minor_code (
-                TAO_DEFAULT_MINOR_CODE,
+                TAO::VMCID,
                 EINVAL),
             CORBA::COMPLETED_NO),
                           TAO_INVOKE_FAILURE);
diff --git a/TAO/tao/LocateRequest_Invocation.cpp b/TAO/tao/LocateRequest_Invocation.cpp
index 45e7c44dae7..0c4e686ec24 100644
--- a/TAO/tao/LocateRequest_Invocation.cpp
+++ b/TAO/tao/LocateRequest_Invocation.cpp
@@ -48,7 +48,7 @@ namespace TAO
         // to call the interceptors in this case?
         this->resolver_.transport ()->close_connection ();
 
-        ACE_THROW_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE,
+        ACE_THROW_RETURN (CORBA::INTERNAL (TAO::VMCID,
                                            CORBA::COMPLETED_NO),
                           TAO_INVOKE_FAILURE);
       }
@@ -127,7 +127,7 @@ namespace TAO
       case TAO_GIOP_OBJECT_HERE:
         break;
       case TAO_GIOP_UNKNOWN_OBJECT:
-        ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (TAO_DEFAULT_MINOR_CODE,
+        ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (TAO::VMCID,
                                                    CORBA::COMPLETED_YES),
                           TAO_INVOKE_FAILURE);
       case TAO_GIOP_OBJECT_FORWARD:
@@ -144,14 +144,14 @@ namespace TAO
             {
               // Could not demarshal the exception id, raise a local
               // CORBA::MARSHAL exception.
-              ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
+              ACE_THROW_RETURN (CORBA::MARSHAL (TAO::VMCID,
                                                 CORBA::COMPLETED_MAYBE),
                                 TAO_INVOKE_SYSTEM_EXCEPTION);
             }
 
           // This kind of exception shouldn't happen with locate requests,
           // but if it does, we turn it into a CORBA::UNKNOWN exception.
-          ACE_THROW_RETURN (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE,
+          ACE_THROW_RETURN (CORBA::UNKNOWN (TAO::VMCID,
                                             CORBA::COMPLETED_YES),
                             TAO_INVOKE_SYSTEM_EXCEPTION);
         }
@@ -166,7 +166,7 @@ namespace TAO
             {
               // Could not demarshal the addressing disposition, raise a local
               // CORBA::MARSHAL exception.
-              ACE_THROW_RETURN (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
+              ACE_THROW_RETURN (CORBA::MARSHAL (TAO::VMCID,
                                                 CORBA::COMPLETED_MAYBE),
                                 TAO_INVOKE_SUCCESS);
             }
diff --git a/TAO/tao/LongDoubleSeqC.cpp b/TAO/tao/LongDoubleSeqC.cpp
index df01e61cbed..27c20dd5342 100644
--- a/TAO/tao/LongDoubleSeqC.cpp
+++ b/TAO/tao/LongDoubleSeqC.cpp
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -121,7 +121,7 @@ CORBA::Boolean operator<< (
       return strm.write_longdouble_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -138,7 +138,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -147,7 +147,7 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
@@ -155,7 +155,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_LongDoubleSeq_CPP_ */
diff --git a/TAO/tao/LongDoubleSeqC.inl b/TAO/tao/LongDoubleSeqC.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/tao/LongDoubleSeqC.inl
+++ b/TAO/tao/LongDoubleSeqC.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/tao/LongLongSeqC.cpp b/TAO/tao/LongLongSeqC.cpp
index 1756c99a188..5fd9b898126 100644
--- a/TAO/tao/LongLongSeqC.cpp
+++ b/TAO/tao/LongLongSeqC.cpp
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -121,7 +121,7 @@ CORBA::Boolean operator<< (
       return strm.write_longlong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -138,7 +138,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -147,7 +147,7 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
@@ -155,7 +155,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_LongLongSeq_CPP_ */
diff --git a/TAO/tao/LongLongSeqC.inl b/TAO/tao/LongLongSeqC.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/tao/LongLongSeqC.inl
+++ b/TAO/tao/LongLongSeqC.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/tao/LongSeqC.cpp b/TAO/tao/LongSeqC.cpp
index 4773d1f8cc6..4c7ea32de2a 100644
--- a/TAO/tao/LongSeqC.cpp
+++ b/TAO/tao/LongSeqC.cpp
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -121,7 +121,7 @@ CORBA::Boolean operator<< (
       return strm.write_long_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -138,7 +138,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -147,7 +147,7 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
@@ -155,7 +155,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_LongSeq_CPP_ */
diff --git a/TAO/tao/LongSeqC.h b/TAO/tao/LongSeqC.h
index 3ad6d008478..106b9fe567b 100644
--- a/TAO/tao/LongSeqC.h
+++ b/TAO/tao/LongSeqC.h
@@ -166,7 +166,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_LongSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:963
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "LongSeqC.inl"
diff --git a/TAO/tao/Messaging/Asynch_Invocation.cpp b/TAO/tao/Messaging/Asynch_Invocation.cpp
index 54a0c858293..5bf1ea0cd8c 100644
--- a/TAO/tao/Messaging/Asynch_Invocation.cpp
+++ b/TAO/tao/Messaging/Asynch_Invocation.cpp
@@ -84,7 +84,7 @@ namespace TAO
           {
             // @@ What is the right way to handle this error? Do we need
             // to call the interceptors in this case?
-            ACE_THROW_RETURN (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE,
+            ACE_THROW_RETURN (CORBA::INTERNAL (TAO::VMCID,
                                                CORBA::COMPLETED_NO),
                               TAO_INVOKE_FAILURE);
           }
diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
index 5255a103b05..26e003f138d 100644
--- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
+++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
@@ -122,7 +122,7 @@ namespace TAO
       {
         ACE_THROW_RETURN (CORBA::INTERNAL (
             CORBA::SystemException::_tao_minor_code (
-                TAO_DEFAULT_MINOR_CODE,
+                TAO::VMCID,
                 EINVAL),
             CORBA::COMPLETED_NO),
                           TAO_INVOKE_FAILURE);
diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
index 2c41b47dee5..b1677a2689d 100644
--- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
+++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
@@ -130,7 +130,7 @@ TAO_ConnectionTimeoutPolicy::create (const CORBA::Any& val
   TAO_ConnectionTimeoutPolicy *tmp;
   ACE_NEW_THROW_EX (tmp,
                     TAO_ConnectionTimeoutPolicy (value),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
@@ -156,7 +156,7 @@ TAO_ConnectionTimeoutPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
   TAO_ConnectionTimeoutPolicy* tmp = 0;
   ACE_NEW_THROW_EX (tmp,
                     TAO_ConnectionTimeoutPolicy (*this),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
diff --git a/TAO/tao/Messaging/Messaging.cpp b/TAO/tao/Messaging/Messaging.cpp
index b0a00748339..d01dee14bf9 100644
--- a/TAO/tao/Messaging/Messaging.cpp
+++ b/TAO/tao/Messaging/Messaging.cpp
@@ -41,7 +41,7 @@ TAO_Messaging_Initializer::init (void)
                         TAO_Messaging_ORBInitializer,
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
       ACE_TRY_CHECK;
@@ -87,7 +87,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data,
     {
       // Could not demarshal the exception id, raise a local
       // CORBA::MARSHAL
-      ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
+      ACE_THROW (CORBA::MARSHAL (TAO::VMCID,
                                  CORBA::COMPLETED_YES));
     }
 
@@ -97,7 +97,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data,
       CORBA::ULong completion = 0;
       if ((_tao_in >> minor) == 0 ||
           (_tao_in >> completion) == 0)
-        ACE_THROW (CORBA::MARSHAL (TAO_DEFAULT_MINOR_CODE,
+        ACE_THROW (CORBA::MARSHAL (TAO::VMCID,
                                    CORBA::COMPLETED_MAYBE));
       CORBA::SystemException* exception =
         TAO_Exceptions::create_system_exception (type_id.in ()
@@ -134,7 +134,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data,
       CORBA::Exception *exception = exception_data[i].alloc ();
 
       if (exception == 0)
-        ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+        ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID,
                                      CORBA::COMPLETED_YES));
       exception->_tao_decode (_tao_in ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
@@ -154,6 +154,6 @@ exception_holder_raise (TAO::Exception_Data *exception_data,
   // @@ It would seem like if the remote exception is a
   //    UserException we can assume that the request was
   //    completed.
-  ACE_THROW (CORBA::UNKNOWN (TAO_DEFAULT_MINOR_CODE,
+  ACE_THROW (CORBA::UNKNOWN (TAO::VMCID,
                              CORBA::COMPLETED_YES));
 }
diff --git a/TAO/tao/Messaging/Messaging.pidl b/TAO/tao/Messaging/Messaging.pidl
index 5bcfade5803..a0d26802619 100644
--- a/TAO/tao/Messaging/Messaging.pidl
+++ b/TAO/tao/Messaging/Messaging.pidl
@@ -11,7 +11,7 @@
  * The command used to generate code from this file is:
  *
  *   tao_idl
- *        -o orig -Gp -Gd -GT -Ge 1
+ *        -o orig -Gp -Gd -GT -Ge 1 -GA
  *        -Wb,export_macro=TAO_Messaging_Export
  *        -Wb,export_include=messaging_export.h
  *        -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/Messaging/MessagingA.cpp b/TAO/tao/Messaging/MessagingA.cpp
index cadc3e92d62..4c9b29762ad 100644
--- a/TAO/tao/Messaging/MessagingA.cpp
+++ b/TAO/tao/Messaging/MessagingA.cpp
@@ -38,65 +38,65 @@ static const CORBA::Long _oc_Messaging_ExceptionHolder[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   42,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x4d657373),
-  ACE_NTOHL (0x6167696e),
-  ACE_NTOHL (0x672f4578),
-  ACE_NTOHL (0x63657074),
-  ACE_NTOHL (0x696f6e48),
-  ACE_NTOHL (0x6f6c6465),
-  ACE_NTOHL (0x723a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f4578), 
+  ACE_NTOHL (0x63657074), 
+  ACE_NTOHL (0x696f6e48), 
+  ACE_NTOHL (0x6f6c6465), 
+  ACE_NTOHL (0x723a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/Messaging/ExceptionHolder:1.0
     16,
-  ACE_NTOHL (0x45786365),
-  ACE_NTOHL (0x7074696f),
-  ACE_NTOHL (0x6e486f6c),
+  ACE_NTOHL (0x45786365), 
+  ACE_NTOHL (0x7074696f), 
+  ACE_NTOHL (0x6e486f6c), 
   ACE_NTOHL (0x64657200),  // name = ExceptionHolder
     0, // value modifier
   CORBA::tk_null, // no stateful base valuetype
 
 3, // member count
     20,
-  ACE_NTOHL (0x69735f73),
-  ACE_NTOHL (0x79737465),
-  ACE_NTOHL (0x6d5f6578),
-  ACE_NTOHL (0x63657074),
+  ACE_NTOHL (0x69735f73), 
+  ACE_NTOHL (0x79737465), 
+  ACE_NTOHL (0x6d5f6578), 
+  ACE_NTOHL (0x63657074), 
   ACE_NTOHL (0x696f6e00),  // name = is_system_exception
     CORBA::tk_boolean,
 
   1, // data member visibility marker
 
   11,
-  ACE_NTOHL (0x62797465),
-  ACE_NTOHL (0x5f6f7264),
+  ACE_NTOHL (0x62797465), 
+  ACE_NTOHL (0x5f6f7264), 
   ACE_NTOHL (0x65720000),  // name = byte_order
     CORBA::tk_boolean,
 
   1, // data member visibility marker
 
   20,
-  ACE_NTOHL (0x6d617273),
-  ACE_NTOHL (0x68616c65),
-  ACE_NTOHL (0x645f6578),
-  ACE_NTOHL (0x63657074),
+  ACE_NTOHL (0x6d617273), 
+  ACE_NTOHL (0x68616c65), 
+  ACE_NTOHL (0x645f6578), 
+  ACE_NTOHL (0x63657074), 
   ACE_NTOHL (0x696f6e00),  // name = marshaled_exception
     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
@@ -131,20 +131,20 @@ static const CORBA::Long _oc_Messaging_ReplyHandler[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   39,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x4d657373),
-  ACE_NTOHL (0x6167696e),
-  ACE_NTOHL (0x672f5265),
-  ACE_NTOHL (0x706c7948),
-  ACE_NTOHL (0x616e646c),
-  ACE_NTOHL (0x65723a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x4d657373), 
+  ACE_NTOHL (0x6167696e), 
+  ACE_NTOHL (0x672f5265), 
+  ACE_NTOHL (0x706c7948), 
+  ACE_NTOHL (0x616e646c), 
+  ACE_NTOHL (0x65723a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/Messaging/ReplyHandler:1.0
     13,
-  ACE_NTOHL (0x5265706c),
-  ACE_NTOHL (0x7948616e),
-  ACE_NTOHL (0x646c6572),
+  ACE_NTOHL (0x5265706c), 
+  ACE_NTOHL (0x7948616e), 
+  ACE_NTOHL (0x646c6572), 
   ACE_NTOHL (0x0),  // name = ReplyHandler
   };
 
diff --git a/TAO/tao/Messaging/MessagingS.cpp b/TAO/tao/Messaging/MessagingS.cpp
index 20495ce97a6..295d4ce280c 100644
--- a/TAO/tao/Messaging/MessagingS.cpp
+++ b/TAO/tao/Messaging/MessagingS.cpp
@@ -34,7 +34,8 @@
 
 
 #include "MessagingS.h"
-#include "tao/PortableServer/Object_Adapter.h"
+#include "tao/PortableServer/Servant_Upcall.h"
+#include "tao/PortableServer/ForwardRequestC.h"
 #include "tao/PortableServer/Operation_Table.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/ORB_Core.h"
@@ -87,7 +88,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0,0 -a -o -t -p -K opname_ -L C++ -Z TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_Messaging_ReplyHandler_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -241,7 +242,7 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
diff --git a/TAO/tao/Messaging/MessagingS.h b/TAO/tao/Messaging/MessagingS.h
index 3e56fcfabeb..d9145954059 100644
--- a/TAO/tao/Messaging/MessagingS.h
+++ b/TAO/tao/Messaging/MessagingS.h
@@ -60,105 +60,105 @@
 
 namespace POA_Messaging
 {
-
-
+  
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_sh.cpp:87
-
+  
   class ReplyHandler;
   typedef ReplyHandler *ReplyHandler_ptr;
-
+  
   class _TAO_ReplyHandler_ThruPOA_Proxy_Impl;
   class _TAO_ReplyHandler_Direct_Proxy_Impl;
   class _TAO_ReplyHandler_Strategized_Proxy_Broker;
-
+  
   class TAO_Messaging_Export ReplyHandler
     : public virtual PortableServer::ServantBase
   {
   protected:
     ReplyHandler (void);
-
+  
   public:
     // Useful for template programming.
     typedef ::Messaging::ReplyHandler _stub_type;
     typedef ::Messaging::ReplyHandler_ptr _stub_ptr_type;
     typedef ::Messaging::ReplyHandler_var _stub_var_type;
-
+    
     ReplyHandler (const ReplyHandler& rhs);
     virtual ~ReplyHandler (void);
-
+    
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual void* _downcast (
         const char* logical_type_id
       );
-
+    
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *servant,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     static void _component_skel (
         TAO_ServerRequest &req,
         void *obj,
         void *servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     virtual void _dispatch (
         TAO_ServerRequest &req,
         void *_servant_upcall
         ACE_ENV_ARG_DECL
       );
-
+    
     ::Messaging::ReplyHandler *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     virtual const char* _interface_repository_id (void) const;
   };
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration
+  //               Strategized Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-
+  
   class TAO_Messaging_Export _TAO_ReplyHandler_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
-  public:
+  public: 
     _TAO_ReplyHandler_Strategized_Proxy_Broker (void);
-
+    
     virtual ~_TAO_ReplyHandler_Strategized_Proxy_Broker (void);
-
+    
     TAO::Collocation_Strategy
     get_strategy (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::SystemException));
-
+    
     void
     dispatch (
         CORBA::Object_ptr obj,
@@ -171,31 +171,31 @@ namespace POA_Messaging
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((CORBA::Exception));
-
+    
     static _TAO_ReplyHandler_Strategized_Proxy_Broker *
     the_TAO_ReplyHandler_Strategized_Proxy_Broker (void);
   };
-
+  
   //
-  //            End Strategized Proxy Broker Declaration
+  //            End Strategized Proxy Broker Declaration 
   ///////////////////////////////////////////////////////////////////////
-
-
+  
+  
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA Proxy Impl. Declaration
   //
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/thru_poa_proxy_impl_sh.cpp:37
-
+  
   class TAO_Messaging_Export _TAO_ReplyHandler_ThruPOA_Proxy_Impl
   {
   public:
     _TAO_ReplyHandler_ThruPOA_Proxy_Impl (void);
-
+    
     virtual ~_TAO_ReplyHandler_ThruPOA_Proxy_Impl (void) {}
   };
-
+  
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
@@ -229,7 +229,6 @@ namespace POA_Messaging
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:997
 
-#include "MessagingS_T.h"
 
 #if defined (__ACE_INLINE__)
 #include "MessagingS.inl"
diff --git a/TAO/tao/Messaging/Messaging_No_Impl.pidl b/TAO/tao/Messaging/Messaging_No_Impl.pidl
index f516a6528e9..39d3bdd5d2c 100644
--- a/TAO/tao/Messaging/Messaging_No_Impl.pidl
+++ b/TAO/tao/Messaging/Messaging_No_Impl.pidl
@@ -13,7 +13,7 @@
  * The command used to generate code from this file is:
  *
  *   tao_idl
- *        -o orig -Gp -Gd -Ge 1 -GT -Sc
+ *        -o orig -Gp -Gd -Ge 1 -GT -Sc -GA
  *        -Wb,export_macro=TAO_Messaging_Export
  *        -Wb,export_include=messaging_export.h
  *        -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp
index 9e12f86dd52..035887d4f7a 100644
--- a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp
+++ b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp
@@ -60,7 +60,7 @@ TAO_Messaging_ORBInitializer::register_policy_factories (
                         TAO_Messaging_PolicyFactory,
                           CORBA::NO_MEMORY (
                             CORBA::SystemException::_tao_minor_code (
-                              TAO_DEFAULT_MINOR_CODE,
+                              TAO::VMCID,
                               ENOMEM),
                             CORBA::COMPLETED_NO));
       ACE_CHECK;
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp
index eeac1f611ee..ede4f4ec4bd 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.cpp
+++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp
@@ -129,7 +129,7 @@ TAO_RelativeRoundtripTimeoutPolicy::create (const CORBA::Any& val
   TAO_RelativeRoundtripTimeoutPolicy *tmp;
   ACE_NEW_THROW_EX (tmp,
                     TAO_RelativeRoundtripTimeoutPolicy (value),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
@@ -155,7 +155,7 @@ TAO_RelativeRoundtripTimeoutPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
 
   TAO_RelativeRoundtripTimeoutPolicy* tmp;
   ACE_NEW_THROW_EX (tmp, TAO_RelativeRoundtripTimeoutPolicy (*this),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
diff --git a/TAO/tao/Messaging/Messaging_RT_Policy.pidl b/TAO/tao/Messaging/Messaging_RT_Policy.pidl
index f8c27c89e00..b9b26e80e0a 100644
--- a/TAO/tao/Messaging/Messaging_RT_Policy.pidl
+++ b/TAO/tao/Messaging/Messaging_RT_Policy.pidl
@@ -12,7 +12,7 @@
  * The command used to generate code from this file is:
  *
  *   tao_idl
- *        -o orig -Gp -Gd -Ge 1 -Sc
+ *        -o orig -Gp -Gd -Ge 1 -Sc -GA
  *        -Wb,export_macro=TAO_Messaging_Export
  *        -Wb,export_include=messaging_export.h
  *        -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl b/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl
index 1a1eabdcaaf..f636293b389 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl
+++ b/TAO/tao/Messaging/Messaging_SyncScope_Policy.pidl
@@ -12,7 +12,7 @@
  * The command used to generate code from this file is:
  *
  *   tao_idl
- *        -o orig -Gp -Gd -Ge 1 -GT -Sc
+ *        -o orig -Gp -Gd -Ge 1 -GT -Sc -GA
  *        -Wb,export_macro=TAO_Messaging_Export
  *        -Wb,export_include=messaging_export.h
  *        -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/Messaging/TAO_Ext.pidl b/TAO/tao/Messaging/TAO_Ext.pidl
index a70a56b4232..430f833f1bb 100644
--- a/TAO/tao/Messaging/TAO_Ext.pidl
+++ b/TAO/tao/Messaging/TAO_Ext.pidl
@@ -15,7 +15,7 @@
  *   this is:
  *
  *   tao_idl
- *       -o orig -Gp -Gd -Ge 1 -GT -Sc
+ *       -o orig -Gp -Gd -Ge 1 -GT -Sc -GA
  *       -Wb,export_macro=TAO_Messaging_Export
  *       -Wb,export_include=messaging_export.h
  *       -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/Messaging/diffs/Messaging.diff b/TAO/tao/Messaging/diffs/Messaging.diff
index 5774394ccd6..f50e9f94f4e 100644
--- a/TAO/tao/Messaging/diffs/Messaging.diff
+++ b/TAO/tao/Messaging/diffs/Messaging.diff
@@ -1,5 +1,5 @@
---- orig/MessagingC.h	2005-02-07 11:55:22.321433600 +0100
-+++ MessagingC.h	2005-02-07 11:52:07.681555200 +0100
+--- orig/MessagingC.h	2005-02-14 10:51:00.842680000 +0100
++++ MessagingC.h	2005-02-14 10:51:01.093040000 +0100
 @@ -36,6 +36,10 @@
  
  #include "ace/config-all.h"
@@ -11,8 +11,8 @@
  #if !defined (ACE_LACKS_PRAGMA_ONCE)
  # pragma once
  #endif /* ACE_LACKS_PRAGMA_ONCE */
---- orig/MessagingC.cpp	2005-02-07 11:55:22.321433600 +0100
-+++ MessagingC.cpp	2005-02-07 11:52:41.349968000 +0100
+--- orig/MessagingC.cpp	2005-02-14 10:51:00.842680000 +0100
++++ MessagingC.cpp	2005-02-14 10:51:01.103054400 +0100
 @@ -29,7 +29,7 @@
  // be\be_codegen.cpp:302
  
@@ -22,8 +22,8 @@
  #include "tao/CDR.h"
  #include "tao/Object_T.h"
  #include "tao/ORB_Core.h"
---- orig/MessagingA.cpp	2005-02-07 11:55:22.321433600 +0100
-+++ MessagingA.cpp	2005-02-07 12:00:18.076708800 +0100
+--- orig/MessagingA.cpp	2005-02-14 10:51:00.842680000 +0100
++++ MessagingA.cpp	2005-02-14 10:51:01.123083200 +0100
 @@ -25,7 +25,7 @@
  // Information about TAO is available at:
  //     http://www.cs.wustl.edu/~schmidt/TAO.html
@@ -33,3 +33,16 @@
  #include "tao/Typecode.h"
  #include "tao/CDR.h"
  #include "tao/Any.h"
+--- orig/MessagingS.h	2005-02-14 10:51:00.842680000 +0100
++++ MessagingS.h	2005-02-14 10:52:20.537275200 +0100
+@@ -34,9 +34,7 @@
+ #include /**/ "ace/pre.h"
+ 
+ #include "tao/PollableS.h"
+-#include "tao/Messaging/Messaging_SyncScope_PolicyS.h"
+-#include "tao/Messaging/Messaging_RT_PolicyS.h"
+-#include "tao/Messaging/Messaging_No_ImplS.h"
++#include "tao/Messaging/Messaging.h"
+ #include "tao/OctetSeqS.h"
+ #include "MessagingC.h"
+ 
diff --git a/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff b/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff
index 9a3fa46b6eb..9f7d316dede 100644
--- a/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff
+++ b/TAO/tao/Messaging/diffs/Messaging_No_Impl.diff
@@ -1,5 +1,5 @@
---- orig/Messaging_No_ImplC.h	2005-02-07 11:50:46.665059200 +0100
-+++ Messaging_No_ImplC.h	2005-02-07 11:53:22.098561600 +0100
+--- orig/Messaging_No_ImplC.h	2005-02-14 10:50:59.911340800 +0100
++++ Messaging_No_ImplC.h	2005-02-14 10:51:01.193184000 +0100
 @@ -52,6 +52,11 @@
  #include "tao/PolicyC.h"
  #include "tao/PollableC.h"
diff --git a/TAO/tao/Messaging_PolicyValue.pidl b/TAO/tao/Messaging_PolicyValue.pidl
index c52bf4637c4..cfb4fc047fc 100644
--- a/TAO/tao/Messaging_PolicyValue.pidl
+++ b/TAO/tao/Messaging_PolicyValue.pidl
@@ -4,7 +4,7 @@
  *
  *  $Id$
  *
- * This file was used to generate the code in Messaging_PolicyValueC.{h,i,cpp}
+ * This file was used to generate the code in Messaging_PolicyValueC.{h,inl,cpp}
  *
  * The command used to generate code from this file is:
  *
@@ -16,24 +16,12 @@
  *        -Wb,post_include="ace/post.h"
  *        Messaging_PolicyValue.pidl
  *
- * after the file is generated a patch must be applied:
- *
- *   cp orig/Messaging_PolicyValueC.{h,i,cpp} .
- *   patch < diffs/Messaging_PolicyValue.diff
- *
- * The patch eliminates cycles in the include dependencies.
- *
- * Note: to update the patch file after re-generating the code use:
- *
- *   for i in Messaging_PolicyValueC.{h,i,cpp}; do
- *     diff -uBbw orig/$i $i;
- *   done > diffs/Messaging_PolicyValue.diff
- *
  */
 #ifndef TAO_MESSAGING_POLICYVALUE_PIDL
 #define TAO_MESSAGING_POLICYVALUE_PIDL
 
-#include <IOP.pidl>
+#include <IOP_IOR.pidl>
+#include <Policy_Forward.pidl>
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/Messaging_PolicyValueC.cpp b/TAO/tao/Messaging_PolicyValueC.cpp
index 19b15c675cf..055ac80c470 100644
--- a/TAO/tao/Messaging_PolicyValueC.cpp
+++ b/TAO/tao/Messaging_PolicyValueC.cpp
@@ -42,7 +42,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -155,7 +155,7 @@ CORBA::Boolean operator<< (
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -165,7 +165,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -182,7 +182,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -191,11 +191,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -206,7 +206,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_CPP_ */
diff --git a/TAO/tao/Messaging_PolicyValueC.h b/TAO/tao/Messaging_PolicyValueC.h
index 73f7937ffdd..b7a943a6b5c 100644
--- a/TAO/tao/Messaging_PolicyValueC.h
+++ b/TAO/tao/Messaging_PolicyValueC.h
@@ -42,7 +42,6 @@
 
 #include "tao/TAO_Export.h"
 #include "tao/ORB.h"
-#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
 #include "tao/Seq_Var_T.h"
@@ -50,6 +49,7 @@
 #include "tao/VarOut_T.h"
 
 #include "tao/IOP_IORC.h"
+#include "tao/Policy_ForwardC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/Messaging_SyncScope.pidl b/TAO/tao/Messaging_SyncScope.pidl
index 8970534ce6d..1340cb3249c 100644
--- a/TAO/tao/Messaging_SyncScope.pidl
+++ b/TAO/tao/Messaging_SyncScope.pidl
@@ -4,31 +4,18 @@
  *
  *  $Id$
  *
- * This file was used to generate the code in Messaging_SyncScopeC.{h,i,cpp}
+ * This file was used to generate the code in Messaging_SyncScopeC.{h,inl,cpp}
  *
  * The command used to generate code from this file is:
  *
  *   tao_idl.exe
  *        -o orig -St -Sc
  *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=tao/corbafwd.h
+ *        -Wb,export_include=tao/TAO_Export.h
  *        -Wb,pre_include="ace/pre.h"
  *        -Wb,post_include="ace/post.h"
  *        Messaging_SyncScope.pidl
  *
- * after the file is generated a patch must be applied:
- *
- *   cp orig/Messaging_SyncScopeC.{h,i,cpp} .
- *   patch < diffs/Messaging_SyncScope.diff
- *
- * The patch eliminates cycles in the include dependencies.
- *
- * Note: to update the patch file after re-generating the code use:
- *
- *   for i in Messaging_SyncScopeC.{h,i,cpp}; do
- *     diff -uBbw orig/$i $i;
- *   done > diffs/Messaging_SyncScope.diff
- *
  */
 #ifndef TAO_MESSAGING_SYNCSCOPE_PIDL
 #define TAO_MESSAGING_SYNCSCOPE_PIDL
diff --git a/TAO/tao/Messaging_SyncScopeC.cpp b/TAO/tao/Messaging_SyncScopeC.cpp
index e730328941d..fc63464bb50 100644
--- a/TAO/tao/Messaging_SyncScopeC.cpp
+++ b/TAO/tao/Messaging_SyncScopeC.cpp
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/Messaging_SyncScopeC.h b/TAO/tao/Messaging_SyncScopeC.h
index e41d6af6997..ee879d17909 100644
--- a/TAO/tao/Messaging_SyncScopeC.h
+++ b/TAO/tao/Messaging_SyncScopeC.h
@@ -72,7 +72,7 @@ namespace Messaging
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::Short SyncScope;
   typedef CORBA::Short_out SyncScope_out;
@@ -111,7 +111,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:963
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "Messaging_SyncScopeC.inl"
diff --git a/TAO/tao/OBV_Constants.h b/TAO/tao/OBV_Constants.h
deleted file mode 100644
index bb0b924c771..00000000000
--- a/TAO/tao/OBV_Constants.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file     OBV_Constants.h
- *
- *  $Id$
- *
- *  Constants related to valuetypes, but also used by type codes.
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-#ifndef TAO_OBV_CONSTANTS_H
-#define TAO_OBV_CONSTANTS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Basic_Types.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace CORBA
-{
-  typedef Short Visibility;
-  typedef Short_out Visibility_out;
-
-  const Visibility PRIVATE_MEMBER = 0;
-  const Visibility PUBLIC_MEMBER  = 1;
-
-  typedef Short ValueModifier;
-  typedef Short_out ValueModifier_out;
-
-  const ValueModifier VM_NONE        = 0;
-  const ValueModifier VM_CUSTOM      = 1;
-  const ValueModifier VM_ABSTRACT    = 2;
-  const ValueModifier VM_TRUNCATABLE = 3;
-}
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_OBV_CONSTANTS_H */
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index bc703ef1535..94c05c2cf67 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -28,6 +28,7 @@ ACE_RCSID (tao,
 #include "debug.h"
 #include "CDR.h"
 #include "SystemException.h"
+#include "default_environment.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 # include "PICurrent_ORBInitializer.h"  /* @@ This should go away! */
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 5a094b44b97..b887917c8b4 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -27,7 +27,6 @@
 #include "orb_typesC.h"
 #include "objectid.h"
 #include "Policy_ForwardC.h"
-#include "OBV_Constants.h"
 #include "CORBA_methods.h"
 #include "VarOut_T.h"
 
@@ -45,7 +44,6 @@ typedef enum
 
 /// Forward declarations.
 class TAO_MProfile;
-struct TAO_Dispatch_Context;
 class TAO_Client_Strategy_Factory;
 class TAO_Server_Strategy_Factory;
 class TAO_InputCDR;
@@ -121,6 +119,8 @@ namespace CORBA
   typedef TAO_Pseudo_Var_T<ORB> ORB_var;
   typedef TAO_Pseudo_Out_T<ORB, ORB_var> ORB_out;
 
+  typedef CORBA::Short ValueModifier;
+
   /**
    * @class ORB
    *
diff --git a/TAO/tao/ORBInitializer_Registry.h b/TAO/tao/ORBInitializer_Registry.h
index e20773440a7..49146a1dc6e 100644
--- a/TAO/tao/ORBInitializer_Registry.h
+++ b/TAO/tao/ORBInitializer_Registry.h
@@ -23,6 +23,7 @@
 #include "CORBA_methods.h"
 #include "Objref_VarOut_T.h"
 #include "Environment.h"
+#include "default_environment.h"
 
 #include "ace/Thread_Mutex.h"
 
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 8b4a5d76f7f..c6c576a8099 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -136,7 +136,6 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
     ior_table_ (CORBA::Object::_nil ()),
     orb_ (CORBA::ORB::_nil ()),
     root_poa_ (),
-    portable_group_poa_hooks_ (0),
     orb_params_ (),
     init_ref_map_ (TAO_DEFAULT_OBJECT_REF_TABLE_SIZE),
     object_ref_table_ (),
@@ -1514,7 +1513,6 @@ TAO_ORB_Core::service_context_list (
   ACE_CHECK;
 }
 
-
 TAO_Client_Strategy_Factory *
 TAO_ORB_Core::client_factory (void)
 {
@@ -1541,24 +1539,6 @@ TAO_ORB_Core::server_factory (void)
   return this->server_factory_;
 }
 
-
-
-int
-TAO_ORB_Core::inherit_from_parent_thread (
-  TAO_ORB_Core_TSS_Resources *tss_resources)
-{
-  // Inherit properties/objects used in ORB_Core from the
-  // parent thread.  Stuff inherited here must already exist
-  // in the "parent" orbcore.
-  // This is used in the thread-per-connection concurrency model where
-  // each ORB spawned thread must use the resources of the spawning
-  // thread...
-
-  if (tss_resources == 0)
-    return -1;
-  return 0;
-}
-
 CORBA::Object_ptr
 TAO_ORB_Core::root_poa (ACE_ENV_SINGLE_ARG_DECL)
 {
@@ -2393,24 +2373,6 @@ TAO_ORB_Core::output_cdr_dblock_allocator (void)
 {
 
   return this->lane_resources ().output_cdr_dblock_allocator ();
-
-#if 0
-  // Allocating memory here confuses purify a bit. We do delete this
-  // memory when TSS delete
-  TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources ();
-  if (tss == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       ACE_TEXT ("(%P|%t) %p\n"),
-                       ACE_TEXT ("TAO_ORB_Core::output_cdr_dblock_allocator (); ")
-                       ACE_TEXT ("no more TSS keys")),
-                      0);
-
-  if (tss->output_cdr_dblock_allocator_ == 0)
-    tss->output_cdr_dblock_allocator_ =
-      this->resource_factory ()->output_cdr_dblock_allocator ();
-
-  return tss->output_cdr_dblock_allocator_;
-#endif /* if 0*/
 }
 
 ACE_Allocator*
@@ -2762,6 +2724,7 @@ TAO_ORB_Core::add_interceptor (
                   ACE_TEXT ("(%P|%t) %p\n"),
                   ACE_TEXT ("ERROR: ORB Core unable to find the ")
                   ACE_TEXT ("IORInterceptor Adapter Factory instance")));
+
       ACE_THROW (CORBA::INTERNAL ());
     }
 }
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 41df609aa27..f14943ae3f2 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -46,8 +46,8 @@
 #include "ace/Thread_Manager.h"
 #include "ace/Lock_Adapter_T.h"
 
-
 // Forward declarations
+class TAO_Adapter;
 class TAO_Acceptor;
 class TAO_Connector;
 class TAO_Connector_Registry;
@@ -78,7 +78,6 @@ class TAO_Thread_Lane_Resources;
 class TAO_Stub_Factory;
 class TAO_Endpoint_Selector_Factory;
 class TAO_Service_Context;
-class TAO_POA_PortableGroup_Hooks;
 class TAO_Request_Dispatcher;
 class TAO_Policy_Set;
 class TAO_Policy_Manager;
@@ -360,11 +359,6 @@ TAO::Collocation_Strategy collocation_strategy (CORBA::Object_ptr object
   /// optimization for the POA.
   TAO_Adapter *poa_adapter (void);
 
-  /// A spawned thread needs to inherit some properties/objects from
-  /// the spawning thread in order to serve requests.  Return 0 if
-  /// it successfully inherits from the parent, -1 otherwise.
-  int inherit_from_parent_thread (TAO_ORB_Core_TSS_Resources *tss_resources);
-
   /**
    * @name Access to Factories
    *
@@ -509,39 +503,6 @@ TAO::Collocation_Strategy collocation_strategy (CORBA::Object_ptr object
   /// transports.
   ACE_Allocator *transport_message_buffer_allocator (void);
 
-#if 0
-  /// @todo All these need to go. They were added in the first place
-  /// to get around a problem with input_cdr* methods. The input_cdr*
-  /// methods would access from TSS if an option is set. Since some
-  /// portions of the ORB didnt require memory from TSS, we had these
-  /// new set of methods. Now that the semantics are changed for
-  /// input_cdr* methods, these methods may not be required. We can
-  /// remove them at a later date!
-
-  /// This allocator is global, may or may not have locks. It is
-  /// intended for ACE_Data_Blocks used in message blocks or CDR
-  /// streams that have no relation with the life of threads,
-  /// something like used in a class on a per connection basis
-  ACE_Allocator *message_block_dblock_allocator (void);
-
-  /// This allocator is global, may or may not have locks. It is
-  /// intended for ACE_Data_Blocks used in message blocks or CDR
-  /// streams that have no relation with the life of threads,
-  /// something like used in a class on a per connection basis
-  ACE_Allocator *message_block_buffer_allocator (void);
-
-  /// This allocator is global, may or may not have locks. It is
-  /// intended for ACE_Data_Blocks used in message blocks or CDR
-  /// streams that have no relation with the life of threads,
-  /// something like used in a class on a per connection basis
-  ACE_Allocator *message_block_msgblock_allocator (void);
-
-  /// The data blocks returned have memeory from the global pool. Will
-  /// not get anything from the TSS even if it is available.
-  ACE_Data_Block *data_block_for_message_block (size_t size);
-
-#endif /*if 0*/
-
   /// The Message Blocks used for input CDRs must have appropiate
   /// locking strategies.
   ACE_Data_Block *create_input_cdr_data_block (size_t size);
@@ -796,10 +757,6 @@ TAO::Collocation_Strategy collocation_strategy (CORBA::Object_ptr object
 
   CORBA::Object_ptr resolve_rt_current (ACE_ENV_SINGLE_ARG_DECL);
 
-  /// Set/Get the current PortableGroup POA hooks.
-  TAO_POA_PortableGroup_Hooks *portable_group_poa_hooks (void) const;
-  void portable_group_poa_hooks(TAO_POA_PortableGroup_Hooks *poa_hooks);
-
   /// List all the service known by the ORB
   CORBA::ORB_ObjectIdList *list_initial_references (
       ACE_ENV_SINGLE_ARG_DECL_NOT_USED
@@ -1024,18 +981,6 @@ protected:
   /// destructor.
   int fini (void);
 
-#if 0
-  /// @@todo All these need to go! We dont put input cdr's on the TSS
-  /// anyway.
-  /// Implement the input_cdr_*_allocator() routines using pre-fetched
-  /// TSS resources.  This minimizes the number of calls to them.
-  //@{
-  ACE_Allocator *input_cdr_dblock_allocator_i (TAO_ORB_Core_TSS_Resources *);
-  ACE_Allocator *input_cdr_buffer_allocator_i (TAO_ORB_Core_TSS_Resources *);
-  ACE_Allocator *input_cdr_msgblock_allocator_i (TAO_ORB_Core_TSS_Resources *);
-  //@}
-
-#endif /*if 0*/
   /// Routine that creates a ACE_Data_Block given the lock and allocators.
   ACE_Data_Block *create_data_block_i (size_t size,
                                        ACE_Allocator *buffer_allocator,
@@ -1141,10 +1086,6 @@ protected:
   ///   CORBA::ORB::resolve_initial_references ("RootPOA").
   CORBA::Object_var root_poa_;
 
-  // Hold a pointer for the POA if it needs to use any of the Portable
-  // group hooks.
-  TAO_POA_PortableGroup_Hooks *portable_group_poa_hooks_;
-
   /// Parameters used by the ORB.
   TAO_ORB_Parameters orb_params_;
 
@@ -1165,16 +1106,6 @@ protected:
   /// Handle to the factory for resource information..
   TAO_Resource_Factory *resource_factory_;
 
-#if 0
-  /// @@todo All these need to go!
-  /// The allocators for the message blocks
-  //@{
-  ACE_Allocator *message_block_dblock_allocator_;
-  ACE_Allocator *message_block_buffer_allocator_;
-  ACE_Allocator *message_block_msgblock_allocator_;
-  //@}
-#endif /*if 0*/
-
   /// The server_id_ that was passed via -ORBServerId option
   ACE_CString server_id_;
 
diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i
index 76be478d42a..0aa19158171 100644
--- a/TAO/tao/ORB_Core.i
+++ b/TAO/tao/ORB_Core.i
@@ -377,18 +377,6 @@ TAO_ORB_Core::server_id (void) const
   return this->server_id_.c_str();
 }
 
-ACE_INLINE TAO_POA_PortableGroup_Hooks *
-TAO_ORB_Core::portable_group_poa_hooks (void) const
-{
-  return this->portable_group_poa_hooks_;
-}
-
-ACE_INLINE void
-TAO_ORB_Core::portable_group_poa_hooks(TAO_POA_PortableGroup_Hooks *poa_hooks)
-{
-  this->portable_group_poa_hooks_ = poa_hooks;
-}
-
 ACE_INLINE CORBA::Object_ptr
 TAO_ORB_Core::resolve_dynanyfactory (ACE_ENV_SINGLE_ARG_DECL)
 {
diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp b/TAO/tao/ObjRefTemplate/Default_ORTC.cpp
index 1b94789b36e..fe474c0dbdd 100644
--- a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp
+++ b/TAO/tao/ObjRefTemplate/Default_ORTC.cpp
@@ -42,7 +42,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.h b/TAO/tao/ObjRefTemplate/Default_ORTC.h
index 28ba3dadab4..7ac89eda0a5 100644
--- a/TAO/tao/ObjRefTemplate/Default_ORTC.h
+++ b/TAO/tao/ObjRefTemplate/Default_ORTC.h
@@ -78,7 +78,7 @@ namespace TAO_Default_ORT
 {
   
   // TAO_IDL - Generated from
-  // be\be_valuetype.cpp:527
+  // be\be_valuetype.cpp:525
   
   
 
@@ -228,7 +228,7 @@ TAO_ORT_Export void operator<<= (CORBA::Any &, TAO_Default_ORT::ObjectReferenceT
 TAO_ORT_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO_Default_ORT::ObjectReferenceTemplate *&);
 
 // TAO_IDL - Generated from
-// be\be_valuetype.cpp:434
+// be\be_valuetype.cpp:432
 
 namespace CORBA
 {
@@ -243,7 +243,7 @@ TAO_ORT_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_Default_ORT
 TAO_ORT_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_Default_ORT::ObjectReferenceTemplate *&);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:963
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "Default_ORTC.inl"
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
index 76cd19704ce..b8b4e051cf1 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
@@ -2,7 +2,7 @@
 
 #include "ORT_Adapter_Factory_Impl.h"
 #include "ORT_Adapter_Impl.h"
-#include "tao/PortableServer/POA.h"
+#include "tao/PortableServer/Root_POA.h"
 
 ACE_RCSID (ORT,
            ORT_Adapter_Factory_Impl,
@@ -15,23 +15,19 @@ namespace TAO
   }
 
   ORT_Adapter *
-  ORT_Adapter_Factory_Impl::create (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ORT_Adapter_Factory_Impl::create ()
   {
     ORT_Adapter_Impl * new_ort_adapter = 0;
 
-    ACE_NEW_THROW_EX (new_ort_adapter,
-                      TAO::ORT_Adapter_Impl,
-                      CORBA::NO_MEMORY ());
-    ACE_CHECK_RETURN (0);
+    ACE_NEW_RETURN (new_ort_adapter,
+                    TAO::ORT_Adapter_Impl,
+                    0);
 
     return new_ort_adapter;
   }
 
   void
-  ORT_Adapter_Factory_Impl::destroy (ORT_Adapter * adapter
-                                     ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
+  ORT_Adapter_Factory_Impl::destroy (ORT_Adapter * adapter)
   {
     delete adapter;
   }
@@ -39,7 +35,7 @@ namespace TAO
   int
   ORT_Adapter_Factory_Impl::Initializer (void)
   {
-    TAO_POA::ort_adapter_factory_name ("Concrete_ORT_Adapter_Factory"
+    TAO_Root_POA::ort_adapter_factory_name ("Concrete_ORT_Adapter_Factory"
       );
 
     return
@@ -56,5 +52,5 @@ namespace TAO
     ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
     0)
 
-    ACE_FACTORY_DEFINE (TAO_ORT, ORT_Adapter_Factory_Impl)
+  ACE_FACTORY_DEFINE (TAO_ORT, ORT_Adapter_Factory_Impl)
 }
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h
index fc72cf9aea8..5be40c4ce19 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h
@@ -42,16 +42,10 @@ namespace TAO
     virtual ~ORT_Adapter_Factory_Impl (void);
 
     /// Create an adapter
-    virtual TAO::ORT_Adapter * create (
-        ACE_ENV_SINGLE_ARG_DECL
-      )
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual TAO::ORT_Adapter * create ();
 
     /// Destroy an adapter that is created by this factory
-    virtual void destroy (
-        TAO::ORT_Adapter * adapter
-        ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
+    virtual void destroy (TAO::ORT_Adapter * adapter);
 
     // Used to force the initialization of the code.
     static int Initializer (void);
diff --git a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
index 062f8cd8577..3d5c5aac3e9 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "ORT_Adapter_Impl.h"
-#include "tao/PortableServer/POA.h"
+#include "tao/PortableServer/Root_POA.h"
 #include "tao/CORBA_String.h"
 #include "tao/ORB_Constants.h"
 #include "tao/CORBA_methods.h"
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
index fdb8b978bfa..99f3d7449ed 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
@@ -39,27 +39,27 @@ static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceFactory[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   59,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63745265), 
-  ACE_NTOHL (0x66657265), 
-  ACE_NTOHL (0x6e636546), 
-  ACE_NTOHL (0x6163746f), 
-  ACE_NTOHL (0x72793a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x4f626a65),
+  ACE_NTOHL (0x63745265),
+  ACE_NTOHL (0x66657265),
+  ACE_NTOHL (0x6e636546),
+  ACE_NTOHL (0x6163746f),
+  ACE_NTOHL (0x72793a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceFactory:1.0
     23,
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63745265), 
-  ACE_NTOHL (0x66657265), 
-  ACE_NTOHL (0x6e636546), 
-  ACE_NTOHL (0x6163746f), 
+  ACE_NTOHL (0x4f626a65),
+  ACE_NTOHL (0x63745265),
+  ACE_NTOHL (0x66657265),
+  ACE_NTOHL (0x6e636546),
+  ACE_NTOHL (0x6163746f),
   ACE_NTOHL (0x72790000),  // name = ObjectReferenceFactory
     2, // value modifier
   CORBA::tk_null, // no stateful base valuetype
@@ -88,27 +88,27 @@ static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplate[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   60,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63745265), 
-  ACE_NTOHL (0x66657265), 
-  ACE_NTOHL (0x6e636554), 
-  ACE_NTOHL (0x656d706c), 
-  ACE_NTOHL (0x6174653a), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x4f626a65),
+  ACE_NTOHL (0x63745265),
+  ACE_NTOHL (0x66657265),
+  ACE_NTOHL (0x6e636554),
+  ACE_NTOHL (0x656d706c),
+  ACE_NTOHL (0x6174653a),
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/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
     2, // value modifier
   CORBA::tk_null, // no stateful base valuetype
@@ -137,29 +137,29 @@ static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplateSeq[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   63,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x506f7274), 
-  ACE_NTOHL (0x61626c65), 
-  ACE_NTOHL (0x496e7465), 
-  ACE_NTOHL (0x72636570), 
-  ACE_NTOHL (0x746f722f), 
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63745265), 
-  ACE_NTOHL (0x66657265), 
-  ACE_NTOHL (0x6e636554), 
-  ACE_NTOHL (0x656d706c), 
-  ACE_NTOHL (0x61746553), 
-  ACE_NTOHL (0x65713a31), 
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x506f7274),
+  ACE_NTOHL (0x61626c65),
+  ACE_NTOHL (0x496e7465),
+  ACE_NTOHL (0x72636570),
+  ACE_NTOHL (0x746f722f),
+  ACE_NTOHL (0x4f626a65),
+  ACE_NTOHL (0x63745265),
+  ACE_NTOHL (0x66657265),
+  ACE_NTOHL (0x6e636554),
+  ACE_NTOHL (0x656d706c),
+  ACE_NTOHL (0x61746553),
+  ACE_NTOHL (0x65713a31),
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableInterceptor/ObjectReferenceTemplateSeq:1.0
     27,
-  ACE_NTOHL (0x4f626a65), 
-  ACE_NTOHL (0x63745265), 
-  ACE_NTOHL (0x66657265), 
-  ACE_NTOHL (0x6e636554), 
-  ACE_NTOHL (0x656d706c), 
-  ACE_NTOHL (0x61746553), 
+  ACE_NTOHL (0x4f626a65),
+  ACE_NTOHL (0x63745265),
+  ACE_NTOHL (0x66657265),
+  ACE_NTOHL (0x6e636554),
+  ACE_NTOHL (0x656d706c),
+  ACE_NTOHL (0x61746553),
   ACE_NTOHL (0x65710000),  // name = ObjectReferenceTemplateSeq
     CORBA::tk_sequence, // typecode kind
   124, // encapsulation length
@@ -168,33 +168,33 @@ static const CORBA::Long _oc_PortableInterceptor_ObjectReferenceTemplateSeq[] =
     480, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       60,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x506f7274), 
-      ACE_NTOHL (0x61626c65), 
-      ACE_NTOHL (0x496e7465), 
-      ACE_NTOHL (0x72636570), 
-      ACE_NTOHL (0x746f722f), 
-      ACE_NTOHL (0x4f626a65), 
-      ACE_NTOHL (0x63745265), 
-      ACE_NTOHL (0x66657265), 
-      ACE_NTOHL (0x6e636554), 
-      ACE_NTOHL (0x656d706c), 
-      ACE_NTOHL (0x6174653a), 
+      ACE_NTOHL (0x49444c3a),
+      ACE_NTOHL (0x6f6d672e),
+      ACE_NTOHL (0x6f72672f),
+      ACE_NTOHL (0x506f7274),
+      ACE_NTOHL (0x61626c65),
+      ACE_NTOHL (0x496e7465),
+      ACE_NTOHL (0x72636570),
+      ACE_NTOHL (0x746f722f),
+      ACE_NTOHL (0x4f626a65),
+      ACE_NTOHL (0x63745265),
+      ACE_NTOHL (0x66657265),
+      ACE_NTOHL (0x6e636554),
+      ACE_NTOHL (0x656d706c),
+      ACE_NTOHL (0x6174653a),
       ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/PortableInterceptor/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
             2, // value modifier
       CORBA::tk_null, // no stateful base valuetype
 
 3, // member count
-      
+
     0U,
 
 };
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
index 8665d81f97d..9965d1edb67 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
@@ -1,5 +1,5 @@
 #include "ObjectReferenceTemplate_i.h"
-#include "tao/PortableServer/POA.h"
+#include "tao/PortableServer/Root_POA.h"
 
 #include "tao/CORBA_String.h"
 #include "tao/ORB_Constants.h"
@@ -51,7 +51,7 @@ namespace TAO
                                                         *(this->adapter_name_)),
                       CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                              TAO_DEFAULT_MINOR_CODE,
+                              TAO::VMCID,
                               ENOMEM),
                           CORBA::COMPLETED_NO));
     ACE_CHECK_RETURN (0);
@@ -69,7 +69,7 @@ namespace TAO
     if (CORBA::is_nil(poa_.in()))
       ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), CORBA::Object::_nil ());
 
-    TAO_POA* tao_poa = poa_->_tao_poa_downcast ();
+    TAO_Root_POA* tao_poa = dynamic_cast<TAO_Root_POA*>(poa_.in());
 
     return tao_poa->invoke_key_to_object (ACE_ENV_SINGLE_ARG_PARAMETER);
   }
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
index 4b5d97aecb8..aca0b876cdf 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.h
@@ -25,13 +25,21 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "Default_ORTC.h"
-#include "tao/PortableServer/PortableServerC.h"
+#include "tao/SystemException.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+namespace PortableServer
+{
+  class POA;
+
+  typedef POA *POA_ptr;
+  typedef TAO_Objref_Var_T<POA> POA_var;
+}
+
 namespace TAO
 {
   /**
@@ -102,6 +110,7 @@ namespace TAO
     PortableServer::POA_var poa_;
   };
 }
+
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/ObjectIdList.pidl b/TAO/tao/ObjectIdList.pidl
index 78af05ccc7a..220d395e1f1 100644
--- a/TAO/tao/ObjectIdList.pidl
+++ b/TAO/tao/ObjectIdList.pidl
@@ -14,7 +14,7 @@
  *   command used for this is:
  *
  *     tao_idl.exe
- *        -o orig -Sa -Ge 1 -GT -GA -Sc
+ *        -o orig -Sa -Ge 1 -GT -GA
  *          -Wb,export_macro=TAO_Export
  *          -Wb,export_include="tao/TAO_Export.h"
  *          -Wb,pre_include="ace/pre.h"
diff --git a/TAO/tao/ObjectIdListC.cpp b/TAO/tao/ObjectIdListC.cpp
index a2a41a59509..87dd3f99c76 100644
--- a/TAO/tao/ObjectIdListC.cpp
+++ b/TAO/tao/ObjectIdListC.cpp
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -103,7 +103,7 @@ CORBA::Boolean operator<< (
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -113,7 +113,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -130,7 +130,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -139,11 +139,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -155,7 +155,7 @@ CORBA::Boolean operator>> (
   
   }
 
-return 0;
+return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ORB_ObjectIdList_CPP_ */
diff --git a/TAO/tao/ObjectIdListC.h b/TAO/tao/ObjectIdListC.h
index cf0def03950..3a3cb5e7cb5 100644
--- a/TAO/tao/ObjectIdListC.h
+++ b/TAO/tao/ObjectIdListC.h
@@ -75,7 +75,7 @@ namespace CORBA
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:376
+  // be\be_visitor_typedef/typedef_ch.cpp:413
   
   typedef char * ORB_ObjectId;
   typedef CORBA::String_var ORB_ObjectId_var;
diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp
index 1c6d6c3a8d1..b79e2a5fa49 100644
--- a/TAO/tao/Object_KeyC.cpp
+++ b/TAO/tao/Object_KeyC.cpp
@@ -46,7 +46,7 @@
 #include "ace/os_include/os_ctype.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -54,7 +54,7 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_TAO_OBJECTKEY_CS_)
@@ -224,7 +224,7 @@ TAO::ObjectKey::demarshal_key (TAO::ObjectKey &key,
       ACE_Message_Block::DONT_DELETE))
       {
         TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-          static_cast <TAO_Unbounded_Sequence<CORBA::Octet>*> (&key);
+          static_cast<TAO_Unbounded_Sequence<CORBA::Octet>*> (&key);
         oseq->replace (_tao_seq_len, strm.start ());
         oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
         strm.skip_bytes (_tao_seq_len);
@@ -254,28 +254,28 @@ CORBA::Boolean operator<< (
   )
 {
   const 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> *_tao_octet_seq = 
+        TAO_Unbounded_Sequence<CORBA::Octet> *_tao_octet_seq =
           static_cast<TAO_Unbounded_Sequence<CORBA::Octet> *> (const_cast<TAO::ObjectKey *> (&_tao_sequence));
         if (_tao_octet_seq->mb ())
           return strm.write_octet_array_mb (_tao_octet_seq->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 */
     }
-  
-  return 0;
+
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -284,7 +284,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -292,20 +292,20 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
-      
+
       // 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;
+          return true;
         }
-      
+
       // Retrieve all the elements.
-      
+
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
       if (ACE_BIT_DISABLED (strm.start ()->flags (),
       ACE_Message_Block::DONT_DELETE))
@@ -315,7 +315,7 @@ CORBA::Boolean operator>> (
         strm.orb_core ()->resource_factory ()->
         input_cdr_allocator_type_locked () == 1)
         {
-          TAO_Unbounded_Sequence<CORBA::Octet> *oseq = 
+          TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
             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);
@@ -326,12 +326,12 @@ CORBA::Boolean operator>> (
       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;
+
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_TAO_ObjectKey_CPP_ */
@@ -381,4 +381,4 @@ CORBA::Boolean operator>> (
         CORBA::Octet \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp
index 0814db202a2..acfca87f542 100644
--- a/TAO/tao/OctetSeqC.cpp
+++ b/TAO/tao/OctetSeqC.cpp
@@ -42,7 +42,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -136,7 +136,7 @@ CORBA::Boolean operator<< (
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 0 */
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -153,7 +153,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -162,7 +162,7 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
@@ -192,7 +192,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_OctetSeq_CPP_ */
diff --git a/TAO/tao/PI_ForwardC.cpp b/TAO/tao/PI_ForwardC.cpp
index 6dce7050f76..61dd5f08532 100644
--- a/TAO/tao/PI_ForwardC.cpp
+++ b/TAO/tao/PI_ForwardC.cpp
@@ -43,7 +43,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/PI_ForwardC.h b/TAO/tao/PI_ForwardC.h
index 45e79cdee3d..f408507b98e 100644
--- a/TAO/tao/PI_ForwardC.h
+++ b/TAO/tao/PI_ForwardC.h
@@ -75,7 +75,7 @@ namespace PortableInterceptor
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:376
+  // be\be_visitor_typedef/typedef_ch.cpp:413
   
   typedef char * ServerId;
   typedef CORBA::String_var ServerId_var;
@@ -87,7 +87,7 @@ namespace PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerId;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:376
+  // be\be_visitor_typedef/typedef_ch.cpp:413
   
   typedef char * ORBId;
   typedef CORBA::String_var ORBId_var;
@@ -99,7 +99,7 @@ namespace PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBId;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:435
+  // be\be_visitor_typedef/typedef_ch.cpp:472
   
   typedef CORBA::StringSeq AdapterName;
   typedef CORBA::StringSeq_var AdapterName_var;
@@ -111,7 +111,7 @@ namespace PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterName;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:435
+  // be\be_visitor_typedef/typedef_ch.cpp:472
   
   typedef CORBA::OctetSeq ObjectId;
   typedef CORBA::OctetSeq_var ObjectId_var;
@@ -123,7 +123,7 @@ namespace PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectId;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::Long AdapterManagerId;
   typedef CORBA::Long_out AdapterManagerId_out;
@@ -134,7 +134,7 @@ namespace PortableInterceptor
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterManagerId;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::Short AdapterState;
   typedef CORBA::Short_out AdapterState_out;
diff --git a/TAO/tao/ParameterModeC.cpp b/TAO/tao/ParameterModeC.cpp
index b26210bdc8f..ab193558e85 100644
--- a/TAO/tao/ParameterModeC.cpp
+++ b/TAO/tao/ParameterModeC.cpp
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -70,12 +70,3 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, CORBA::ParameterMode &_tao_enumva
   
   return _tao_result;
 }
-
-// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1629
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/ParameterModeC.h b/TAO/tao/ParameterModeC.h
index d486aab6eda..b51a1e53462 100644
--- a/TAO/tao/ParameterModeC.h
+++ b/TAO/tao/ParameterModeC.h
@@ -103,7 +103,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ParameterMod
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ParameterMode &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:963
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "ParameterModeC.inl"
diff --git a/TAO/tao/Policy.pidl b/TAO/tao/Policy.pidl
index a5379d84b3c..6e6b82aa880 100644
--- a/TAO/tao/Policy.pidl
+++ b/TAO/tao/Policy.pidl
@@ -18,8 +18,10 @@
  *
  *     tao_idl.exe
  *        -o orig -Gp -Gd -Ge 1 -GT -GA
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
+ *          -Wb,stub_export_macro=TAO_Export
+ *          -Wb,stub_export_include="tao/TAO_Export.h"
+ *          -Wb,skel_export_macro=TAO_PortableServer_Export
+ *          -Wb,skel_export_include=portableserver_export.h
  *          -Wb,pre_include="ace/pre.h"
  *          -Wb,post_include="ace/post.h"
  *          Policy.pidl
diff --git a/TAO/tao/PolicyA.cpp b/TAO/tao/PolicyA.cpp
index 6e63292b4f3..86293998b21 100644
--- a/TAO/tao/PolicyA.cpp
+++ b/TAO/tao/PolicyA.cpp
@@ -191,9 +191,9 @@ TAO::Any_Dual_Impl_T<CORBA::PolicyError>::demarshal_value (
 {
   CORBA::String_var id;
   
-  if ((cdr >> id.out ()) == 0)
+  if (!(cdr >> id.out ()))
     {
-      return 0;
+      return false;
     }
   
   ACE_TRY_NEW_ENV
@@ -203,11 +203,11 @@ TAO::Any_Dual_Impl_T<CORBA::PolicyError>::demarshal_value (
     }
   ACE_CATCHANY
     {
-      return 0;
+      return false;
     }
   ACE_ENDTRY;
   
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -276,9 +276,9 @@ TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies>::demarshal_value (
 {
   CORBA::String_var id;
   
-  if ((cdr >> id.out ()) == 0)
+  if (!(cdr >> id.out ()))
     {
-      return 0;
+      return false;
     }
   
   ACE_TRY_NEW_ENV
@@ -288,11 +288,11 @@ TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies>::demarshal_value (
     }
   ACE_CATCHANY
     {
-      return 0;
+      return false;
     }
   ACE_ENDTRY;
   
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -422,14 +422,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<CORBA::PolicyManager>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<CORBA::PolicyManager>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -491,14 +491,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<CORBA::PolicyCurrent>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<CORBA::PolicyCurrent>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -551,6 +551,11 @@ operator>>= (
       >;
 
   template class
+    TAO::Any_Impl_T<
+        CORBA::PolicyCurrent
+      >;
+
+  template class
     TAO::Any_Dual_Impl_T<
         CORBA::PolicyError
       >;
@@ -565,11 +570,6 @@ operator>>= (
         CORBA::PolicyManager
       >;
 
-  template class
-    TAO::Any_Impl_T<
-        CORBA::PolicyCurrent
-      >;
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 # pragma instantiate \
@@ -578,6 +578,11 @@ operator>>= (
       >
 
 # pragma instantiate \
+    TAO::Any_Impl_T< \
+        CORBA::PolicyCurrent \
+      >
+
+# pragma instantiate \
     TAO::Any_Dual_Impl_T< \
         CORBA::PolicyError \
       >
@@ -592,9 +597,4 @@ operator>>= (
         CORBA::PolicyManager \
       >
 
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        CORBA::PolicyCurrent \
-      >
-
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index 79bc0dfae8a..93f1677851d 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -48,7 +48,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -513,7 +513,7 @@ CORBA::PolicyType CORBA::Policy::policy_type (
       CORBA_Policy_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::PolicyType>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::PolicyType>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -555,7 +555,7 @@ CORBA::PolicyType CORBA::Policy::policy_type (
       CORBA_Policy_setup_collocation ();
     }
   
-  TAO::Arg_Traits< ::CORBA::Policy>::ret_val _tao_retval;
+  TAO::Arg_Traits< CORBA::Policy>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -693,14 +693,14 @@ CORBA::Policy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -831,18 +831,18 @@ CORBA::PolicyManager::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/PolicyManager:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -970,26 +970,26 @@ CORBA::PolicyCurrent::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/PolicyManager:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Current:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/PolicyCurrent:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1022,20 +1022,13 @@ CORBA::Boolean operator<< (
   if (strm << _tao_aggregate._rep_id ())
     {
       // Now marshal the members (if any).
-      if (
+      return (
         (strm << _tao_aggregate.reason)
-       )
-        {
-          return 1;
-        }
-      else
-        {
-          return 0;
-        }
+       );
     }
   else
     {
-      return 0;
+      return false;
     }
 }
 
@@ -1045,16 +1038,9 @@ CORBA::Boolean operator>> (
   )
 {
   // Demarshal the members.
-  if (
+  return (
     (strm >> _tao_aggregate.reason)
-  )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+  );
 }
 
 // TAO_IDL - Generated from
@@ -1069,20 +1055,13 @@ CORBA::Boolean operator<< (
   if (strm << _tao_aggregate._rep_id ())
     {
       // Now marshal the members (if any).
-      if (
+      return (
         (strm << _tao_aggregate.indices)
-       )
-        {
-          return 1;
-        }
-      else
-        {
-          return 0;
-        }
+       );
     }
   else
     {
-      return 0;
+      return false;
     }
 }
 
@@ -1092,16 +1071,9 @@ CORBA::Boolean operator>> (
   )
 {
   // Demarshal the members.
-  if (
+  return (
     (strm >> _tao_aggregate.indices)
-  )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+  );
 }
 
 // Hand crafted.
@@ -1151,9 +1123,9 @@ CORBA::Boolean operator>> (
 {
   CORBA::Object_var obj;
   
-  if ((strm >> obj.inout ()) == 0)
+  if (!(strm >> obj.inout ()))
     {
-      return 0;
+      return false;
     }
   
   typedef ::CORBA::Policy RHS_SCOPED_NAME;
@@ -1219,32 +1191,32 @@ CORBA::Boolean operator>> (
 
   template class
     TAO::Objref_Traits<
-        CORBA::PolicyManager
+        CORBA::PolicyCurrent
       >;
 
   template class
     TAO_Objref_Var_T<
-        CORBA::PolicyManager
+        CORBA::PolicyCurrent
       >;
   
   template class
     TAO_Objref_Out_T<
-        CORBA::PolicyManager
+        CORBA::PolicyCurrent
       >;
 
   template class
     TAO::Objref_Traits<
-        CORBA::PolicyCurrent
+        CORBA::PolicyManager
       >;
 
   template class
     TAO_Objref_Var_T<
-        CORBA::PolicyCurrent
+        CORBA::PolicyManager
       >;
   
   template class
     TAO_Objref_Out_T<
-        CORBA::PolicyCurrent
+        CORBA::PolicyManager
       >;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
@@ -1295,32 +1267,32 @@ CORBA::Boolean operator>> (
 
 # pragma instantiate \
     TAO::Objref_Traits< \
-        CORBA::PolicyManager \
+        CORBA::PolicyCurrent \
       >
 
 # pragma instantiate \
     TAO_Objref_Var_T< \
-        CORBA::PolicyManager
+        CORBA::PolicyCurrent
       >
   
 # pragma instantiate \
     TAO_Objref_Out_T< \
-        CORBA::PolicyManager
+        CORBA::PolicyCurrent
       >
 
 # pragma instantiate \
     TAO::Objref_Traits< \
-        CORBA::PolicyCurrent \
+        CORBA::PolicyManager \
       >
 
 # pragma instantiate \
     TAO_Objref_Var_T< \
-        CORBA::PolicyCurrent
+        CORBA::PolicyManager
       >
   
 # pragma instantiate \
     TAO_Objref_Out_T< \
-        CORBA::PolicyCurrent
+        CORBA::PolicyManager
       >
 
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index 1944fad144c..967d2342105 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -90,7 +90,7 @@ namespace CORBA
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::Short PolicyErrorCode;
   typedef CORBA::Short_out PolicyErrorCode_out;
@@ -293,7 +293,7 @@ namespace CORBA
     
     static Policy_ptr _nil (void)
     {
-      return (Policy_ptr)0;
+      return static_cast<Policy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -439,7 +439,7 @@ namespace CORBA
     
     static PolicyManager_ptr _nil (void)
     {
-      return (PolicyManager_ptr)0;
+      return static_cast<PolicyManager_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -551,7 +551,7 @@ namespace CORBA
     
     static PolicyCurrent_ptr _nil (void)
     {
-      return (PolicyCurrent_ptr)0;
+      return static_cast<PolicyCurrent_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -631,42 +631,42 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_POLICYMANAGER__TRAITS_CH_)
-#define _CORBA_POLICYMANAGER__TRAITS_CH_
+#if !defined (_CORBA_POLICYCURRENT__TRAITS_CH_)
+#define _CORBA_POLICYCURRENT__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits< ::CORBA::PolicyManager>
+  struct TAO_Export Objref_Traits< ::CORBA::PolicyCurrent>
   {
-    static ::CORBA::PolicyManager_ptr duplicate (
-        ::CORBA::PolicyManager_ptr
+    static ::CORBA::PolicyCurrent_ptr duplicate (
+        ::CORBA::PolicyCurrent_ptr
       );
     static void release (
-        ::CORBA::PolicyManager_ptr
+        ::CORBA::PolicyCurrent_ptr
       );
-    static ::CORBA::PolicyManager_ptr nil (void);
+    static ::CORBA::PolicyCurrent_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::PolicyManager_ptr p,
+        ::CORBA::PolicyCurrent_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_POLICYCURRENT__TRAITS_CH_)
-#define _CORBA_POLICYCURRENT__TRAITS_CH_
+#if !defined (_CORBA_POLICYMANAGER__TRAITS_CH_)
+#define _CORBA_POLICYMANAGER__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_Export Objref_Traits< ::CORBA::PolicyCurrent>
+  struct TAO_Export Objref_Traits< ::CORBA::PolicyManager>
   {
-    static ::CORBA::PolicyCurrent_ptr duplicate (
-        ::CORBA::PolicyCurrent_ptr
+    static ::CORBA::PolicyManager_ptr duplicate (
+        ::CORBA::PolicyManager_ptr
       );
     static void release (
-        ::CORBA::PolicyCurrent_ptr
+        ::CORBA::PolicyManager_ptr
       );
-    static ::CORBA::PolicyCurrent_ptr nil (void);
+    static ::CORBA::PolicyManager_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::PolicyCurrent_ptr p,
+        ::CORBA::PolicyManager_ptr p,
         TAO_OutputCDR & cdr
       );
   };
diff --git a/TAO/tao/Policy_Forward.pidl b/TAO/tao/Policy_Forward.pidl
index 3b8ca403c1c..a0455143086 100644
--- a/TAO/tao/Policy_Forward.pidl
+++ b/TAO/tao/Policy_Forward.pidl
@@ -9,7 +9,7 @@
  * Policy-related types.
  *
  * This file is used to generate the code in
- * Policy_ForwardC.{h,i,cpp}.
+ * Policy_ForwardC.{h,inl,cpp}.
  *
  *   The steps to regenerate the code are as follows:
  *
@@ -18,7 +18,7 @@
  *
  *     tao_idl.exe
  *        -o orig -Ge 1 -GT -GA -Sc
- *          -Wb,export_macro=TAO_Export
+ *          -Wb,export_macro="tao/TAO_Export"
  *          -Wb,pre_include="ace/pre.h"
  *          -Wb,post_include="ace/post.h"
  *          Policy_Forward.pidl
@@ -52,6 +52,8 @@ module CORBA
 
   typedef sequence<PolicyType> PolicyTypeSeq;
 
+  local interface PolicyCurrent;
+
   enum SetOverrideType
   {
     SET_OVERRIDE,
diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp
index 882e487259b..10b2cf16623 100644
--- a/TAO/tao/Policy_ForwardC.cpp
+++ b/TAO/tao/Policy_ForwardC.cpp
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/Policy_ForwardC.h b/TAO/tao/Policy_ForwardC.h
index 84aa61ae939..673f0532597 100644
--- a/TAO/tao/Policy_ForwardC.h
+++ b/TAO/tao/Policy_ForwardC.h
@@ -73,33 +73,33 @@
 
 namespace CORBA
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-
+  
   typedef CORBA::ULong PolicyType;
   typedef CORBA::ULong_out PolicyType_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyType;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_POLICY__VAR_OUT_CH_)
 #define _CORBA_POLICY__VAR_OUT_CH_
-
+  
   class Policy;
   typedef Policy *Policy_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Policy
       >
     Policy_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Policy
@@ -107,15 +107,15 @@ namespace CORBA
     Policy_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_POLICYLIST_CH_)
 #define _CORBA_POLICYLIST_CH_
-
+  
   class PolicyList;
-
+  
   typedef
     TAO_MngSeq_Var_T<
         PolicyList,
@@ -125,7 +125,7 @@ namespace CORBA
           >
       >
     PolicyList_var;
-
+  
   typedef
     TAO_MngSeq_Out_T<
         PolicyList,
@@ -136,7 +136,7 @@ namespace CORBA
           >
       >
     PolicyList_out;
-
+  
   class TAO_Export PolicyList
     : public
         TAO_Unbounded_Object_Sequence<
@@ -150,39 +150,39 @@ namespace CORBA
     PolicyList (
         CORBA::ULong max,
         CORBA::ULong length,
-        Policy_ptr* buffer,
+        Policy_ptr* buffer, 
         CORBA::Boolean release = 0
       );
     PolicyList (const PolicyList &);
     ~PolicyList (void);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     typedef PolicyList_var _var_type;
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyList;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_POLICYTYPESEQ_CH_)
 #define _CORBA_POLICYTYPESEQ_CH_
-
+  
   class PolicyTypeSeq;
-
+  
   typedef
     TAO_FixedSeq_Var_T<
         PolicyTypeSeq,
         PolicyType
       >
     PolicyTypeSeq_var;
-
+  
   typedef
     TAO_Seq_Out_T<
         PolicyTypeSeq,
@@ -190,7 +190,7 @@ namespace CORBA
         PolicyType
       >
     PolicyTypeSeq_out;
-
+  
   class TAO_Export PolicyTypeSeq
     : public
         TAO_Unbounded_Sequence<
@@ -222,6 +222,29 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyTypeSeq;
   
   // TAO_IDL - Generated from
+  // be\be_interface.cpp:598
+
+#if !defined (_CORBA_POLICYCURRENT__VAR_OUT_CH_)
+#define _CORBA_POLICYCURRENT__VAR_OUT_CH_
+  
+  class PolicyCurrent;
+  typedef PolicyCurrent *PolicyCurrent_ptr;
+  
+  typedef
+    TAO_Objref_Var_T<
+        PolicyCurrent
+      >
+    PolicyCurrent_var;
+  
+  typedef
+    TAO_Objref_Out_T<
+        PolicyCurrent
+      >
+    PolicyCurrent_out;
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
   // be\be_visitor_enum/enum_ch.cpp:57
   
   enum SetOverrideType
diff --git a/TAO/tao/Policy_ForwardS.h b/TAO/tao/Policy_ForwardS.h
new file mode 100644
index 00000000000..f8d7cd774da
--- /dev/null
+++ b/TAO/tao/Policy_ForwardS.h
@@ -0,0 +1,78 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:390
+
+#ifndef _TAO_IDL_ORIG_POLICY_FORWARDS_H_
+#define _TAO_IDL_ORIG_POLICY_FORWARDS_H_
+
+#include /**/ "ace/pre.h"
+
+#include "Policy_ForwardC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:49
+
+namespace POA_CORBA
+{
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:80
+
+} // module CORBA
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:997
+
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/Policy_Set.cpp b/TAO/tao/Policy_Set.cpp
index e7a8aed0c41..b0f1dae2218 100644
--- a/TAO/tao/Policy_Set.cpp
+++ b/TAO/tao/Policy_Set.cpp
@@ -171,11 +171,7 @@ TAO_Policy_Set::set_policy_overrides (const CORBA::PolicyList &policies,
 
   for (CORBA::ULong i = 0; i < plen; ++i)
     {
-      // Because MSVC 5 has a bug, we had to replace
-      // a simple CORBA::Policy_var policy = policies[i];
-      // with the following.
-      CORBA::Policy_ptr temp = policies[i];
-      CORBA::Policy_var policy = CORBA::Policy::_duplicate (temp);
+      CORBA::Policy_var policy = policies[i];
 
       if (CORBA::is_nil (policy.in ()))
         {
diff --git a/TAO/tao/Pollable.pidl b/TAO/tao/Pollable.pidl
index c1b41153b06..e20b964ba36 100644
--- a/TAO/tao/Pollable.pidl
+++ b/TAO/tao/Pollable.pidl
@@ -6,7 +6,7 @@
  *
  *  $Id$
  *
- * This file was used to generate the code in Pollable{C,S,S_T}.{h,i,cpp}
+ * This file was used to generate the code in Pollable{C,S,S_T}.{h,inl,cpp}
  *
  * The command used to generate code from this file is:
  *
@@ -17,15 +17,6 @@
  *     -Wb,post_include="ace/post.h"
  *     Pollable.pidl
  *
- * after the file is generated a patch must be applied.  The patch
- * fixes the interface repository IDs, disables the code under
- * certain configurations, and eliminates cycles in the include
- * dependencies.  Those changes are required because the generated
- * code is part of the TAO library, it hardly makes any sense to
- * change the IDL compiler to support changes that are very
- * occasional.
- *
- *
  */
 //=============================================================================
 
diff --git a/TAO/tao/PollableC.cpp b/TAO/tao/PollableC.cpp
index 6756fe3eb4e..367b23c7072 100644
--- a/TAO/tao/PollableC.cpp
+++ b/TAO/tao/PollableC.cpp
@@ -42,7 +42,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -149,18 +149,18 @@ CORBA::Pollable::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Pollable:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -280,22 +280,22 @@ CORBA::DIIPollable::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Pollable:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/DIIPollable:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -583,18 +583,18 @@ CORBA::PollableSet::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/PollableSet:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
diff --git a/TAO/tao/PollableC.h b/TAO/tao/PollableC.h
index 28669184ca0..21b1fb5323a 100644
--- a/TAO/tao/PollableC.h
+++ b/TAO/tao/PollableC.h
@@ -69,7 +69,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from 
-// be\be_visitor_root/root_ch.cpp:63
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -86,7 +86,7 @@ namespace CORBA
 {
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:603
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_POLLABLESET__VAR_OUT_CH_)
 #define _CORBA_POLLABLESET__VAR_OUT_CH_
@@ -109,7 +109,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:603
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_POLLABLE__VAR_OUT_CH_)
 #define _CORBA_POLLABLE__VAR_OUT_CH_
@@ -159,7 +159,7 @@ namespace CORBA
     
     static Pollable_ptr _nil (void)
     {
-      return (Pollable_ptr)0;
+      return static_cast<Pollable_ptr> (0);
     }
     
     
@@ -212,7 +212,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:603
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_DIIPOLLABLE__VAR_OUT_CH_)
 #define _CORBA_DIIPOLLABLE__VAR_OUT_CH_
@@ -262,7 +262,7 @@ namespace CORBA
     
     static DIIPollable_ptr _nil (void)
     {
-      return (DIIPollable_ptr)0;
+      return static_cast<DIIPollable_ptr> (0);
     }
     
     
@@ -321,7 +321,7 @@ namespace CORBA
     
     static PollableSet_ptr _nil (void)
     {
-      return (PollableSet_ptr)0;
+      return static_cast<PollableSet_ptr> (0);
     }
     
     
@@ -566,7 +566,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:963
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "PollableC.inl"
diff --git a/TAO/tao/PortableInterceptor.pidl b/TAO/tao/PortableInterceptor.pidl
index c79f679a116..fb53266cdfa 100644
--- a/TAO/tao/PortableInterceptor.pidl
+++ b/TAO/tao/PortableInterceptor.pidl
@@ -43,6 +43,8 @@
 #include <Messaging_SyncScope.pidl>
 #include <IOP_Codec.pidl>
 #include <IOP_IOR.pidl>
+#include <orb_types.pidl>
+#include <Policy.pidl>
 
 module PortableInterceptor {
 
diff --git a/TAO/tao/PortableInterceptorA.cpp b/TAO/tao/PortableInterceptorA.cpp
index 47ece2898c3..c315bd4db4c 100644
--- a/TAO/tao/PortableInterceptorA.cpp
+++ b/TAO/tao/PortableInterceptorA.cpp
@@ -586,14 +586,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::Interceptor>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::Interceptor>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -649,9 +649,9 @@ TAO::Any_Dual_Impl_T<PortableInterceptor::ForwardRequest>::demarshal_value (
 {
   CORBA::String_var id;
   
-  if ((cdr >> id.out ()) == 0)
+  if (!(cdr >> id.out ()))
     {
-      return 0;
+      return false;
     }
   
   ACE_TRY_NEW_ENV
@@ -661,11 +661,11 @@ TAO::Any_Dual_Impl_T<PortableInterceptor::ForwardRequest>::demarshal_value (
     }
   ACE_CATCHANY
     {
-      return 0;
+      return false;
     }
   ACE_ENDTRY;
   
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -734,9 +734,9 @@ TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>::demarshal_value (
 {
   CORBA::String_var id;
   
-  if ((cdr >> id.out ()) == 0)
+  if (!(cdr >> id.out ()))
     {
-      return 0;
+      return false;
     }
   
   ACE_TRY_NEW_ENV
@@ -746,11 +746,11 @@ TAO::Any_Dual_Impl_T<PortableInterceptor::InvalidSlot>::demarshal_value (
     }
   ACE_CATCHANY
     {
-      return 0;
+      return false;
     }
   ACE_ENDTRY;
   
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -825,14 +825,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::Current>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::Current>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -894,14 +894,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::RequestInfo>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -963,14 +963,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ClientRequestInfo>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -1032,14 +1032,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ServerRequestInfo>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -1101,14 +1101,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -1170,14 +1170,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -1239,14 +1239,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::PolicyFactory>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -1308,14 +1308,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ORBInitInfo>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -1367,14 +1367,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -1439,14 +1439,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -1521,14 +1521,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<PortableInterceptor::ORBInitializer>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index 6e123dd3682..08524f7045a 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -44,7 +44,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -159,18 +159,18 @@ PortableInterceptor::Interceptor::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/PortableInterceptor/Interceptor:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -637,22 +637,22 @@ PortableInterceptor::Current::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Current:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/PortableInterceptor/Current:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -780,18 +780,18 @@ PortableInterceptor::RequestInfo::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/PortableInterceptor/RequestInfo:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -919,22 +919,22 @@ PortableInterceptor::ClientRequestInfo::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/PortableInterceptor/RequestInfo:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/PortableInterceptor/ClientRequestInfo:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1062,22 +1062,22 @@ PortableInterceptor::ServerRequestInfo::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/PortableInterceptor/RequestInfo:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1205,22 +1205,22 @@ PortableInterceptor::ClientRequestInterceptor::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/PortableInterceptor/Interceptor:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/PortableInterceptor/ClientRequestInterceptor:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1348,22 +1348,22 @@ PortableInterceptor::ServerRequestInterceptor::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/PortableInterceptor/Interceptor:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1491,18 +1491,18 @@ PortableInterceptor::PolicyFactory::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1925,18 +1925,18 @@ PortableInterceptor::ORBInitInfo::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -2076,18 +2076,18 @@ PortableInterceptor::ORBInitializer::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/PortableInterceptor/ORBInitializer:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -2120,21 +2120,14 @@ CORBA::Boolean operator<< (
   if (strm << _tao_aggregate._rep_id ())
     {
       // Now marshal the members (if any).
-      if (
+      return (
         (strm << _tao_aggregate.forward.in ()) &&
         (strm << CORBA::Any::from_boolean (_tao_aggregate.permanent))
-       )
-        {
-          return 1;
-        }
-      else
-        {
-          return 0;
-        }
+       );
     }
   else
     {
-      return 0;
+      return false;
     }
 }
 
@@ -2144,17 +2137,10 @@ CORBA::Boolean operator>> (
   )
 {
   // Demarshal the members.
-  if (
+  return (
     (strm >> _tao_aggregate.forward.out ()) &&
     (strm >> CORBA::Any::to_boolean (_tao_aggregate.permanent))
-  )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+  );
 }
 
 // TAO_IDL - Generated from
@@ -2165,15 +2151,8 @@ CORBA::Boolean operator<< (
     const PortableInterceptor::InvalidSlot &_tao_aggregate
   )
 {
-  // First marshal the repository ID.
-  if (strm << _tao_aggregate._rep_id ())
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+  // Marshal the repository ID.
+  return (strm << _tao_aggregate._rep_id ());
 }
 
 CORBA::Boolean operator>> (
@@ -2181,7 +2160,7 @@ CORBA::Boolean operator>> (
     PortableInterceptor::InvalidSlot&
   )
 {
-  return 1;
+  return true;
 }
 
 // TAO_IDL - Generated from
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index 2692cee4995..424c56edd69 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -50,11 +50,19 @@
 
 #include "tao/PI_ForwardC.h"
 #include "tao/CurrentC.h"
+#include "tao/DynamicC.h"
 #include "tao/Messaging_SyncScopeC.h"
 #include "tao/IOP_CodecC.h"
 #include "tao/IOP_IORC.h"
+#include "tao/orb_typesC.h"
 #include "tao/PolicyC.h"
 
+#include "PI_ForwardC.h"
+#include "tao/Messaging_SyncScopeC.h"
+#include "tao/IOP_CodecC.h"
+#include "tao/PolicyC.h"
+#include "tao/CurrentC.h"
+
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
@@ -76,7 +84,7 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// Hand crafted, keep DynamicC.h out of header files.
+// Hand crafted, keeps DynamicC.h and Typecode.h out of header files.
 namespace Dynamic
 {
   class ParameterList;
@@ -85,13 +93,13 @@ namespace Dynamic
   typedef CORBA::StringSeq RequestContext;
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -101,47 +109,47 @@ namespace TAO
 
 namespace PortableInterceptor
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::AdapterState HOLDING = 0;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::AdapterState ACTIVE = 1;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::AdapterState DISCARDING = 2;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::AdapterState INACTIVE = 3;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::AdapterState NON_EXISTENT = 4;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR__VAR_OUT_CH_
-
+  
   class Interceptor;
   typedef Interceptor *Interceptor_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Interceptor
       >
     Interceptor_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Interceptor
@@ -149,101 +157,101 @@ namespace PortableInterceptor
     Interceptor_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR_CH_
-
+  
   class TAO_Export Interceptor
     : public virtual CORBA::Object
   {
   public:
     typedef Interceptor_ptr _ptr_type;
     typedef Interceptor_var _var_type;
-
+    
     // The static operations.
     static Interceptor_ptr _duplicate (Interceptor_ptr obj);
-
+    
     static Interceptor_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Interceptor_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static Interceptor_ptr _nil (void)
     {
-      return (Interceptor_ptr)0;
+      return static_cast<Interceptor_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     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:
     // Abstract or local interface only.
     Interceptor (void);
-
+    
     virtual ~Interceptor (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     Interceptor (const Interceptor &);
-
+    
     void operator= (const Interceptor &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Interceptor;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLEINTERCEPTOR_FORWARDREQUEST_CH_)
 #define _PORTABLEINTERCEPTOR_FORWARDREQUEST_CH_
-
+  
   class TAO_Export ForwardRequest : public CORBA::UserException
   {
   public:
-
+    
     CORBA::Object_var forward;
     CORBA::Boolean permanent;
     ForwardRequest (void);
@@ -251,14 +259,14 @@ namespace PortableInterceptor
     ~ForwardRequest (void);
 
     ForwardRequest &operator= (const ForwardRequest &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static ForwardRequest *_downcast (CORBA::Exception *);
     static const ForwardRequest *_downcast (CORBA::Exception const *);
-
+    
     static CORBA::Exception *_alloc (void);
-
+    
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -267,113 +275,113 @@ namespace PortableInterceptor
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ctor.cpp:66
-
+    
     ForwardRequest (
         const CORBA::Object_ptr  _tao_forward,
         CORBA::Boolean _tao_permanent
       );
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:127
-
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
-
+  // be\be_visitor_typedef/typedef_ch.cpp:379
+  
   typedef CORBA::Short ReplyStatus;
   typedef CORBA::Short_out ReplyStatus_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ReplyStatus;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::ReplyStatus SUCCESSFUL = 0;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::ReplyStatus SYSTEM_EXCEPTION = 1;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::ReplyStatus USER_EXCEPTION = 2;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::ReplyStatus LOCATION_FORWARD = 3;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::ReplyStatus LOCATION_FORWARD_PERMANENT = 4;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::ReplyStatus TRANSPORT_RETRY = 5;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::ReplyStatus UNKNOWN = 6;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
-
+  // be\be_visitor_typedef/typedef_ch.cpp:379
+  
   typedef CORBA::ULong SlotId;
   typedef CORBA::ULong_out SlotId_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SlotId;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLEINTERCEPTOR_INVALIDSLOT_CH_)
 #define _PORTABLEINTERCEPTOR_INVALIDSLOT_CH_
-
+  
   class TAO_Export InvalidSlot : public CORBA::UserException
   {
   public:
-
+    
     InvalidSlot (void);
     InvalidSlot (const InvalidSlot &);
     ~InvalidSlot (void);
 
     InvalidSlot &operator= (const InvalidSlot &);
-
+    
     static void _tao_any_destructor (void *);
-
+    
     static InvalidSlot *_downcast (CORBA::Exception *);
     static const InvalidSlot *_downcast (CORBA::Exception const *);
-
+    
     static CORBA::Exception *_alloc (void);
-
+    
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -382,40 +390,40 @@ namespace PortableInterceptor
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-
+    
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:127
-
+    
     virtual CORBA::TypeCode_ptr _type (void) const;
   };
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InvalidSlot;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT__VAR_OUT_CH_
-
+  
   class Current;
   typedef Current *Current_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         Current
       >
     Current_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         Current
@@ -423,43 +431,43 @@ namespace PortableInterceptor
     Current_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT_CH_
-
+  
   class TAO_Export Current
     : public virtual ::CORBA::Current
   {
   public:
     typedef Current_ptr _ptr_type;
     typedef Current_var _var_type;
-
+    
     // 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;
+      return static_cast<Current_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Any * get_slot (
         ::PortableInterceptor::SlotId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -468,10 +476,10 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::InvalidSlot
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void set_slot (
         ::PortableInterceptor::SlotId id,
         const ::CORBA::Any & data
@@ -481,53 +489,53 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::InvalidSlot
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     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:
     // Abstract or local interface only.
     Current (void);
-
+    
     virtual ~Current (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     Current (const Current &);
-
+    
     void operator= (const Current &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO__VAR_OUT_CH_
-
+  
   class RequestInfo;
   typedef RequestInfo *RequestInfo_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         RequestInfo
       >
     RequestInfo_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         RequestInfo
@@ -535,153 +543,153 @@ namespace PortableInterceptor
     RequestInfo_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO_CH_
-
+  
   class TAO_Export RequestInfo
     : public virtual CORBA::Object
   {
   public:
     typedef RequestInfo_ptr _ptr_type;
     typedef RequestInfo_var _var_type;
-
+    
     // The static operations.
     static RequestInfo_ptr _duplicate (RequestInfo_ptr obj);
-
+    
     static RequestInfo_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static RequestInfo_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static RequestInfo_ptr _nil (void)
     {
-      return (RequestInfo_ptr)0;
+      return static_cast<RequestInfo_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::ULong request_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * operation (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::Dynamic::ParameterList * arguments (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::Dynamic::ExceptionList * exceptions (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::Dynamic::ContextList * contexts (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::Dynamic::RequestContext * operation_context (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Any * result (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean response_expected (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual Messaging::SyncScope sync_scope (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual PortableInterceptor::ReplyStatus reply_status (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Object_ptr forward_reference (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Any * get_slot (
         ::PortableInterceptor::SlotId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -690,10 +698,10 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::InvalidSlot
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::IOP::ServiceContext * get_request_service_context (
         ::IOP::ServiceId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -701,10 +709,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::IOP::ServiceContext * get_reply_service_context (
         ::IOP::ServiceId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -712,53 +720,53 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     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:
     // Abstract or local interface only.
     RequestInfo (void);
-
+    
     virtual ~RequestInfo (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     RequestInfo (const RequestInfo &);
-
+    
     void operator= (const RequestInfo &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestInfo;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_
-
+  
   class ClientRequestInfo;
   typedef ClientRequestInfo *ClientRequestInfo_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ClientRequestInfo
       >
     ClientRequestInfo_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ClientRequestInfo
@@ -766,93 +774,93 @@ namespace PortableInterceptor
     ClientRequestInfo_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_
-
+  
   class TAO_Export ClientRequestInfo
     : public virtual ::PortableInterceptor::RequestInfo
   {
   public:
     typedef ClientRequestInfo_ptr _ptr_type;
     typedef ClientRequestInfo_var _var_type;
-
+    
     // The static operations.
     static ClientRequestInfo_ptr _duplicate (ClientRequestInfo_ptr obj);
-
+    
     static ClientRequestInfo_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ClientRequestInfo_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ClientRequestInfo_ptr _nil (void)
     {
-      return (ClientRequestInfo_ptr)0;
+      return static_cast<ClientRequestInfo_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Object_ptr target (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Object_ptr effective_target (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::IOP::TaggedProfile * effective_profile (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Any * received_exception (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * received_exception_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::IOP::TaggedComponent * get_effective_component (
         ::IOP::ComponentId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -860,10 +868,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::IOP::TaggedComponentSeq * get_effective_components (
         ::IOP::ComponentId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -871,10 +879,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::Policy_ptr get_request_policy (
         ::CORBA::PolicyType type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -882,10 +890,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void add_request_service_context (
         const ::IOP::ServiceContext & service_context,
         ::CORBA::Boolean replace
@@ -894,53 +902,53 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     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:
     // Abstract or local interface only.
     ClientRequestInfo (void);
-
+    
     virtual ~ClientRequestInfo (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     ClientRequestInfo (const ClientRequestInfo &);
-
+    
     void operator= (const ClientRequestInfo &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ClientRequestInfo;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_
-
+  
   class ServerRequestInfo;
   typedef ServerRequestInfo *ServerRequestInfo_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ServerRequestInfo
       >
     ServerRequestInfo_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ServerRequestInfo
@@ -948,113 +956,113 @@ namespace PortableInterceptor
     ServerRequestInfo_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO_CH_
-
+  
   class TAO_Export ServerRequestInfo
     : public virtual ::PortableInterceptor::RequestInfo
   {
   public:
     typedef ServerRequestInfo_ptr _ptr_type;
     typedef ServerRequestInfo_var _var_type;
-
+    
     // The static operations.
     static ServerRequestInfo_ptr _duplicate (ServerRequestInfo_ptr obj);
-
+    
     static ServerRequestInfo_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerRequestInfo_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerRequestInfo_ptr _nil (void)
     {
-      return (ServerRequestInfo_ptr)0;
+      return static_cast<ServerRequestInfo_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Any * sending_exception (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * server_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * orb_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableInterceptor::AdapterName * adapter_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::PortableInterceptor::ObjectId * object_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::OctetSeq * adapter_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual char * target_most_derived_interface (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::Policy_ptr get_server_policy (
         ::CORBA::PolicyType type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1062,10 +1070,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void set_slot (
         ::PortableInterceptor::SlotId id,
         const ::CORBA::Any & data
@@ -1075,10 +1083,10 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::InvalidSlot
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::Boolean target_is_a (
         const char * id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1086,10 +1094,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void add_reply_service_context (
         const ::IOP::ServiceContext & service_context,
         ::CORBA::Boolean replace
@@ -1098,53 +1106,53 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     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:
     // Abstract or local interface only.
     ServerRequestInfo (void);
-
+    
     virtual ~ServerRequestInfo (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     ServerRequestInfo (const ServerRequestInfo &);
-
+    
     void operator= (const ServerRequestInfo &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerRequestInfo;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__VAR_OUT_CH_
-
+  
   class ClientRequestInterceptor;
   typedef ClientRequestInterceptor *ClientRequestInterceptor_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ClientRequestInterceptor
       >
     ClientRequestInterceptor_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ClientRequestInterceptor
@@ -1152,43 +1160,43 @@ namespace PortableInterceptor
     ClientRequestInterceptor_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR_CH_
-
+  
   class TAO_Export ClientRequestInterceptor
     : public virtual ::PortableInterceptor::Interceptor
   {
   public:
     typedef ClientRequestInterceptor_ptr _ptr_type;
     typedef ClientRequestInterceptor_var _var_type;
-
+    
     // The static operations.
     static ClientRequestInterceptor_ptr _duplicate (ClientRequestInterceptor_ptr obj);
-
+    
     static ClientRequestInterceptor_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ClientRequestInterceptor_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ClientRequestInterceptor_ptr _nil (void)
     {
-      return (ClientRequestInterceptor_ptr)0;
+      return static_cast<ClientRequestInterceptor_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void send_request (
         ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1197,10 +1205,10 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void send_poll (
         ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1208,10 +1216,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void receive_reply (
         ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1219,10 +1227,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void receive_exception (
         ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1231,10 +1239,10 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void receive_other (
         ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1243,53 +1251,53 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     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:
     // Abstract or local interface only.
     ClientRequestInterceptor (void);
-
+    
     virtual ~ClientRequestInterceptor (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     ClientRequestInterceptor (const ClientRequestInterceptor &);
-
+    
     void operator= (const ClientRequestInterceptor &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ClientRequestInterceptor;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_
-
+  
   class ServerRequestInterceptor;
   typedef ServerRequestInterceptor *ServerRequestInterceptor_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ServerRequestInterceptor
       >
     ServerRequestInterceptor_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ServerRequestInterceptor
@@ -1297,58 +1305,58 @@ namespace PortableInterceptor
     ServerRequestInterceptor_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR_CH_
-
+  
   class TAO_Export ServerRequestInterceptor
     : public virtual ::PortableInterceptor::Interceptor
   {
   public:
     typedef ServerRequestInterceptor_ptr _ptr_type;
     typedef ServerRequestInterceptor_var _var_type;
-
+    
     // The static operations.
     static ServerRequestInterceptor_ptr _duplicate (ServerRequestInterceptor_ptr obj);
-
+    
     static ServerRequestInterceptor_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerRequestInterceptor_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ServerRequestInterceptor_ptr _nil (void)
     {
-      return (ServerRequestInterceptor_ptr)0;
+      return static_cast<ServerRequestInterceptor_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 #if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
-
+    
     virtual void tao_ft_interception_point (
         ::PortableInterceptor::ServerRequestInfo_ptr ri,
-        ::CORBA::OctetSeq_out
+        CORBA::OctetSeq_out
         ACE_ENV_ARG_DECL_NOT_USED
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
         )) {}
-
+    
 #endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void receive_request_service_contexts (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1357,10 +1365,10 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void receive_request (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1369,10 +1377,10 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void send_reply (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1380,10 +1388,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void send_exception (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1392,10 +1400,10 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual void send_other (
         ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1404,53 +1412,53 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     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:
     // Abstract or local interface only.
     ServerRequestInterceptor (void);
-
+    
     virtual ~ServerRequestInterceptor (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     ServerRequestInterceptor (const ServerRequestInterceptor &);
-
+    
     void operator= (const ServerRequestInterceptor &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerRequestInterceptor;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_
-
+  
   class PolicyFactory;
   typedef PolicyFactory *PolicyFactory_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         PolicyFactory
       >
     PolicyFactory_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         PolicyFactory
@@ -1458,40 +1466,40 @@ namespace PortableInterceptor
     PolicyFactory_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY_CH_
-
+  
   class TAO_Export PolicyFactory
     : public virtual CORBA::Object
   {
   public:
     typedef PolicyFactory_ptr _ptr_type;
     typedef PolicyFactory_var _var_type;
-
+    
     // The static operations.
     static PolicyFactory_ptr _duplicate (PolicyFactory_ptr obj);
-
+    
     static PolicyFactory_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PolicyFactory_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static PolicyFactory_ptr _nil (void)
     {
-      return (PolicyFactory_ptr)0;
+      return static_cast<PolicyFactory_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // Hand-crafted addition.
     virtual ::CORBA::Policy_ptr _create_policy (
         CORBA::PolicyType type
@@ -1504,7 +1512,7 @@ namespace PortableInterceptor
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual ::CORBA::Policy_ptr create_policy (
         ::CORBA::PolicyType type,
         const ::CORBA::Any & value
@@ -1514,53 +1522,53 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::CORBA::PolicyError
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     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:
     // Abstract or local interface only.
     PolicyFactory (void);
-
+    
     virtual ~PolicyFactory (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     PolicyFactory (const PolicyFactory &);
-
+    
     void operator= (const PolicyFactory &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PolicyFactory;
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_
-
+  
   class IORInterceptor;
   typedef IORInterceptor *IORInterceptor_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         IORInterceptor
       >
     IORInterceptor_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         IORInterceptor
@@ -1568,22 +1576,22 @@ namespace PortableInterceptor
     IORInterceptor_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO__VAR_OUT_CH_
-
+  
   class ORBInitInfo;
   typedef ORBInitInfo *ORBInitInfo_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         ORBInitInfo
       >
     ORBInitInfo_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         ORBInitInfo
@@ -1591,76 +1599,76 @@ namespace PortableInterceptor
     ORBInitInfo_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO_CH_
-
+  
   class TAO_Export ORBInitInfo
     : public virtual CORBA::Object
   {
   public:
     typedef ORBInitInfo_ptr _ptr_type;
     typedef ORBInitInfo_var _var_type;
-
+    
     // The static operations.
     static ORBInitInfo_ptr _duplicate (ORBInitInfo_ptr obj);
-
+    
     static ORBInitInfo_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ORBInitInfo_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static ORBInitInfo_ptr _nil (void)
     {
-      return (ORBInitInfo_ptr)0;
+      return static_cast<ORBInitInfo_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
-    // be\be_visitor_typedef/typedef_ch.cpp:376
-
+    // be\be_visitor_typedef/typedef_ch.cpp:413
+    
     typedef char * ObjectId;
     typedef CORBA::String_var ObjectId_var;
     typedef CORBA::String_out ObjectId_out;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_ObjectId;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_DUPLICATENAME_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO_DUPLICATENAME_CH_
-
+    
     class TAO_Export DuplicateName : public CORBA::UserException
     {
     public:
-
+      
       TAO_String_Manager name;
       DuplicateName (void);
       DuplicateName (const DuplicateName &);
       ~DuplicateName (void);
 
       DuplicateName &operator= (const DuplicateName &);
-
+      
       static void _tao_any_destructor (void *);
-
+      
       static DuplicateName *_downcast (CORBA::Exception *);
       static const DuplicateName *_downcast (CORBA::Exception const *);
-
+      
       static CORBA::Exception *_alloc (void);
-
+      
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -1669,38 +1677,38 @@ namespace PortableInterceptor
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-
+      
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-
+      
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ctor.cpp:66
-
+      
       DuplicateName (
           const char * _tao_name
         );
-
+      
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
-
+      
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-
+    
     static ::CORBA::TypeCode_ptr _tc_DuplicateName;
 
 #endif /* end #if !defined */
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_INVALIDNAME_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO_INVALIDNAME_CH_
-
+    
     class TAO_Export InvalidName : public CORBA::UserException
     {
     public:
@@ -1940,7 +1948,7 @@ namespace PortableInterceptor
     
     static ORBInitializer_ptr _nil (void)
     {
-      return (ORBInitializer_ptr)0;
+      return static_cast<ORBInitializer_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
diff --git a/TAO/tao/PortableServer/Active_Object_Map.cpp b/TAO/tao/PortableServer/Active_Object_Map.cpp
index b36669d417a..0a7320f06e4 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map.cpp
@@ -1,6 +1,8 @@
 // $Id$
 
 #include "Active_Object_Map.h"
+#include "Active_Object_Map_Entry.h"
+#include "tao/SystemException.h"
 
 #if !defined (__ACE_INLINE__)
 # include "Active_Object_Map.i"
@@ -8,18 +10,9 @@
 
 #include "ace/Auto_Ptr.h"
 
-ACE_RCSID(tao, Active_Object_Map, "$Id$")
-
-
-TAO_Active_Object_Map::Map_Entry::Map_Entry (void)
-  : user_id_ (),
-    system_id_ (),
-    servant_ (0),
-    reference_count_ (1),
-    deactivated_ (0),
-    priority_ (-1)
-{
-}
+ACE_RCSID(PortableServer,
+          Active_Object_Map,
+          "$Id$")
 
 /* static */
 size_t TAO_Active_Object_Map::system_id_size_ = 0;
@@ -333,7 +326,7 @@ TAO_Active_Object_Map::is_user_id_in_map (const PortableServer::ObjectId &user_i
                                           int &priorities_match,
                                           int &deactivated)
 {
-  Map_Entry *entry = 0;
+  TAO_Active_Object_Map_Entry *entry = 0;
   int result = this->user_id_map_->find (user_id,
                                          entry);
   if (result == 0)
@@ -378,7 +371,7 @@ int
 TAO_Unique_Id_Strategy::is_servant_in_map (PortableServer::Servant servant,
                                            int &deactivated)
 {
-  TAO_Active_Object_Map::Map_Entry *entry = 0;
+  TAO_Active_Object_Map_Entry *entry = 0;
   int result = this->active_object_map_->servant_map_->find (servant,
                                                              entry);
   if (result == 0)
@@ -401,7 +394,7 @@ int
 TAO_Unique_Id_Strategy::bind_using_user_id (PortableServer::Servant servant,
                                             const PortableServer::ObjectId &user_id,
                                             CORBA::Short priority,
-                                            TAO_Active_Object_Map::Map_Entry *&entry)
+                                            TAO_Active_Object_Map_Entry *&entry)
 {
   int result = this->active_object_map_->user_id_map_->find (user_id,
                                                              entry);
@@ -418,7 +411,7 @@ TAO_Unique_Id_Strategy::bind_using_user_id (PortableServer::Servant servant,
   else
     {
       ACE_NEW_RETURN (entry,
-                      TAO_Active_Object_Map::Map_Entry,
+                      TAO_Active_Object_Map_Entry,
                       -1);
       entry->user_id_ = user_id;
       entry->servant_ = servant;
@@ -458,7 +451,7 @@ TAO_Unique_Id_Strategy::bind_using_user_id (PortableServer::Servant servant,
 int
 TAO_Unique_Id_Strategy::unbind_using_user_id (const PortableServer::ObjectId &user_id)
 {
-  TAO_Active_Object_Map::Map_Entry *entry = 0;
+  TAO_Active_Object_Map_Entry *entry = 0;
   int result = this->active_object_map_->user_id_map_->unbind (user_id,
                                                                entry);
   if (result == 0)
@@ -480,7 +473,7 @@ int
 TAO_Unique_Id_Strategy::find_user_id_using_servant (PortableServer::Servant servant,
                                                     PortableServer::ObjectId_out user_id)
 {
-  TAO_Active_Object_Map::Map_Entry *entry = 0;
+  TAO_Active_Object_Map_Entry *entry = 0;
   int result = this->active_object_map_->servant_map_->find (servant,
                                                              entry);
   if (result == 0)
@@ -501,7 +494,7 @@ TAO_Unique_Id_Strategy::find_system_id_using_servant (PortableServer::Servant se
                                                       PortableServer::ObjectId_out system_id,
                                                       CORBA::Short &priority)
 {
-  TAO_Active_Object_Map::Map_Entry *entry = 0;
+  TAO_Active_Object_Map_Entry *entry = 0;
   int result = this->active_object_map_->servant_map_->find (servant,
                                                              entry);
   if (result == 0)
@@ -542,7 +535,7 @@ int
 TAO_Multiple_Id_Strategy::bind_using_user_id (PortableServer::Servant servant,
                                               const PortableServer::ObjectId &user_id,
                                               CORBA::Short priority,
-                                              TAO_Active_Object_Map::Map_Entry *&entry)
+                                              TAO_Active_Object_Map_Entry *&entry)
 {
   int result = this->active_object_map_->user_id_map_->find (user_id,
                                                              entry);
@@ -554,7 +547,7 @@ TAO_Multiple_Id_Strategy::bind_using_user_id (PortableServer::Servant servant,
   else
     {
       ACE_NEW_RETURN (entry,
-                      TAO_Active_Object_Map::Map_Entry,
+                      TAO_Active_Object_Map_Entry,
                       -1);
       entry->user_id_ = user_id;
       entry->servant_ = servant;
@@ -583,7 +576,7 @@ TAO_Multiple_Id_Strategy::bind_using_user_id (PortableServer::Servant servant,
 int
 TAO_Multiple_Id_Strategy::unbind_using_user_id (const PortableServer::ObjectId &user_id)
 {
-  TAO_Active_Object_Map::Map_Entry *entry = 0;
+  TAO_Active_Object_Map_Entry *entry = 0;
   int result = this->active_object_map_->user_id_map_->unbind (user_id,
                                                                entry);
   if (result == 0)
@@ -627,7 +620,7 @@ TAO_Multiple_Id_Strategy::remaining_activations (PortableServer::Servant servant
        ++iter)
     {
       TAO_Active_Object_Map::user_id_map::value_type map_pair = *iter;
-      TAO_Active_Object_Map::Map_Entry *entry = map_pair.second ();
+      TAO_Active_Object_Map_Entry *entry = map_pair.second ();
 
       if (entry->servant_ == servant)
         return 1;
@@ -650,7 +643,7 @@ int
 TAO_Transient_Strategy::find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
                                                                   const PortableServer::ObjectId &user_id,
                                                                   PortableServer::Servant &servant,
-                                                                  TAO_Active_Object_Map::Map_Entry *&entry)
+                                                                  TAO_Active_Object_Map_Entry *&entry)
 {
   int result = this->active_object_map_->id_hint_strategy_->find (system_id,
                                                                   entry);
@@ -690,7 +683,7 @@ int
 TAO_Persistent_Strategy::find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
                                                                    const PortableServer::ObjectId &user_id,
                                                                    PortableServer::Servant &servant,
-                                                                   TAO_Active_Object_Map::Map_Entry *&entry)
+                                                                   TAO_Active_Object_Map_Entry *&entry)
 {
   int result = this->active_object_map_->id_hint_strategy_->find (system_id,
                                                                   entry);
@@ -738,7 +731,7 @@ TAO_Id_Assignment_Strategy::set_active_object_map (TAO_Active_Object_Map *active
 int
 TAO_User_Id_Strategy::bind_using_system_id (PortableServer::Servant,
                                             CORBA::Short,
-                                            TAO_Active_Object_Map::Map_Entry *&)
+                                            TAO_Active_Object_Map_Entry *&)
 {
   return -1;
 }
@@ -746,10 +739,10 @@ TAO_User_Id_Strategy::bind_using_system_id (PortableServer::Servant,
 int
 TAO_System_Id_With_Unique_Id_Strategy::bind_using_system_id (PortableServer::Servant servant,
                                                              CORBA::Short priority,
-                                                             TAO_Active_Object_Map::Map_Entry *&entry)
+                                                             TAO_Active_Object_Map_Entry *&entry)
 {
   ACE_NEW_RETURN (entry,
-                  TAO_Active_Object_Map::Map_Entry,
+                  TAO_Active_Object_Map_Entry,
                   -1);
 
   int result = this->active_object_map_->user_id_map_->bind_create_key (entry,
@@ -789,10 +782,10 @@ TAO_System_Id_With_Unique_Id_Strategy::bind_using_system_id (PortableServer::Ser
 int
 TAO_System_Id_With_Multiple_Id_Strategy::bind_using_system_id (PortableServer::Servant servant,
                                                                CORBA::Short priority,
-                                                               TAO_Active_Object_Map::Map_Entry *&entry)
+                                                               TAO_Active_Object_Map_Entry *&entry)
 {
   ACE_NEW_RETURN (entry,
-                  TAO_Active_Object_Map::Map_Entry,
+                  TAO_Active_Object_Map_Entry,
                   -1);
   int result = this->active_object_map_->user_id_map_->bind_create_key (entry,
                                                                         entry->user_id_);
@@ -841,7 +834,7 @@ TAO_Active_Hint_Strategy::recover_key (const PortableServer::ObjectId &system_id
 }
 
 int
-TAO_Active_Hint_Strategy::bind (TAO_Active_Object_Map::Map_Entry &entry)
+TAO_Active_Hint_Strategy::bind (TAO_Active_Object_Map_Entry &entry)
 {
   entry.system_id_ = entry.user_id_;
 
@@ -850,14 +843,14 @@ TAO_Active_Hint_Strategy::bind (TAO_Active_Object_Map::Map_Entry &entry)
 }
 
 int
-TAO_Active_Hint_Strategy::unbind (TAO_Active_Object_Map::Map_Entry &entry)
+TAO_Active_Hint_Strategy::unbind (TAO_Active_Object_Map_Entry &entry)
 {
   return this->system_id_map_.unbind (entry.system_id_);
 }
 
 int
 TAO_Active_Hint_Strategy::find (const PortableServer::ObjectId &system_id,
-                                TAO_Active_Object_Map::Map_Entry *&entry)
+                                TAO_Active_Object_Map_Entry *&entry)
 {
   return this->system_id_map_.find (system_id,
                                     entry);
@@ -871,7 +864,7 @@ TAO_Active_Hint_Strategy::hint_size (void)
 
 int
 TAO_Active_Hint_Strategy::system_id (PortableServer::ObjectId_out system_id,
-                                     TAO_Active_Object_Map::Map_Entry &entry)
+                                     TAO_Active_Object_Map_Entry &entry)
 {
   ACE_NEW_RETURN (system_id,
                   PortableServer::ObjectId (entry.system_id_),
@@ -900,7 +893,7 @@ TAO_No_Hint_Strategy::recover_key (const PortableServer::ObjectId &system_id,
 }
 
 int
-TAO_No_Hint_Strategy::bind (TAO_Active_Object_Map::Map_Entry &entry)
+TAO_No_Hint_Strategy::bind (TAO_Active_Object_Map_Entry &entry)
 {
   ACE_UNUSED_ARG (entry);
 
@@ -908,7 +901,7 @@ TAO_No_Hint_Strategy::bind (TAO_Active_Object_Map::Map_Entry &entry)
 }
 
 int
-TAO_No_Hint_Strategy::unbind (TAO_Active_Object_Map::Map_Entry &entry)
+TAO_No_Hint_Strategy::unbind (TAO_Active_Object_Map_Entry &entry)
 {
   ACE_UNUSED_ARG (entry);
 
@@ -917,7 +910,7 @@ TAO_No_Hint_Strategy::unbind (TAO_Active_Object_Map::Map_Entry &entry)
 
 int
 TAO_No_Hint_Strategy::find (const PortableServer::ObjectId &system_id,
-                            TAO_Active_Object_Map::Map_Entry *&entry)
+                            TAO_Active_Object_Map_Entry *&entry)
 {
   ACE_UNUSED_ARG (system_id);
   ACE_UNUSED_ARG (entry);
@@ -933,7 +926,7 @@ TAO_No_Hint_Strategy::hint_size (void)
 
 int
 TAO_No_Hint_Strategy::system_id (PortableServer::ObjectId_out system_id,
-                                 TAO_Active_Object_Map::Map_Entry &entry)
+                                 TAO_Active_Object_Map_Entry &entry)
 {
   ACE_NEW_RETURN (system_id,
                   PortableServer::ObjectId (entry.user_id_),
@@ -966,7 +959,7 @@ template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map::user_id_map>;
 // Common typedefs.
 typedef PortableServer::ObjectId id;
 typedef PortableServer::Servant servant;
-typedef TAO_Active_Object_Map::Map_Entry *value;
+typedef TAO_Active_Object_Map_Entry *value;
 
 typedef ACE_Pair<id, value> id_expanded_value;
 typedef ACE_Reference_Pair<const id, value> id_value_type;
@@ -1073,7 +1066,7 @@ template class ACE_Map_Entry<servant, value>;
 // Common typedefs.
 typedef PortableServer::ObjectId id;
 typedef PortableServer::Servant servant;
-typedef TAO_Active_Object_Map::Map_Entry * value;
+typedef TAO_Active_Object_Map_Entry * value;
 
 typedef ACE_Pair<id, value> id_expanded_value;
 typedef ACE_Reference_Pair<const id, value> id_value_type;
diff --git a/TAO/tao/PortableServer/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h
index 9ae84b0185f..7b691edd1a0 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.h
+++ b/TAO/tao/PortableServer/Active_Object_Map.h
@@ -16,21 +16,24 @@
 
 #include /**/ "ace/pre.h"
 
-#include "Key_Adapters.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "Servant_Base.h"
+#include "Key_Adapters.h"
 
+#include "ace/Map_T.h"
 #include "tao/Server_Strategy_Factory.h"
+#include "Servant_Base.h"
 
 // Forward declarations.
 class TAO_Id_Uniqueness_Strategy;
 class TAO_Lifespan_Strategy;
 class TAO_Id_Assignment_Strategy;
 class TAO_Id_Hint_Strategy;
+struct TAO_Active_Object_Map_Entry;
 
 /**
  * @class TAO_Active_Object_Map
@@ -43,40 +46,6 @@ class TAO_PortableServer_Export TAO_Active_Object_Map
 {
 public:
 
-  /**
-   * @struct Map_Entry
-   *
-   * @brief Value field of the active object map.
-   *
-   * We need a mapping from and to all of the following fields:
-   * user_id, system_id, and servant.  Therefore, we keep
-   * all the fields together in the map.
-   */
-  struct Map_Entry
-  {
-
-    /// Default constructor.
-    Map_Entry (void);
-
-    /// User id.
-    PortableServer::ObjectId user_id_;
-
-    /// System id.
-    PortableServer::ObjectId system_id_;
-
-    /// Servant.
-    PortableServer::Servant servant_;
-
-    /// Reference count on outstanding requests on this servant.
-    CORBA::UShort reference_count_;
-
-    /// Has this servant been deactivated already?
-    CORBA::Boolean deactivated_;
-
-    /// Priority of this servant.
-    CORBA::Short priority_;
-  };
-
   /// Constructor.
   TAO_Active_Object_Map (int user_id_policy,
                          int unique_id_policy,
@@ -124,7 +93,7 @@ public:
   int rebind_using_user_id_and_system_id (PortableServer::Servant servant,
                                           const PortableServer::ObjectId &user_id,
                                           const PortableServer::ObjectId &system_id,
-                                          TAO_Active_Object_Map::Map_Entry *&entry);
+                                          TAO_Active_Object_Map_Entry *&entry);
 
   /// Can be used with any policy.  With the SYSTEM_ID policy,
   /// user_id is actually system_id.
@@ -150,7 +119,7 @@ public:
   int find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
                                                 const PortableServer::ObjectId &user_id,
                                                 PortableServer::Servant &servant,
-                                                TAO_Active_Object_Map::Map_Entry *&entry);
+                                                TAO_Active_Object_Map_Entry *&entry);
 
   /// Can be used with any policy.  With the SYSTEM_ID policy,
   /// @a user_id is identical to @a system_id.
@@ -162,7 +131,7 @@ public:
   /// Can be used with any policy.  With the SYSTEM_ID policy,
   /// <user_id> is identical to <system_id>.
   int find_servant_and_system_id_using_user_id (const PortableServer::ObjectId &user_id,
-                                                TAO_Active_Object_Map::Map_Entry *&entry);
+                                                TAO_Active_Object_Map_Entry *&entry);
 
   /// Can be used with any policy.  When the SYSTEM_ID policy is used,
   /// the <system_id> is identical to <user_id>.
@@ -174,7 +143,7 @@ public:
   int find_user_id_using_system_id (const PortableServer::ObjectId &system_id,
                                     PortableServer::ObjectId &user_id);
 
-  /// Are there any remaining activations of <servant> in the active
+  /// Are there any remaining activations of @a servant in the active
   /// object map?  Can be used with any policy.
   CORBA::Boolean remaining_activations (PortableServer::Servant servant);
 
@@ -190,12 +159,12 @@ public:
   /// Base class of the id map.
   typedef ACE_Map<
   PortableServer::ObjectId,
-    Map_Entry *> user_id_map;
+    TAO_Active_Object_Map_Entry *> user_id_map;
 
   /// Id hash map.
   typedef ACE_Hash_Map_Manager_Ex_Adapter<
   PortableServer::ObjectId,
-    Map_Entry *,
+    TAO_Active_Object_Map_Entry *,
     TAO_ObjectId_Hash,
     ACE_Equal_To<PortableServer::ObjectId>,
     TAO_Incremental_Key_Generator> user_id_hash_map;
@@ -204,25 +173,25 @@ public:
   /// Id linear map.
   typedef ACE_Map_Manager_Adapter<
   PortableServer::ObjectId,
-    Map_Entry *,
+    TAO_Active_Object_Map_Entry *,
     TAO_Incremental_Key_Generator> user_id_linear_map;
 #endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */
 
   /// Id active map.
   typedef ACE_Active_Map_Manager_Adapter<
   PortableServer::ObjectId,
-    Map_Entry *,
+    TAO_Active_Object_Map_Entry *,
     TAO_Ignore_Original_Key_Adapter> user_id_active_map;
 
   /// Base class of the servant map.
   typedef ACE_Map<
   PortableServer::Servant,
-    Map_Entry *> servant_map;
+    TAO_Active_Object_Map_Entry *> servant_map;
 
   /// Servant hash map.
   typedef ACE_Hash_Map_Manager_Ex_Adapter<
   PortableServer::Servant,
-    Map_Entry *,
+    TAO_Active_Object_Map_Entry *,
     TAO_Servant_Hash,
     ACE_Equal_To<PortableServer::Servant>,
     ACE_Noop_Key_Generator<PortableServer::Servant> > servant_hash_map;
@@ -231,7 +200,7 @@ public:
   /// Servant linear map.
   typedef ACE_Map_Manager_Adapter<
   PortableServer::Servant,
-    Map_Entry *,
+    TAO_Active_Object_Map_Entry *,
     ACE_Noop_Key_Generator<PortableServer::Servant> > servant_linear_map;
 #endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */
 
@@ -299,7 +268,7 @@ public:
   virtual int bind_using_user_id (PortableServer::Servant servant,
                                   const PortableServer::ObjectId &user_id,
                                   CORBA::Short priority,
-                                  TAO_Active_Object_Map::Map_Entry *&entry) = 0;
+                                  TAO_Active_Object_Map_Entry *&entry) = 0;
 
   /// Are there any remaining activations of <servant> in the active
   /// object map?  Can be used with any policy.
@@ -349,7 +318,7 @@ public:
   virtual int bind_using_user_id (PortableServer::Servant servant,
                                   const PortableServer::ObjectId &user_id,
                                   CORBA::Short priority,
-                                  TAO_Active_Object_Map::Map_Entry *&entry);
+                                  TAO_Active_Object_Map_Entry *&entry);
 
   /// Are there any remaining activations of <servant> in the active
   /// object map?  Can be used with any policy.
@@ -391,7 +360,7 @@ public:
   virtual int bind_using_user_id (PortableServer::Servant servant,
                                   const PortableServer::ObjectId &user_id,
                                   CORBA::Short priority,
-                                  TAO_Active_Object_Map::Map_Entry *&entry);
+                                  TAO_Active_Object_Map_Entry *&entry);
 
   /// Are there any remaining activations of <servant> in the active
   /// object map?  Can be used with any policy.
@@ -417,7 +386,7 @@ public:
   virtual int find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
                                                         const PortableServer::ObjectId &user_id,
                                                         PortableServer::Servant &servant,
-                                                        TAO_Active_Object_Map::Map_Entry *&entry) = 0;
+                                                        TAO_Active_Object_Map_Entry *&entry) = 0;
 
   /// Set the active map.
   void set_active_object_map (TAO_Active_Object_Map *active_object_map);
@@ -442,7 +411,7 @@ public:
   virtual int find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
                                                         const PortableServer::ObjectId &user_id,
                                                         PortableServer::Servant &servant,
-                                                        TAO_Active_Object_Map::Map_Entry *&entry);
+                                                        TAO_Active_Object_Map_Entry *&entry);
 };
 
 /**
@@ -459,7 +428,7 @@ public:
   virtual int find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
                                                         const PortableServer::ObjectId &user_id,
                                                         PortableServer::Servant &servant,
-                                                        TAO_Active_Object_Map::Map_Entry *&entry);
+                                                        TAO_Active_Object_Map_Entry *&entry);
 
 };
 
@@ -480,7 +449,7 @@ public:
   /// Must be used with SYSTEM_ID policy.
   virtual int bind_using_system_id (PortableServer::Servant servant,
                                     CORBA::Short priority,
-                                    TAO_Active_Object_Map::Map_Entry *&entry) = 0;
+                                    TAO_Active_Object_Map_Entry *&entry) = 0;
 
   /// Set the active map.
   void set_active_object_map (TAO_Active_Object_Map *active_object_map);
@@ -504,7 +473,7 @@ public:
   /// Must be used with SYSTEM_ID policy.
   virtual int bind_using_system_id (PortableServer::Servant servant,
                                     CORBA::Short priority,
-                                    TAO_Active_Object_Map::Map_Entry *&entry);
+                                    TAO_Active_Object_Map_Entry *&entry);
 };
 
 /**
@@ -520,7 +489,7 @@ public:
   /// Must be used with SYSTEM_ID policy.
   virtual int bind_using_system_id (PortableServer::Servant servant,
                                     CORBA::Short priority,
-                                    TAO_Active_Object_Map::Map_Entry *&entry);
+                                    TAO_Active_Object_Map_Entry *&entry);
 };
 
 /**
@@ -536,7 +505,7 @@ public:
   /// Must be used with SYSTEM_ID policy.
   virtual int bind_using_system_id (PortableServer::Servant servant,
                                     CORBA::Short priority,
-                                    TAO_Active_Object_Map::Map_Entry *&entry);
+                                    TAO_Active_Object_Map_Entry *&entry);
 };
 
 /**
@@ -558,21 +527,21 @@ public:
                            PortableServer::ObjectId &user_id) = 0;
 
   /// Add to map.
-  virtual int bind (TAO_Active_Object_Map::Map_Entry &entry) = 0;
+  virtual int bind (TAO_Active_Object_Map_Entry &entry) = 0;
 
   /// Remove from map.
-  virtual int unbind (TAO_Active_Object_Map::Map_Entry &entry) = 0;
+  virtual int unbind (TAO_Active_Object_Map_Entry &entry) = 0;
 
   /// Find system id.
   virtual int find (const PortableServer::ObjectId &system_id,
-                    TAO_Active_Object_Map::Map_Entry *&entry) = 0;
+                    TAO_Active_Object_Map_Entry *&entry) = 0;
 
   /// How big is the hint generated by this strategy?
   virtual size_t hint_size (void) = 0;
 
   /// Get the system id associated with this entry.
   virtual int system_id (PortableServer::ObjectId_out system_id,
-                         TAO_Active_Object_Map::Map_Entry &entry) = 0;
+                         TAO_Active_Object_Map_Entry &entry) = 0;
 };
 
 /**
@@ -593,21 +562,21 @@ public:
   virtual int recover_key (const PortableServer::ObjectId &system_id,
                            PortableServer::ObjectId &user_id);
 
-  virtual int bind (TAO_Active_Object_Map::Map_Entry &entry);
+  virtual int bind (TAO_Active_Object_Map_Entry &entry);
 
-  virtual int unbind (TAO_Active_Object_Map::Map_Entry &entry);
+  virtual int unbind (TAO_Active_Object_Map_Entry &entry);
 
   virtual int find (const PortableServer::ObjectId &system_id,
-                    TAO_Active_Object_Map::Map_Entry *&entry);
+                    TAO_Active_Object_Map_Entry *&entry);
 
   virtual size_t hint_size (void);
 
   virtual int system_id (PortableServer::ObjectId_out system_id,
-                         TAO_Active_Object_Map::Map_Entry &entry);
+                         TAO_Active_Object_Map_Entry &entry);
 
   typedef ACE_Active_Map_Manager_Adapter<
   PortableServer::ObjectId,
-    TAO_Active_Object_Map::Map_Entry *,
+    TAO_Active_Object_Map_Entry *,
     TAO_Preserve_Original_Key_Adapter> system_id_map;
 
   system_id_map system_id_map_;
@@ -629,17 +598,17 @@ public:
   virtual int recover_key (const PortableServer::ObjectId &system_id,
                            PortableServer::ObjectId &user_id);
 
-  virtual int bind (TAO_Active_Object_Map::Map_Entry &entry);
+  virtual int bind (TAO_Active_Object_Map_Entry &entry);
 
-  virtual int unbind (TAO_Active_Object_Map::Map_Entry &entry);
+  virtual int unbind (TAO_Active_Object_Map_Entry &entry);
 
   virtual int find (const PortableServer::ObjectId &system_id,
-                    TAO_Active_Object_Map::Map_Entry *&entry);
+                    TAO_Active_Object_Map_Entry *&entry);
 
   virtual size_t hint_size (void);
 
   virtual int system_id (PortableServer::ObjectId_out system_id,
-                         TAO_Active_Object_Map::Map_Entry &entry);
+                         TAO_Active_Object_Map_Entry &entry);
 };
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/PortableServer/Active_Object_Map.i b/TAO/tao/PortableServer/Active_Object_Map.i
index 41aeb5e597c..042624a3174 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.i
+++ b/TAO/tao/PortableServer/Active_Object_Map.i
@@ -1,5 +1,7 @@
 // $Id$
 
+#include "Active_Object_Map_Entry.h"
+
 ACE_INLINE int
 TAO_Active_Object_Map::is_servant_in_map (PortableServer::Servant servant,
                                           int &deactivated)
@@ -31,7 +33,7 @@ TAO_Active_Object_Map::bind_using_system_id_returning_system_id (PortableServer:
       return result;
     }
 
-  Map_Entry *entry = 0;
+  TAO_Active_Object_Map_Entry *entry = 0;
 
   int result = this->id_assignment_strategy_->bind_using_system_id (servant,
                                                                     priority,
@@ -48,7 +50,7 @@ TAO_Active_Object_Map::bind_using_system_id_returning_user_id (PortableServer::S
                                                                CORBA::Short priority,
                                                                PortableServer::ObjectId_out user_id)
 {
-  Map_Entry *entry = 0;
+  TAO_Active_Object_Map_Entry *entry = 0;
 
   int result = this->id_assignment_strategy_->bind_using_system_id (servant,
                                                                     priority,
@@ -65,7 +67,7 @@ TAO_Active_Object_Map::bind_using_user_id (PortableServer::Servant servant,
                                            const PortableServer::ObjectId &user_id,
                                            CORBA::Short priority)
 {
-  Map_Entry *entry = 0;
+  TAO_Active_Object_Map_Entry *entry = 0;
   return this->id_uniqueness_strategy_->bind_using_user_id (servant,
                                                             user_id,
                                                             priority,
@@ -86,7 +88,7 @@ TAO_Active_Object_Map::find_system_id_using_user_id (const PortableServer::Objec
       return 0;
     }
 
-  Map_Entry *entry = 0;
+  TAO_Active_Object_Map_Entry *entry = 0;
   int result = this->id_uniqueness_strategy_->bind_using_user_id (0,
                                                                   user_id,
                                                                   priority,
@@ -101,7 +103,7 @@ ACE_INLINE int
 TAO_Active_Object_Map::rebind_using_user_id_and_system_id (PortableServer::Servant servant,
                                                            const PortableServer::ObjectId &user_id,
                                                            const PortableServer::ObjectId &system_id,
-                                                           TAO_Active_Object_Map::Map_Entry *&entry)
+                                                           TAO_Active_Object_Map_Entry *&entry)
 {
   ACE_UNUSED_ARG (system_id);
 
@@ -139,7 +141,7 @@ ACE_INLINE int
 TAO_Active_Object_Map::find_servant_using_user_id (const PortableServer::ObjectId &user_id,
                                                    PortableServer::Servant &servant)
 {
-  Map_Entry *entry = 0;
+  TAO_Active_Object_Map_Entry *entry = 0;
   int result = this->user_id_map_->find (user_id,
                                          entry);
   if (result == 0)
@@ -159,7 +161,7 @@ ACE_INLINE int
 TAO_Active_Object_Map::find_servant_using_system_id_and_user_id (const PortableServer::ObjectId &system_id,
                                                                  const PortableServer::ObjectId &user_id,
                                                                  PortableServer::Servant &servant,
-                                                                 TAO_Active_Object_Map::Map_Entry *&entry)
+                                                                 TAO_Active_Object_Map_Entry *&entry)
 {
   return this->lifespan_strategy_->find_servant_using_system_id_and_user_id (system_id,
                                                                              user_id,
@@ -169,7 +171,7 @@ TAO_Active_Object_Map::find_servant_using_system_id_and_user_id (const PortableS
 
 ACE_INLINE int
 TAO_Active_Object_Map::find_servant_and_system_id_using_user_id (const PortableServer::ObjectId &user_id,
-                                                                 TAO_Active_Object_Map::Map_Entry *&entry)
+                                                                 TAO_Active_Object_Map_Entry *&entry)
 {
   int result = this->user_id_map_->find (user_id,
                                          entry);
@@ -191,7 +193,7 @@ TAO_Active_Object_Map::find_servant_and_system_id_using_user_id (const PortableS
                                                                  PortableServer::ObjectId_out system_id,
                                                                  CORBA::Short &priority)
 {
-  Map_Entry *entry = 0;
+  TAO_Active_Object_Map_Entry *entry = 0;
   int result = this->find_servant_and_system_id_using_user_id (user_id,
                                                                entry);
 
diff --git a/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp b/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp
new file mode 100644
index 00000000000..d7a1fa3fe64
--- /dev/null
+++ b/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp
@@ -0,0 +1,18 @@
+// $Id$
+
+#include "Active_Object_Map_Entry.h"
+
+ACE_RCSID(PortableServer,
+          Active_Object_Map_Entry,
+          "$Id$")
+
+TAO_Active_Object_Map_Entry::TAO_Active_Object_Map_Entry (void)
+  : user_id_ (),
+    system_id_ (),
+    servant_ (0),
+    reference_count_ (1),
+    deactivated_ (0),
+    priority_ (-1)
+{
+}
+
diff --git a/TAO/tao/PortableServer/Active_Object_Map_Entry.h b/TAO/tao/PortableServer/Active_Object_Map_Entry.h
new file mode 100644
index 00000000000..1c072df4201
--- /dev/null
+++ b/TAO/tao/PortableServer/Active_Object_Map_Entry.h
@@ -0,0 +1,62 @@
+/* -*- C++ -*- */
+
+//=============================================================================
+/**
+ *  @file    Active_Object_Map_Entry.h
+ *
+ *  $Id$
+ *
+ *  @author Irfan Pyarali
+ */
+//=============================================================================
+
+
+#ifndef TAO_ACTIVE_OBJECT_MAP_ENTRY_H
+#define TAO_ACTIVE_OBJECT_MAP_ENTRY_H
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "PS_ForwardC.h"
+
+/**
+ * @struct TAO_Active_Object_Map_Entry
+ *
+ * @brief Value field of the active object map.
+ *
+ * We need a mapping from and to all of the following fields:
+ * user_id, system_id, and servant.  Therefore, we keep
+ * all the fields together in the map.
+ */
+struct TAO_Active_Object_Map_Entry
+{
+  /// Default constructor.
+  TAO_Active_Object_Map_Entry (void);
+
+  /// User id.
+  PortableServer::ObjectId user_id_;
+
+  /// System id.
+  PortableServer::ObjectId system_id_;
+
+  /// Servant.
+  PortableServer::Servant servant_;
+
+  /// Reference count on outstanding requests on this servant.
+  CORBA::UShort reference_count_;
+
+  /// Has this servant been deactivated already?
+  CORBA::Boolean deactivated_;
+
+  /// Priority of this servant.
+  CORBA::Short priority_;
+};
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_ACTIVE_OBJECT_MAP_ENTRY_H */
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
new file mode 100644
index 00000000000..3049bc644ee
--- /dev/null
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
@@ -0,0 +1,229 @@
+// @(#) $Id$
+
+#include "Active_Policy_Strategies.h"
+#include "POA_Cached_Policies.h"
+#include "IdAssignmentPolicyC.h"
+#include "IdUniquenessPolicyC.h"
+#include "ImplicitActivationPolicyC.h"
+#include "LifespanPolicyC.h"
+#include "RequestProcessingPolicyC.h"
+#include "ServantRetentionPolicyC.h"
+#include "ThreadPolicyC.h"
+#include "ServantRetentionPolicyC.h"
+
+#include "ThreadStrategy.h"
+#include "ThreadStrategyFactory.h"
+#include "RequestProcessingStrategy.h"
+#include "RequestProcessingStrategyFactory.h"
+#include "IdAssignmentStrategy.h"
+#include "IdAssignmentStrategyFactory.h"
+#include "LifespanStrategy.h"
+#include "LifespanStrategyFactory.h"
+#include "IdUniquenessStrategy.h"
+#include "IdUniquenessStrategyFactory.h"
+#include "ImplicitActivationStrategy.h"
+#include "ImplicitActivationStrategyFactory.h"
+#include "ServantRetentionStrategy.h"
+#include "ServantRetentionStrategyFactory.h"
+
+#include "ace/Dynamic_Service.h"
+
+#if !defined (__ACE_INLINE__)
+# include "Active_Policy_Strategies.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID(PortableServer,
+          Active_Policy_Strategies,
+          "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    Active_Policy_Strategies::Active_Policy_Strategies() :
+      thread_strategy_ (0),
+      request_processing_strategy_ (0),
+      id_assignment_strategy_ (0),
+      lifespan_strategy_ (0),
+      id_uniqueness_strategy_ (0),
+      implicit_activation_strategy_ (0),
+      servant_retention_strategy_ (0),
+      thread_strategy_factory_ (0),
+      servant_retention_strategy_factory_ (0),
+      request_processing_strategy_factory_ (0),
+      lifespan_strategy_factory_ (0),
+      implicit_activation_strategy_factory_ (0),
+      id_uniqueness_strategy_factory_ (0),
+      id_assignment_strategy_factory_ (0)
+    {
+    }
+
+    void
+    Active_Policy_Strategies::update (Cached_Policies &policies,
+                                      TAO_Root_POA* poa
+                                      ACE_ENV_ARG_DECL)
+    {
+      thread_strategy_factory_ =
+        ACE_Dynamic_Service<ThreadStrategyFactory>::instance ("ThreadStrategyFactory");
+
+      if (thread_strategy_factory_ != 0)
+        thread_strategy_ = thread_strategy_factory_->create (policies.thread());
+
+      /**/
+
+      id_assignment_strategy_factory_ =
+        ACE_Dynamic_Service<IdAssignmentStrategyFactory>::instance ("IdAssignmentStrategyFactory");
+
+      if (id_assignment_strategy_factory_ != 0)
+        id_assignment_strategy_ = id_assignment_strategy_factory_->create (policies.id_assignment());
+
+      /**/
+
+      id_uniqueness_strategy_factory_ =
+        ACE_Dynamic_Service<IdUniquenessStrategyFactory>::instance ("IdUniquenessStrategyFactory");
+
+      if (id_uniqueness_strategy_factory_ != 0)
+        id_uniqueness_strategy_ = id_uniqueness_strategy_factory_->create (policies.id_uniqueness());
+
+      /**/
+
+      servant_retention_strategy_factory_ =
+        ACE_Dynamic_Service<ServantRetentionStrategyFactory>::instance ("ServantRetentionStrategyFactory");
+
+      if (servant_retention_strategy_factory_ != 0)
+        servant_retention_strategy_ =
+          servant_retention_strategy_factory_->create (policies.servant_retention());
+
+      /**/
+
+      request_processing_strategy_factory_ =
+        ACE_Dynamic_Service<RequestProcessingStrategyFactory>::instance ("RequestProcessingStrategyFactory");
+
+      if (request_processing_strategy_factory_ != 0)
+        request_processing_strategy_ = request_processing_strategy_factory_->create (policies.request_processing(), policies.servant_retention());
+
+      /**/
+
+      lifespan_strategy_factory_ =
+        ACE_Dynamic_Service<LifespanStrategyFactory>::instance ("LifespanStrategyFactory");
+
+      if (lifespan_strategy_factory_ != 0)
+        lifespan_strategy_ = lifespan_strategy_factory_->create (policies.lifespan());
+
+      /**/
+
+      implicit_activation_strategy_factory_ =
+        ACE_Dynamic_Service<ImplicitActivationStrategyFactory>::instance ("ImplicitActivationStrategyFactory");
+
+      if (implicit_activation_strategy_factory_ != 0)
+        implicit_activation_strategy_ = implicit_activation_strategy_factory_->create (policies.implicit_activation());
+
+      /**/
+
+// @todo, check if all pointers are != 0
+
+      if (lifespan_strategy_ != 0)
+        {
+          lifespan_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+
+      if (request_processing_strategy_ != 0)
+        {
+          request_processing_strategy_->strategy_init (poa, policies.servant_retention() ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+
+      if (id_uniqueness_strategy_ != 0)
+        {
+          id_uniqueness_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+
+      if (implicit_activation_strategy_ != 0)
+        {
+          implicit_activation_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+
+      if (thread_strategy_ != 0)
+        {
+          thread_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+
+      if (servant_retention_strategy_ != 0)
+        {
+          servant_retention_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+
+      if (id_assignment_strategy_ != 0)
+        {
+          id_assignment_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+    }
+
+    void
+    Active_Policy_Strategies::cleanup (ACE_ENV_SINGLE_ARG_DECL)
+    {
+
+      if (lifespan_strategy_ != 0)
+        {
+          lifespan_strategy_factory_->destroy (lifespan_strategy_ ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+
+          lifespan_strategy_ = 0;
+        }
+
+      if (request_processing_strategy_ != 0)
+        {
+          request_processing_strategy_factory_->destroy (request_processing_strategy_ ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+
+          request_processing_strategy_ = 0;
+        }
+
+      if (id_uniqueness_strategy_ != 0)
+        {
+          id_uniqueness_strategy_factory_->destroy (id_uniqueness_strategy_ ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+
+          id_uniqueness_strategy_ = 0;
+        }
+
+      if (implicit_activation_strategy_ != 0)
+        {
+          implicit_activation_strategy_factory_->destroy (implicit_activation_strategy_ ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+
+          implicit_activation_strategy_ = 0;
+        }
+
+      if (thread_strategy_ != 0)
+        {
+          thread_strategy_factory_->destroy (thread_strategy_ ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+
+          thread_strategy_ = 0;
+        }
+
+      if (servant_retention_strategy_ != 0)
+        {
+          servant_retention_strategy_factory_->destroy (servant_retention_strategy_ ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+
+          servant_retention_strategy_ = 0;
+        }
+
+      if (id_assignment_strategy_ != 0)
+        {
+          id_assignment_strategy_factory_->destroy (id_assignment_strategy_ ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+
+          id_assignment_strategy_ = 0;
+        }
+    }
+  }
+}
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.h b/TAO/tao/PortableServer/Active_Policy_Strategies.h
new file mode 100644
index 00000000000..aedab179e3f
--- /dev/null
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.h
@@ -0,0 +1,102 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file Active_Policy_Strategies.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_ACTIVE_POLICY_STRATEGIES_H
+#define TAO_PORTABLESERVER_ACTIVE_POLICY_STRATEGIES_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/CORBA_macros.h"
+#include "tao/Environment.h"
+
+class TAO_Root_POA;
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class Cached_Policies;
+    class ThreadStrategy;
+    class RequestProcessingStrategy;
+    class IdAssignmentStrategy;
+    class LifespanStrategy;
+    class IdUniquenessStrategy;
+    class ImplicitActivationStrategy;
+    class ServantRetentionStrategy;
+
+    class ThreadStrategyFactory;
+    class ServantRetentionStrategyFactory;
+    class RequestProcessingStrategyFactory;
+    class LifespanStrategyFactory;
+    class ImplicitActivationStrategyFactory;
+    class IdUniquenessStrategyFactory;
+    class IdAssignmentStrategyFactory;
+
+    /**
+     * This class stores the active policy strategies used for a certain POA.
+     */
+    class TAO_PortableServer_Export Active_Policy_Strategies
+    {
+    public:
+      Active_Policy_Strategies();
+
+      void update (Cached_Policies &policies,
+                   TAO_Root_POA* poa
+                   ACE_ENV_ARG_DECL);
+
+      void cleanup (ACE_ENV_SINGLE_ARG_DECL);
+
+      ThreadStrategy *thread_strategy (void) const;
+
+      RequestProcessingStrategy *request_processing_strategy (void) const;
+
+      IdAssignmentStrategy *id_assignment_strategy (void) const;
+
+      IdUniquenessStrategy *id_uniqueness_strategy (void) const;
+
+      LifespanStrategy *lifespan_strategy (void) const;
+
+      ImplicitActivationStrategy *implicit_activation_strategy (void) const;
+
+      ServantRetentionStrategy *servant_retention_strategy (void) const;
+
+    private:
+      ThreadStrategy *thread_strategy_;
+      RequestProcessingStrategy *request_processing_strategy_;
+      IdAssignmentStrategy *id_assignment_strategy_;
+      LifespanStrategy *lifespan_strategy_;
+      IdUniquenessStrategy *id_uniqueness_strategy_;
+      ImplicitActivationStrategy *implicit_activation_strategy_;
+      ServantRetentionStrategy *servant_retention_strategy_;
+
+      ThreadStrategyFactory *thread_strategy_factory_;
+      ServantRetentionStrategyFactory *servant_retention_strategy_factory_;
+      RequestProcessingStrategyFactory *request_processing_strategy_factory_;
+      LifespanStrategyFactory *lifespan_strategy_factory_;
+      ImplicitActivationStrategyFactory *implicit_activation_strategy_factory_;
+      IdUniquenessStrategyFactory *id_uniqueness_strategy_factory_;
+      IdAssignmentStrategyFactory *id_assignment_strategy_factory_;
+    };
+  }
+}
+
+#if defined (__ACE_INLINE__)
+# include "Active_Policy_Strategies.inl"
+#endif /* __ACE_INLINE__ */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_ACTIVE_POLICY_STRATEGIES_H */
diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.inl b/TAO/tao/PortableServer/Active_Policy_Strategies.inl
new file mode 100644
index 00000000000..ff04b364157
--- /dev/null
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.inl
@@ -0,0 +1,56 @@
+// @(#) $Id$
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    ACE_INLINE
+    ThreadStrategy*
+    Active_Policy_Strategies::thread_strategy (void) const
+    {
+      return thread_strategy_;
+    }
+
+    ACE_INLINE
+    RequestProcessingStrategy*
+    Active_Policy_Strategies::request_processing_strategy (void) const
+    {
+      return request_processing_strategy_;
+    }
+
+    ACE_INLINE
+    IdAssignmentStrategy *
+    Active_Policy_Strategies::id_assignment_strategy (void) const
+    {
+      return id_assignment_strategy_;
+    }
+
+    ACE_INLINE
+    IdUniquenessStrategy *
+    Active_Policy_Strategies::id_uniqueness_strategy (void) const
+    {
+      return id_uniqueness_strategy_;
+    }
+
+    ACE_INLINE
+    LifespanStrategy*
+    Active_Policy_Strategies::lifespan_strategy (void) const
+    {
+      return lifespan_strategy_;
+    }
+
+    ACE_INLINE
+    ImplicitActivationStrategy*
+    Active_Policy_Strategies::implicit_activation_strategy (void) const
+    {
+      return implicit_activation_strategy_;
+    }
+
+    ACE_INLINE
+    ServantRetentionStrategy*
+    Active_Policy_Strategies::servant_retention_strategy (void) const
+    {
+      return servant_retention_strategy_;
+    }
+  }
+}
diff --git a/TAO/tao/PortableServer/AdapterActivator.pidl b/TAO/tao/PortableServer/AdapterActivator.pidl
new file mode 100644
index 00000000000..f252872229e
--- /dev/null
+++ b/TAO/tao/PortableServer/AdapterActivator.pidl
@@ -0,0 +1,39 @@
+/**
+ * @file AdapterActivator.pidl
+ *
+ * $Id$
+ *
+ * @brief Pre-compiled IDL source for the PortableServer module.
+ *
+ * This file was used to generate the code in
+ * AdapaterActivatorC.{h,inl,cpp}, using the following command:
+ *
+ * tao_idl.exe \
+ *     -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT)
+ *          -Wb,export_macro=TAO_PortableServer_Export \
+ *          -Wb,export_include="portableserver_export.h" \
+ *          -Wb,pre_include="ace/pre.h" \
+ *          -Wb,post_include="ace/post.h" \
+ *          AdapterActivator.pidl
+ */
+
+#ifndef _PORTABLESERVER_ADAPTER_ACTIVATOR_IDL_
+#define _PORTABLESERVER_ADAPTER_ACTIVATOR_IDL_
+
+#include <tao/PortableServer/PS_Forward.pidl>
+
+#pragma prefix "omg.org"
+
+module PortableServer
+{
+  /// AdapterActivator interface.
+  local interface AdapterActivator
+  {
+#   pragma version AdapterActivator 2.3
+
+    boolean unknown_adapter (in POA parent,
+                             in string name);
+  };
+};
+
+#endif // _PORTABLESERVER_ADAPTER_ACTIVATOR_IDL_
diff --git a/TAO/tao/PortableServer/AdapterActivatorA.cpp b/TAO/tao/PortableServer/AdapterActivatorA.cpp
new file mode 100644
index 00000000000..065c3af75b0
--- /dev/null
+++ b/TAO/tao/PortableServer/AdapterActivatorA.cpp
@@ -0,0 +1,162 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+
+#include "AdapterActivatorC.h"
+#include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
+#include "tao/Any_Impl_T.h"
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+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 (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 (0x0),  // name = AdapterActivator
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_AdapterActivator (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_AdapterActivator),
+    (char *) &_oc_PortableServer_AdapterActivator,
+    0,
+    0
+  );
+
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_AdapterActivator =
+    &_tc_TAO_tc_PortableServer_AdapterActivator;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+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 false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::AdapterActivator>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::AdapterActivator_ptr _tao_elem
+  )
+{
+  PortableServer::AdapterActivator_ptr _tao_objptr =
+    PortableServer::AdapterActivator::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::AdapterActivator_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::AdapterActivator>::insert (
+      _tao_any,
+      PortableServer::AdapterActivator::_tao_any_destructor,
+      PortableServer::_tc_AdapterActivator,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::AdapterActivator_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::AdapterActivator>::extract (
+        _tao_any,
+        PortableServer::AdapterActivator::_tao_any_destructor,
+        PortableServer::_tc_AdapterActivator,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Any_Impl_T<
+        PortableServer::AdapterActivator
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        PortableServer::AdapterActivator \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/AdapterActivatorC.cpp b/TAO/tao/PortableServer/AdapterActivatorC.cpp
new file mode 100644
index 00000000000..e04c08a9822
--- /dev/null
+++ b/TAO/tao/PortableServer/AdapterActivatorC.cpp
@@ -0,0 +1,233 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:302
+
+
+#include "AdapterActivatorC.h"
+#include "tao/CDR.h"
+#include "ace/OS_NS_string.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if !defined (__ACE_INLINE__)
+#include "AdapterActivatorC.inl"
+#endif /* !defined INLINE */
+
+// TAO_IDL - Generated from
+// be\be_visitor_arg_traits.cpp:66
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+// Arg traits specializations.
+namespace TAO
+{
+}
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/interface_cs.cpp:60
+
+// Traits specializations for PortableServer::AdapterActivator.
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+PortableServer::AdapterActivator_ptr
+TAO::Objref_Traits<PortableServer::AdapterActivator>::duplicate (
+    PortableServer::AdapterActivator_ptr p
+  )
+{
+  return PortableServer::AdapterActivator::_duplicate (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+void
+TAO::Objref_Traits<PortableServer::AdapterActivator>::release (
+    PortableServer::AdapterActivator_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+PortableServer::AdapterActivator_ptr
+TAO::Objref_Traits<PortableServer::AdapterActivator>::nil (void)
+{
+  return PortableServer::AdapterActivator::_nil ();
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+CORBA::Boolean
+TAO::Objref_Traits<PortableServer::AdapterActivator>::marshal (
+    PortableServer::AdapterActivator_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return CORBA::Object::marshal (p, cdr);
+}
+
+PortableServer::AdapterActivator::AdapterActivator (void)
+{}
+
+PortableServer::AdapterActivator::~AdapterActivator (void)
+{}
+
+void 
+PortableServer::AdapterActivator::_tao_any_destructor (void *_tao_void_pointer)
+{
+  AdapterActivator *_tao_tmp_pointer =
+    static_cast<AdapterActivator *> (_tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
+}
+
+PortableServer::AdapterActivator_ptr
+PortableServer::AdapterActivator::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return AdapterActivator::_nil ();
+    }
+  
+  AdapterActivator_ptr proxy =
+    dynamic_cast<AdapterActivator_ptr> (_tao_objref);
+  
+  return AdapterActivator::_duplicate (proxy);
+}
+
+PortableServer::AdapterActivator_ptr
+PortableServer::AdapterActivator::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return AdapterActivator::_nil ();
+    }
+  
+  AdapterActivator_ptr proxy =
+    dynamic_cast<AdapterActivator_ptr> (_tao_objref);
+  
+  return AdapterActivator::_duplicate (proxy);
+}
+
+PortableServer::AdapterActivator_ptr
+PortableServer::AdapterActivator::_duplicate (AdapterActivator_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+CORBA::Boolean
+PortableServer::AdapterActivator::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/PortableServer/AdapterActivator:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+    )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+const char* PortableServer::AdapterActivator::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/PortableServer/AdapterActivator:2.3";
+}
+
+CORBA::Boolean
+PortableServer::AdapterActivator::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_root/root.cpp:1629
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Objref_Traits<
+        PortableServer::AdapterActivator
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::AdapterActivator
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::AdapterActivator
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Objref_Traits< \
+        PortableServer::AdapterActivator \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::AdapterActivator
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::AdapterActivator
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/AdapterActivatorC.h b/TAO/tao/PortableServer/AdapterActivatorC.h
new file mode 100644
index 00000000000..a48d87045ac
--- /dev/null
+++ b/TAO/tao/PortableServer/AdapterActivatorC.h
@@ -0,0 +1,253 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:153
+
+#ifndef _TAO_IDL_ORIG_ADAPTERACTIVATORC_H_
+#define _TAO_IDL_ORIG_ADAPTERACTIVATORC_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "portableserver_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
+#include "tao/Environment.h"
+#include "tao/Object.h"
+#include "tao/Objref_VarOut_T.h"
+
+#include "tao/PortableServer/PS_ForwardC.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_PortableServer_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_ch.cpp:62
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  class Collocation_Proxy_Broker;
+  
+  template<typename T> class Narrow_Utils;
+  template<typename T> class AbstractBase_Narrow_Utils;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_interface.cpp:598
+
+#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;
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_interface/interface_ch.cpp:54
+
+#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;
+    
+    // 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 static_cast<AdapterActivator_ptr> (0);
+    }
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual CORBA::Boolean unknown_adapter (
+        ::PortableServer::POA_ptr parent,
+        const char * name
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_interface/interface_ch.cpp:208
+    
+    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:
+    // Abstract or local interface only.
+    AdapterActivator (void);
+    
+    virtual ~AdapterActivator (void);
+  
+  private:
+    // Private and unimplemented for concrete interfaces.
+    AdapterActivator (const AdapterActivator &);
+    
+    void operator= (const AdapterActivator &);
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterActivator;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:66
+
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:59
+
+// Traits specializations.
+namespace TAO
+{
+
+#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_CH_)
+#define _PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_CH_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::AdapterActivator>
+  {
+    static ::PortableServer::AdapterActivator_ptr duplicate (
+        ::PortableServer::AdapterActivator_ptr
+      );
+    static void release (
+        ::PortableServer::AdapterActivator_ptr
+      );
+    static ::PortableServer::AdapterActivator_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::PortableServer::AdapterActivator_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::AdapterActivator_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::AdapterActivator_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::AdapterActivator_ptr &);
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:961
+
+#if defined (__ACE_INLINE__)
+#include "AdapterActivatorC.inl"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/PortableServer/AdapterActivatorC.inl b/TAO/tao/PortableServer/AdapterActivatorC.inl
new file mode 100644
index 00000000000..c944d806c1f
--- /dev/null
+++ b/TAO/tao/PortableServer/AdapterActivatorC.inl
@@ -0,0 +1,27 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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/Adapter_Activator.cpp b/TAO/tao/PortableServer/Adapter_Activator.cpp
new file mode 100644
index 00000000000..4a8a0386ef1
--- /dev/null
+++ b/TAO/tao/PortableServer/Adapter_Activator.cpp
@@ -0,0 +1,64 @@
+// $Id$
+
+#include "Adapter_Activator.h"
+
+ACE_RCSID (PortableServer,
+           Adapter_Activator,
+           "$Id$")
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+#include "AdapterActivatorC.h"
+#include "POAManagerC.h"
+#include "PortableServer.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    Adapter_Activator::Adapter_Activator (
+      PortableServer::POAManager_ptr pm)
+      : poa_manager_ (PortableServer::POAManager::_duplicate (pm))
+    {
+    }
+
+    CORBA::Boolean
+    Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
+                                        const char *name
+                                        ACE_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      // Default policies
+      CORBA::PolicyList default_policies;
+
+      // This assumes that the lock on the parent is recursive
+      PortableServer::POA_var child =
+        parent->create_POA (name,
+                            this->poa_manager_.in (),
+                            default_policies
+                            ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      ACE_TRY
+        {
+          child->the_activator (this ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
+      ACE_CATCHANY
+        {
+          (void) child->destroy (1,
+                                 1
+                                 ACE_ENV_ARG_PARAMETER);
+
+          return false;
+        }
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (0);
+
+      // Finally everything is fine
+      return true;
+    }
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/Adapter_Activator.h b/TAO/tao/PortableServer/Adapter_Activator.h
new file mode 100644
index 00000000000..a3cd80dc34c
--- /dev/null
+++ b/TAO/tao/PortableServer/Adapter_Activator.h
@@ -0,0 +1,61 @@
+/* -*- C++ -*- */
+
+//=============================================================================
+/**
+ *  @file    Adapter_Activator.h
+ *
+ *  $Id$
+ *
+ */
+//=============================================================================
+
+#ifndef TAO_ADAPTER_ACTIVATOR_H
+#define TAO_ADAPTER_ACTIVATOR_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "AdapterActivatorC.h"
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace PortableServer
+{
+  class POAManager;
+
+  typedef POAManager *POAManager_ptr;
+  typedef TAO_Objref_Var_T<POAManager> POAManager_var;
+}
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export Adapter_Activator
+      : public PortableServer::AdapterActivator
+    {
+    public:
+
+      Adapter_Activator (PortableServer::POAManager_ptr poa_manager);
+
+      CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent,
+                                      const char *name
+                                      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+    protected:
+
+      /// POA Manager
+      PortableServer::POAManager_var poa_manager_;
+    };
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_ADAPTER_ACTIVATOR_H */
diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
index 8654a2e71d5..25e1cb605f8 100644
--- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
+++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp
@@ -2,6 +2,8 @@
 // -- PortableServer Include --
 #include "Collocated_Object_Proxy_Broker.h"
 #include "Object_Adapter.h"
+#include "Servant_Upcall.h"
+#include "Servant_Base.h"
 
 
 // -- TAO Include --
@@ -10,8 +12,8 @@
 #include "tao/Profile.h"
 #include "tao/DomainC.h"
 
-ACE_RCSID (tao,
-           TAO_Object_Remote_Proxy_Broker,
+ACE_RCSID (PortableServer,
+           Collocated_Object_Proxy_Broker,
            "$Id$")
 
 
@@ -29,7 +31,7 @@ namespace TAO
         stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ()
           == TAO_ORB_Core::THRU_POA)
       {
-        TAO_Object_Adapter::Servant_Upcall servant_upcall (
+        TAO::Portable_Server::Servant_Upcall servant_upcall (
           stub->servant_orb_var ()->orb_core ()
         );
 
@@ -78,7 +80,7 @@ namespace TAO
             stub->servant_orb_var ()->orb_core ()
             ->get_collocation_strategy () == TAO_ORB_Core::THRU_POA)
           {
-            TAO_Object_Adapter::Servant_Upcall servant_upcall (
+            TAO::Portable_Server::Servant_Upcall servant_upcall (
               target->_stubobj ()->servant_orb_var ()->orb_core ()
               );
 
@@ -137,7 +139,7 @@ namespace TAO
             stub->servant_orb_var ()->orb_core ()
               ->get_collocation_strategy () == TAO_ORB_Core::THRU_POA)
           {
-            TAO_Object_Adapter::Servant_Upcall servant_upcall (
+            TAO::Portable_Server::Servant_Upcall servant_upcall (
                 stub->servant_orb_var ()->orb_core ()
                 );
 
@@ -196,7 +198,7 @@ namespace TAO
             stub->servant_orb_var ()->orb_core ()->get_collocation_strategy ()
               == TAO_ORB_Core::THRU_POA)
           {
-            TAO_Object_Adapter::Servant_Upcall servant_upcall (
+            TAO::Portable_Server::Servant_Upcall servant_upcall (
                 target->_stubobj ()->servant_orb_var ()->orb_core ()
                 );
 
diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h
index 75cbe3181e8..67ff38055c0 100644
--- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h
+++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h
@@ -18,13 +18,14 @@
 #define TAO_COLLOCATED_OBJECT_PROXY_BROKER_H
 #include /**/ "ace/pre.h"
 
-#include "tao/Object_Proxy_Broker.h"
 #include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Object_Proxy_Broker.h"
+
 namespace TAO
 {
   /**
@@ -35,14 +36,12 @@ namespace TAO
    * A broker for standard CORBA::Object calls that needs to be made
    * on remote objects.
    */
-
-  class TAO_PortableServer_Export Collocated_Object_Proxy_Broker 
+  class TAO_PortableServer_Export Collocated_Object_Proxy_Broker
     : public Object_Proxy_Broker
   {
   public:
     /// Please see the documentation in Object_Proxy_Broker.h for
     /// details.
-
     virtual CORBA::Boolean _is_a (CORBA::Object_ptr target,
                                   const char *logical_type_id
                                   ACE_ENV_ARG_DECL);
@@ -70,7 +69,6 @@ namespace TAO
 /// proxy broker. All the CORBA::Object share the proxy broker.
 TAO::Collocated_Object_Proxy_Broker *the_tao_collocated_object_proxy_broker (void);
 
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_COLLOCATED_OBJECT_PROXY_BROKER_H*/
diff --git a/TAO/tao/PortableServer/Creation_Time.cpp b/TAO/tao/PortableServer/Creation_Time.cpp
new file mode 100644
index 00000000000..2b938b862ce
--- /dev/null
+++ b/TAO/tao/PortableServer/Creation_Time.cpp
@@ -0,0 +1,10 @@
+#include "Creation_Time.h"
+
+ACE_RCSID (PortableServer,
+           Creation_Time,
+           "$Id$")
+
+#if !defined (__ACE_INLINE__)
+# include "Creation_Time.inl"
+#endif /* ! __ACE_INLINE__ */
+
diff --git a/TAO/tao/PortableServer/Creation_Time.h b/TAO/tao/PortableServer/Creation_Time.h
new file mode 100644
index 00000000000..5804c01a892
--- /dev/null
+++ b/TAO/tao/PortableServer/Creation_Time.h
@@ -0,0 +1,100 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Creation_Time.h
+ *
+ *  $Id$
+ *
+ *  Header file for Creation_Time and Temporary_Creation_Time
+ *
+ *  @author  Irfan Pyarali <irfan@cs.wustl.edu>
+ */
+//=============================================================================
+
+#ifndef TAO_CREATION_TIME_H
+#define TAO_CREATION_TIME_H
+
+#include /**/ "ace/pre.h"
+
+#include "ace/Time_Value.h"
+#include "tao/Basic_Types.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class Temporary_Creation_Time;
+
+    class Creation_Time
+    {
+    public:
+      Creation_Time (const ACE_Time_Value &creation_time);
+
+      Creation_Time (void);
+
+      void creation_time (const void *creation_time);
+
+      const void *creation_time (void) const;
+
+      static CORBA::ULong creation_time_length (void);
+
+      bool operator== (const Creation_Time &rhs) const;
+
+      bool operator!= (const Creation_Time &rhs) const;
+
+      bool operator== (const Temporary_Creation_Time &rhs) const;
+
+      bool operator!= (const Temporary_Creation_Time &rhs) const;
+
+    protected:
+
+      enum
+      {
+        SEC_FIELD = 0,
+        USEC_FIELD = 1
+      };
+
+      /// Timestamp
+      CORBA::ULong time_stamp_[2];
+
+    };
+
+    /**
+     * @class Temporary_Creation_Time
+     *
+     * @brief Special creation time only useful in the lifetime of the
+     *        upcall.
+     *
+     * Special creation time only useful in the lifetime of the upcall.
+     */
+    class Temporary_Creation_Time
+    {
+    public:
+
+      Temporary_Creation_Time (void);
+
+      void creation_time (const void *creation_time);
+
+      bool operator== (const Creation_Time &rhs) const;
+
+      bool operator!= (const Creation_Time &rhs) const;
+
+    protected:
+
+      void *time_stamp_;
+    };
+  }
+}
+
+#if defined (__ACE_INLINE__)
+# include "Creation_Time.inl"
+#endif /* __ACE_INLINE__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_CREATION_TIME_H */
diff --git a/TAO/tao/PortableServer/Creation_Time.inl b/TAO/tao/PortableServer/Creation_Time.inl
new file mode 100644
index 00000000000..29ffa245136
--- /dev/null
+++ b/TAO/tao/PortableServer/Creation_Time.inl
@@ -0,0 +1,122 @@
+// -*- C++ -*-
+//
+// $Id$
+
+#include "ace/OS_NS_string.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    ACE_INLINE CORBA::ULong
+    Creation_Time::creation_time_length (void)
+    {
+      return 2 * sizeof (CORBA::ULong);
+    }
+
+    ACE_INLINE
+    Creation_Time::Creation_Time (const ACE_Time_Value &creation_time)
+    {
+      this->time_stamp_[Creation_Time::SEC_FIELD]  = (CORBA::ULong) creation_time.sec ();
+      this->time_stamp_[Creation_Time::USEC_FIELD] = (CORBA::ULong) creation_time.usec ();
+    }
+
+    ACE_INLINE
+    Creation_Time::Creation_Time (void)
+    {
+      this->time_stamp_[Creation_Time::SEC_FIELD]  = 0;
+      this->time_stamp_[Creation_Time::USEC_FIELD] = 0;
+    }
+
+    ACE_INLINE void
+    Creation_Time::creation_time (const void *creation_time)
+    {
+      ACE_OS::memcpy (&this->time_stamp_,
+                      creation_time,
+                      Creation_Time::creation_time_length ());
+    }
+
+    ACE_INLINE const void *
+    Creation_Time::creation_time (void) const
+    {
+      return &this->time_stamp_;
+    }
+
+    ACE_INLINE bool
+    Creation_Time::operator== (const Creation_Time &rhs) const
+    {
+    #if (POA_NO_TIMESTAMP == 1)
+      ACE_UNUSED_ARG (rhs);
+      return true;
+    #else
+      return ACE_OS::memcmp (&this->time_stamp_,
+                             &rhs.time_stamp_,
+                             Creation_Time::creation_time_length ()) == 0;
+    #endif /* POA_NO_TIMESTAMP */
+    }
+
+    ACE_INLINE bool
+    Creation_Time::operator!= (const Creation_Time &rhs) const
+    {
+    #if (POA_NO_TIMESTAMP == 1)
+      ACE_UNUSED_ARG (rhs);
+      return false;
+    #else
+      return ACE_OS::memcmp (&this->time_stamp_,
+                             &rhs.time_stamp_,
+                             Creation_Time::creation_time_length ()) != 0;
+    #endif /* POA_NO_TIMESTAMP */
+    }
+
+    ACE_INLINE bool
+    Temporary_Creation_Time::operator== (const Creation_Time &rhs) const
+    {
+    #if (POA_NO_TIMESTAMP == 1)
+      ACE_UNUSED_ARG (rhs);
+      return true;
+    #else
+      return ACE_OS::memcmp (this->time_stamp_,
+                             rhs.creation_time (),
+                             Creation_Time::creation_time_length ()) == 0;
+    #endif /* POA_NO_TIMESTAMP */
+    }
+
+    ACE_INLINE bool
+    Temporary_Creation_Time::operator!= (const Creation_Time &rhs) const
+    {
+    #if (POA_NO_TIMESTAMP == 1)
+      ACE_UNUSED_ARG (rhs);
+      return false;
+    #else
+      return ACE_OS::memcmp (this->time_stamp_,
+                             rhs.creation_time (),
+                             Creation_Time::creation_time_length ()) != 0;
+    #endif /* POA_NO_TIMESTAMP */
+    }
+
+    ACE_INLINE bool
+    Creation_Time::operator== (const Temporary_Creation_Time &rhs) const
+    {
+      return rhs == *this;
+    }
+
+    ACE_INLINE bool
+    Creation_Time::operator!= (const Temporary_Creation_Time &rhs) const
+    {
+      return rhs != *this;
+    }
+
+    ACE_INLINE
+    Temporary_Creation_Time::Temporary_Creation_Time (void)
+      : time_stamp_ (0)
+    {
+    }
+
+    ACE_INLINE void
+    Temporary_Creation_Time::creation_time (const void *creation_time)
+    {
+      this->time_stamp_ = (void *) creation_time;
+    }
+  }
+}
+
diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.cpp b/TAO/tao/PortableServer/Default_Policy_Validator.cpp
index 5154b386325..0da0643dced 100644
--- a/TAO/tao/PortableServer/Default_Policy_Validator.cpp
+++ b/TAO/tao/PortableServer/Default_Policy_Validator.cpp
@@ -1,10 +1,9 @@
 // @(#) $Id$
 
 #include "Default_Policy_Validator.h"
-#include "POA_Policies.h"
 #include "tao/ORB_Core.h"
 #include "tao/Policy_Set.h"
-
+#include "PortableServer.h"
 
 ACE_RCSID (PortableServer,
            Default_Policy_Validator,
@@ -39,7 +38,7 @@ TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies
     srp->value (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  policy = 
+  policy =
     policies.get_cached_policy (TAO_CACHED_POLICY_REQUEST_PROCESSING
                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -65,7 +64,7 @@ TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies
       ACE_THROW (PortableServer::POA::InvalidPolicy ());
 
 
-  policy = 
+  policy =
     policies.get_cached_policy (TAO_CACHED_POLICY_ID_UNIQUENESS
                                 ACE_ENV_ARG_PARAMETER);
 
@@ -80,7 +79,7 @@ TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies
   ACE_CHECK;
 
 
-  policy = 
+  policy =
     policies.get_cached_policy (TAO_CACHED_POLICY_IMPLICIT_ACTIVATION
                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -93,7 +92,7 @@ TAO_POA_Default_Policy_Validator::validate_impl (TAO_Policy_Set &policies
     iap->value (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  policy = 
+  policy =
     policies.get_cached_policy (TAO_CACHED_POLICY_ID_ASSIGNMENT
                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.h b/TAO/tao/PortableServer/Default_Policy_Validator.h
index b6f34a4fadc..0b9f8a33a29 100644
--- a/TAO/tao/PortableServer/Default_Policy_Validator.h
+++ b/TAO/tao/PortableServer/Default_Policy_Validator.h
@@ -15,8 +15,8 @@
 #define TAO_DEFAULT_POLICY_VALIDATOR_H_
 
 #include /**/ "ace/pre.h"
-#include "portableserver_export.h"
 
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,7 +24,8 @@
 
 #include "tao/Policy_Validator.h"
 
-class TAO_PortableServer_Export TAO_POA_Default_Policy_Validator : public TAO_Policy_Validator
+class TAO_PortableServer_Export TAO_POA_Default_Policy_Validator
+  : public TAO_Policy_Validator
 {
 public:
 
diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
index 4e95511f225..d0f3ff93c69 100644
--- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
@@ -1,32 +1,33 @@
 // @(#) $Id$
 
 #include "Default_Servant_Dispatcher.h"
-#include "POA.h"
+#include "Root_POA.h"
 
-ACE_RCSID(tao, Default_Acceptor_Filter, "$Id$")
+ACE_RCSID(PortableServer,
+          Default_Servant_Dispatcher,
+          "$Id$")
 
 TAO_Default_Servant_Dispatcher::~TAO_Default_Servant_Dispatcher (void)
 {
 }
 
-TAO_POA *
-TAO_Default_Servant_Dispatcher::create_POA (const ACE_CString &name,
-                                            TAO_POA_Manager &poa_manager,
-                                            const TAO_POA_Policy_Set &policies,
-                                            TAO_POA *parent,
-                                            ACE_Lock &lock,
-                                            TAO_SYNCH_MUTEX &thread_lock,
-                                            TAO_ORB_Core &orb_core,
-                                            TAO_Object_Adapter *object_adapter
-                                            ACE_ENV_ARG_DECL)
+TAO_Root_POA *
+TAO_Default_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
+                                                 TAO_POA_Manager &poa_manager,
+                                                 const TAO_POA_Policy_Set &policies,
+                                                 ACE_Lock &lock,
+                                                 TAO_SYNCH_MUTEX &thread_lock,
+                                                 TAO_ORB_Core &orb_core,
+                                                 TAO_Object_Adapter *object_adapter
+                                                 ACE_ENV_ARG_DECL)
 {
-  TAO_POA *poa;
+  TAO_Root_POA *poa = 0;
 
   ACE_NEW_THROW_EX (poa,
-                    TAO_POA (name,
+                    TAO_Root_POA (name,
                              poa_manager,
                              policies,
-                             parent,
+                             0,
                              lock,
                              thread_lock,
                              orb_core,
@@ -39,25 +40,28 @@ TAO_Default_Servant_Dispatcher::create_POA (const ACE_CString &name,
 }
 
 void
-TAO_Default_Servant_Dispatcher::pre_invoke_remote_request (TAO_POA &,
-                                                           CORBA::Short,
-                                                           TAO_ServerRequest &,
-                                                           TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State &
-                                                           ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Default_Servant_Dispatcher::pre_invoke_remote_request (
+  TAO_Root_POA &,
+  CORBA::Short,
+  TAO_ServerRequest &,
+  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &
+  ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
-TAO_Default_Servant_Dispatcher::pre_invoke_collocated_request (TAO_POA &,
-                                                               CORBA::Short,
-                                                               TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State &
-                                                               ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Default_Servant_Dispatcher::pre_invoke_collocated_request (
+  TAO_Root_POA &,
+  CORBA::Short,
+  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &
+  ACE_ENV_ARG_DECL_NOT_USED)
 {
 }
 
 void
-TAO_Default_Servant_Dispatcher::post_invoke (TAO_POA &,
-                                             TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State &)
+TAO_Default_Servant_Dispatcher::post_invoke (
+  TAO_Root_POA &,
+  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &)
 
 {
 }
diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h
index a284f551dd9..f44a25ce1f8 100644
--- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h
+++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h
@@ -15,12 +15,13 @@
 #include /**/ "ace/pre.h"
 
 #include "portableserver_export.h"
-#include "Servant_Dispatcher.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "Servant_Dispatcher.h"
+
 /**
  * @class TAO_Default_Servant_Dispatcher
  *
@@ -37,32 +38,31 @@ public:
   virtual ~TAO_Default_Servant_Dispatcher (void);
 
   /// Pre_invoke remote request.
-  void pre_invoke_remote_request (TAO_POA &poa,
+  void pre_invoke_remote_request (TAO_Root_POA &poa,
                                   CORBA::Short servant_priority,
-								  TAO_ServerRequest &req, 	
-                                  TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
+                                  TAO_ServerRequest &req,
+                                  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
                                   ACE_ENV_ARG_DECL);
 
   /// Pre_invoke collocated request.
-  void pre_invoke_collocated_request (TAO_POA &poa,
+  void pre_invoke_collocated_request (TAO_Root_POA &poa,
                                       CORBA::Short servant_priority,
-                                      TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
+                                      TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
                                       ACE_ENV_ARG_DECL);
 
   /// Post_invoke request.
-  void post_invoke (TAO_POA &poa,
-                    TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State &pre_invoke_state);
+  void post_invoke (TAO_Root_POA &poa,
+                    TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state);
 
   /// Factory method for creating new POA's.
-  TAO_POA *create_POA (const ACE_CString &name,
-                       TAO_POA_Manager &poa_manager,
-                       const TAO_POA_Policy_Set &policies,
-                       TAO_POA *parent,
-                       ACE_Lock &lock,
-                       TAO_SYNCH_MUTEX &thread_lock,
-                       TAO_ORB_Core &orb_core,
-                       TAO_Object_Adapter *object_adapter
-                       ACE_ENV_ARG_DECL);
+  TAO_Root_POA *create_Root_POA (const ACE_CString &name,
+                                 TAO_POA_Manager &poa_manager,
+                                 const TAO_POA_Policy_Set &policies,
+                                 ACE_Lock &lock,
+                                 TAO_SYNCH_MUTEX &thread_lock,
+                                 TAO_ORB_Core &orb_core,
+                                 TAO_Object_Adapter *object_adapter
+                                 ACE_ENV_ARG_DECL);
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/ForwardRequest.pidl b/TAO/tao/PortableServer/ForwardRequest.pidl
new file mode 100644
index 00000000000..d2f17c4addf
--- /dev/null
+++ b/TAO/tao/PortableServer/ForwardRequest.pidl
@@ -0,0 +1,35 @@
+/**
+ * @file ForwardRequest.pidl
+ *
+ * $Id$
+ *
+ * @brief Pre-compiled IDL source for the PortableServer module.
+ *
+ * This file was used to generate the code in
+ * ForwardRequestC.{h,inl,cpp}, using the following command:
+ *
+ * tao_idl.exe \
+ *     -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT)
+ *          -Wb,export_macro=TAO_PortableServer_Export \
+ *          -Wb,export_include="portableserver_export.h" \
+ *          -Wb,pre_include="ace/pre.h" \
+ *          -Wb,post_include="ace/post.h" \
+ *          ForwardRequest.pidl
+ */
+
+#ifndef _PORTABLESERVER_FORWARDREQUEST_IDL_
+#define _PORTABLESERVER_FORWARDREQUEST_IDL_
+
+#pragma prefix "omg.org"
+
+module PortableServer
+{
+# pragma version PortableServer 2.3
+
+  exception ForwardRequest
+  {
+    Object forward_reference;
+  };
+};
+
+#endif // _PORTABLESERVER_SERVANT_MANAGER_IDL_
diff --git a/TAO/tao/PortableServer/ForwardRequestA.cpp b/TAO/tao/PortableServer/ForwardRequestA.cpp
new file mode 100644
index 00000000000..917483a97e8
--- /dev/null
+++ b/TAO/tao/PortableServer/ForwardRequestA.cpp
@@ -0,0 +1,137 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+
+#include "ForwardRequestC.h"
+#include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
+#include "tao/Any_Dual_Impl_T.h"
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+// TAO_IDL - Generated from 
+// be\be_visitor_exception/any_op_cs.cpp:50
+
+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 ()))
+    {
+      return false;
+    }
+  
+  ACE_TRY_NEW_ENV
+    {
+      this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      return false;
+    }
+  ACE_ENDTRY;
+  
+  return true;
+}
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const PortableServer::ForwardRequest &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest>::insert_copy (
+      _tao_any,
+      PortableServer::ForwardRequest::_tao_any_destructor,
+      PortableServer::_tc_ForwardRequest,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ForwardRequest *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest>::insert (
+      _tao_any,
+      PortableServer::ForwardRequest::_tao_any_destructor,
+      PortableServer::_tc_ForwardRequest,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ForwardRequest *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const PortableServer::ForwardRequest *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const PortableServer::ForwardRequest *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest>::extract (
+        _tao_any,
+        PortableServer::ForwardRequest::_tao_any_destructor,
+        PortableServer::_tc_ForwardRequest,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  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 */
diff --git a/TAO/tao/PortableServer/ForwardRequestC.cpp b/TAO/tao/PortableServer/ForwardRequestC.cpp
new file mode 100644
index 00000000000..5fa76eb34a7
--- /dev/null
+++ b/TAO/tao/PortableServer/ForwardRequestC.cpp
@@ -0,0 +1,285 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:302
+
+
+#include "ForwardRequestC.h"
+#include "tao/CDR.h"
+#include "tao/Typecode.h"
+#include "tao/SystemException.h"
+#include "ace/OS_NS_string.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if !defined (__ACE_INLINE__)
+#include "ForwardRequestC.inl"
+#endif /* !defined INLINE */
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+// TAO_IDL - Generated from
+// be\be_visitor_arg_traits.cpp:66
+
+// Arg traits specializations.
+namespace TAO
+{
+}
+
+
+// TAO_IDL - Generated from 
+// 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)
+{
+}
+
+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;
+}
+
+void PortableServer::ForwardRequest::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ForwardRequest *_tao_tmp_pointer =
+    static_cast<ForwardRequest *> (_tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
+
+PortableServer::ForwardRequest *
+PortableServer::ForwardRequest::_downcast (CORBA::Exception *_tao_excp)
+{
+  return dynamic_cast<ForwardRequest *> (_tao_excp);
+}
+
+const PortableServer::ForwardRequest *
+PortableServer::ForwardRequest::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const ForwardRequest *> (_tao_excp);
+}
+
+CORBA::Exception *PortableServer::ForwardRequest::_alloc (void)
+{
+  CORBA::Exception *retval = 0;
+  ACE_NEW_RETURN (retval, ::PortableServer::ForwardRequest, 0);
+  return retval;
+}
+
+CORBA::Exception *
+PortableServer::ForwardRequest::_tao_duplicate (void) const
+{
+  CORBA::Exception *result;
+  ACE_NEW_RETURN (
+      result,
+      ::PortableServer::ForwardRequest (*this),
+      0
+    );
+  return result;
+}
+
+void PortableServer::ForwardRequest::_raise (void) const
+{
+  TAO_RAISE (*this);
+}
+
+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
+// 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);
+}
+
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::ForwardRequest::_type (void) const
+{
+  return ::PortableServer::_tc_ForwardRequest;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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 (0x33000000),  // repository ID = IDL:omg.org/PortableServer/ForwardRequest:2.3
+    15,
+  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 (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 (0x0),  // repository ID = IDL:omg.org/CORBA/Object:1.0
+        7,
+    ACE_NTOHL (0x4f626a65), 
+    ACE_NTOHL (0x63740000),  // name = Object
+    
+};
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ForwardRequest (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_ForwardRequest),
+    (char *) &_oc_PortableServer_ForwardRequest,
+    0,
+    0
+  );
+
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_ForwardRequest =
+    &_tc_TAO_tc_PortableServer_ForwardRequest;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_exception/cdr_op_cs.cpp:60
+
+CORBA::Boolean operator<< (
+    TAO_OutputCDR &strm,
+    const PortableServer::ForwardRequest &_tao_aggregate
+  )
+{
+  // First marshal the repository ID.
+  if (strm << _tao_aggregate._rep_id ())
+    {
+      // Now marshal the members (if any).
+      return (
+        (strm << _tao_aggregate.forward_reference.in ())
+       );
+    }
+  else
+    {
+      return false;
+    }
+}
+
+CORBA::Boolean operator>> (
+    TAO_InputCDR &strm,
+    PortableServer::ForwardRequest &_tao_aggregate
+  )
+{
+  // Demarshal the members.
+  return (
+    (strm >> _tao_aggregate.forward_reference.out ())
+  );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_root/root.cpp:1629
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ForwardRequestC.h b/TAO/tao/PortableServer/ForwardRequestC.h
new file mode 100644
index 00000000000..7b1ff32e2bb
--- /dev/null
+++ b/TAO/tao/PortableServer/ForwardRequestC.h
@@ -0,0 +1,183 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:153
+
+#ifndef _TAO_IDL_ORIG_FORWARDREQUESTC_H_
+#define _TAO_IDL_ORIG_FORWARDREQUESTC_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "portableserver_export.h"
+#include "tao/ORB.h"
+#include "tao/Environment.h"
+#include "tao/Object.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_PortableServer_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_exception/exception_ch.cpp:51
+
+#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 const ForwardRequest *_downcast (CORBA::Exception const *);
+    
+    static CORBA::Exception *_alloc (void);
+    
+    virtual CORBA::Exception *_tao_duplicate (void) const;
+
+    virtual void _raise (void) const;
+
+    virtual void _tao_encode (
+        TAO_OutputCDR &
+        ACE_ENV_ARG_DECL
+      ) const;
+    
+    virtual void _tao_decode (
+        TAO_InputCDR &
+        ACE_ENV_ARG_DECL
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_exception/exception_ctor.cpp:66
+    
+    ForwardRequest (
+        const CORBA::Object_ptr  _tao_forward_reference
+      );
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_exception/exception_ch.cpp:127
+    
+    virtual CORBA::TypeCode_ptr _type (void) const;
+  };
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ForwardRequest;
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:66
+
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:59
+
+// Traits specializations.
+namespace TAO
+{
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::ForwardRequest &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ForwardRequest*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ForwardRequest *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ForwardRequest *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_exception/cdr_op_ch.cpp:52
+
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ForwardRequest &);
+TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ForwardRequest &);
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:961
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+
+#if defined (__ACE_INLINE__)
+#include "ForwardRequestC.inl"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/PortableServer/ForwardRequestC.inl b/TAO/tao/PortableServer/ForwardRequestC.inl
new file mode 100644
index 00000000000..c944d806c1f
--- /dev/null
+++ b/TAO/tao/PortableServer/ForwardRequestC.inl
@@ -0,0 +1,27 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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/IdAssignmentPolicy.cpp b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
new file mode 100644
index 00000000000..89efde0e574
--- /dev/null
+++ b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
@@ -0,0 +1,64 @@
+#include "IdAssignmentPolicy.h"
+#include "PortableServer.h"
+
+ACE_RCSID (PortableServer,
+           IdAssignmentPolicy,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    IdAssignmentPolicy::IdAssignmentPolicy (
+      ::PortableServer::IdAssignmentPolicyValue value) :
+        value_ (value)
+    {
+    }
+
+    CORBA::Policy_ptr
+    IdAssignmentPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      IdAssignmentPolicy *copy = 0;
+      ACE_NEW_THROW_EX (copy,
+                        IdAssignmentPolicy (this->value_),
+                        CORBA::NO_MEMORY ());
+      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+
+      return copy;
+    }
+
+    void
+    IdAssignmentPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+    }
+
+    ::PortableServer::IdAssignmentPolicyValue
+    IdAssignmentPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      return value_;
+    }
+
+    CORBA::PolicyType
+    IdAssignmentPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      return ::PortableServer::ID_ASSIGNMENT_POLICY_ID;
+    }
+
+    TAO_Cached_Policy_Type
+    IdAssignmentPolicy::_tao_cached_type (void) const
+    {
+      return TAO_CACHED_POLICY_ID_ASSIGNMENT;
+    }
+
+    TAO_Policy_Scope
+    IdAssignmentPolicy::_tao_scope (void) const
+    {
+      return TAO_POLICY_POA_SCOPE;
+    }
+  }
+}
+
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.h b/TAO/tao/PortableServer/IdAssignmentPolicy.h
new file mode 100644
index 00000000000..d467272019e
--- /dev/null
+++ b/TAO/tao/PortableServer/IdAssignmentPolicy.h
@@ -0,0 +1,73 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file IdAssignmentPolicy.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_IDASSIGNMENTPOLICY_H
+#define TAO_PORTABLESERVER_IDASSIGNMENTPOLICY_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "IdAssignmentPolicyC.h"
+#include "tao/LocalObject.h"
+
+// This is to remove "inherits via dominance" warnings from MSVC.
+// MSVC is being a little too paranoid.
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export IdAssignmentPolicy
+      : public virtual ::PortableServer::IdAssignmentPolicy,
+        public virtual TAO_Local_RefCounted_Object
+    {
+    public:
+      IdAssignmentPolicy (::PortableServer::IdAssignmentPolicyValue value);
+
+      CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      ::PortableServer::IdAssignmentPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      /// Return the cached policy type for this policy.
+      virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
+
+      /// Returns the scope at which this policy can be applied. See orbconf.h.
+      virtual TAO_Policy_Scope _tao_scope (void) const;
+
+    private:
+      ::PortableServer::IdAssignmentPolicyValue value_;
+    };
+  }
+}
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_IDASSIGNMENTPOLICY_H */
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.pidl b/TAO/tao/PortableServer/IdAssignmentPolicy.pidl
new file mode 100644
index 00000000000..908388bc2a6
--- /dev/null
+++ b/TAO/tao/PortableServer/IdAssignmentPolicy.pidl
@@ -0,0 +1,40 @@
+/**
+ * @file IdAssignmentPolicy.pidl
+ *
+ * $Id$
+ *
+ * @brief Pre-compiled IDL source for the PortableServer module.
+ *
+ * tao_idl.exe \
+ *     -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT)
+ *          -Wb,export_macro=TAO_PortableServer_Export \
+ *          -Wb,export_include="portableserver_export.h" \
+ *          -Wb,pre_include="ace/pre.h" \
+ *          -Wb,post_include="ace/post.h" \
+ *          IdAssignmentPolicy.pidl
+ */
+
+#ifndef _PORTABLESERVER_IDASSIGNMENTPOLICY_IDL_
+#define _PORTABLESERVER_IDASSIGNMENTPOLICY_IDL_
+
+#include <tao/Policy.pidl>
+
+#pragma prefix "omg.org"
+
+module PortableServer
+{
+# pragma version PortableServer 2.3
+
+  enum IdAssignmentPolicyValue
+  {
+    USER_ID,
+    SYSTEM_ID
+  };
+
+  local interface IdAssignmentPolicy : CORBA::Policy
+  {
+    readonly attribute IdAssignmentPolicyValue value;
+  };
+};
+
+#endif // _PORTABLESERVER_IDASSIGNMENTPOLICY_IDL_
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp
new file mode 100644
index 00000000000..b877b66c62a
--- /dev/null
+++ b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp
@@ -0,0 +1,250 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+
+#include "IdAssignmentPolicyC.h"
+#include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
+#include "tao/Any_Impl_T.h"
+#include "tao/Any_Basic_Impl_T.h"
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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 (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 (0x6c756500),  // name = IdAssignmentPolicyValue
+  2, // member count
+  8,
+  ACE_NTOHL (0x55534552), 
+  ACE_NTOHL (0x5f494400),  // name = USER_ID
+  10,
+  ACE_NTOHL (0x53595354), 
+  ACE_NTOHL (0x454d5f49), 
+  ACE_NTOHL (0x44000000),  // name = SYSTEM_ID
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdAssignmentPolicyValue (
+    CORBA::tk_enum,
+    sizeof (_oc_PortableServer_IdAssignmentPolicyValue),
+    (char *) &_oc_PortableServer_IdAssignmentPolicyValue,
+    0,
+    0
+  );
+
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_IdAssignmentPolicyValue =
+    &_tc_TAO_tc_PortableServer_IdAssignmentPolicyValue;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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 (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 (0x63790000),  // name = IdAssignmentPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdAssignmentPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_IdAssignmentPolicy),
+    (char *) &_oc_PortableServer_IdAssignmentPolicy,
+    0,
+    0
+  );
+
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_IdAssignmentPolicy =
+    &_tc_TAO_tc_PortableServer_IdAssignmentPolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::IdAssignmentPolicyValue _tao_elem
+  )
+{
+  TAO::Any_Basic_Impl_T<PortableServer::IdAssignmentPolicyValue>::insert (
+      _tao_any,
+      PortableServer::_tc_IdAssignmentPolicyValue,
+      _tao_elem
+    );
+}
+
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::IdAssignmentPolicyValue &_tao_elem
+  )
+{
+  return
+    TAO::Any_Basic_Impl_T<PortableServer::IdAssignmentPolicyValue>::extract (
+        _tao_any,
+        PortableServer::_tc_IdAssignmentPolicyValue,
+        _tao_elem 
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+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;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::IdAssignmentPolicy_ptr _tao_elem
+  )
+{
+  PortableServer::IdAssignmentPolicy_ptr _tao_objptr =
+    PortableServer::IdAssignmentPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::IdAssignmentPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::insert (
+      _tao_any,
+      PortableServer::IdAssignmentPolicy::_tao_any_destructor,
+      PortableServer::_tc_IdAssignmentPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::IdAssignmentPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::extract (
+        _tao_any,
+        PortableServer::IdAssignmentPolicy::_tao_any_destructor,
+        PortableServer::_tc_IdAssignmentPolicy,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        PortableServer::IdAssignmentPolicyValue
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        PortableServer::IdAssignmentPolicy
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        PortableServer::IdAssignmentPolicyValue \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        PortableServer::IdAssignmentPolicy \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp
new file mode 100644
index 00000000000..ba6b3a547b1
--- /dev/null
+++ b/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp
@@ -0,0 +1,255 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:302
+
+
+#include "IdAssignmentPolicyC.h"
+#include "tao/CDR.h"
+#include "ace/OS_NS_string.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if !defined (__ACE_INLINE__)
+#include "IdAssignmentPolicyC.inl"
+#endif /* !defined INLINE */
+
+// TAO_IDL - Generated from
+// be\be_visitor_arg_traits.cpp:66
+
+// Arg traits specializations.
+namespace TAO
+{
+}
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/interface_cs.cpp:60
+
+// Traits specializations for PortableServer::IdAssignmentPolicy.
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+PortableServer::IdAssignmentPolicy_ptr
+TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::duplicate (
+    PortableServer::IdAssignmentPolicy_ptr p
+  )
+{
+  return PortableServer::IdAssignmentPolicy::_duplicate (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+void
+TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::release (
+    PortableServer::IdAssignmentPolicy_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+PortableServer::IdAssignmentPolicy_ptr
+TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::nil (void)
+{
+  return PortableServer::IdAssignmentPolicy::_nil ();
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+CORBA::Boolean
+TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::marshal (
+    PortableServer::IdAssignmentPolicy_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return CORBA::Object::marshal (p, cdr);
+}
+
+PortableServer::IdAssignmentPolicy::IdAssignmentPolicy (void)
+{}
+
+PortableServer::IdAssignmentPolicy::~IdAssignmentPolicy (void)
+{}
+
+void 
+PortableServer::IdAssignmentPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  IdAssignmentPolicy *_tao_tmp_pointer =
+    static_cast<IdAssignmentPolicy *> (_tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
+}
+
+PortableServer::IdAssignmentPolicy_ptr
+PortableServer::IdAssignmentPolicy::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return IdAssignmentPolicy::_nil ();
+    }
+  
+  IdAssignmentPolicy_ptr proxy =
+    dynamic_cast<IdAssignmentPolicy_ptr> (_tao_objref);
+  
+  return IdAssignmentPolicy::_duplicate (proxy);
+}
+
+PortableServer::IdAssignmentPolicy_ptr
+PortableServer::IdAssignmentPolicy::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return IdAssignmentPolicy::_nil ();
+    }
+  
+  IdAssignmentPolicy_ptr proxy =
+    dynamic_cast<IdAssignmentPolicy_ptr> (_tao_objref);
+  
+  return IdAssignmentPolicy::_duplicate (proxy);
+}
+
+PortableServer::IdAssignmentPolicy_ptr
+PortableServer::IdAssignmentPolicy::_duplicate (IdAssignmentPolicy_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+CORBA::Boolean
+PortableServer::IdAssignmentPolicy::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/Policy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/PortableServer/IdAssignmentPolicy:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+    )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+const char* PortableServer::IdAssignmentPolicy::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/PortableServer/IdAssignmentPolicy:2.3";
+}
+
+CORBA::Boolean
+PortableServer::IdAssignmentPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/cdr_op_cs.cpp:51
+
+CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::IdAssignmentPolicyValue &_tao_enumval)
+{
+  CORBA::ULong _tao_temp = _tao_enumval;
+  return strm << _tao_temp;
+}
+
+CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdAssignmentPolicyValue &_tao_enumval)
+{
+  CORBA::ULong _tao_temp = 0;
+  CORBA::Boolean _tao_result = strm >> _tao_temp;
+  
+  if (_tao_result == 1)
+    {
+      _tao_enumval = static_cast<PortableServer::IdAssignmentPolicyValue> (_tao_temp);
+    }
+  
+  return _tao_result;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_root/root.cpp:1629
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Objref_Traits<
+        PortableServer::IdAssignmentPolicy
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::IdAssignmentPolicy
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::IdAssignmentPolicy
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Objref_Traits< \
+        PortableServer::IdAssignmentPolicy \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::IdAssignmentPolicy
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::IdAssignmentPolicy
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyC.h b/TAO/tao/PortableServer/IdAssignmentPolicyC.h
new file mode 100644
index 00000000000..f62572af4f8
--- /dev/null
+++ b/TAO/tao/PortableServer/IdAssignmentPolicyC.h
@@ -0,0 +1,295 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:153
+
+#ifndef _TAO_IDL_ORIG_IDASSIGNMENTPOLICYC_H_
+#define _TAO_IDL_ORIG_IDASSIGNMENTPOLICYC_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "portableserver_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
+#include "tao/Environment.h"
+#include "tao/Object.h"
+#include "tao/Objref_VarOut_T.h"
+
+#include "tao/PolicyC.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_PortableServer_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_ch.cpp:62
+
+namespace TAO
+{
+  class Collocation_Proxy_Broker;
+  
+  template<typename T> class Narrow_Utils;
+  template<typename T> class AbstractBase_Narrow_Utils;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_enum/enum_ch.cpp:57
+  
+  enum IdAssignmentPolicyValue
+  {
+    USER_ID,
+    SYSTEM_ID
+  };
+  
+  typedef IdAssignmentPolicyValue &IdAssignmentPolicyValue_out;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IdAssignmentPolicyValue;
+  
+  // TAO_IDL - Generated from
+  // be\be_interface.cpp:598
+
+#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;
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_interface/interface_ch.cpp:54
+
+#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;
+    
+    // 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 static_cast<IdAssignmentPolicy_ptr> (0);
+    }
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // 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
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::Policy_ptr copy (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void destroy (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_interface/interface_ch.cpp:208
+    
+    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:
+    // Abstract or local interface only.
+    IdAssignmentPolicy (void);
+    
+    virtual ~IdAssignmentPolicy (void);
+  
+  private:
+    // Private and unimplemented for concrete interfaces.
+    IdAssignmentPolicy (const IdAssignmentPolicy &);
+    
+    void operator= (const IdAssignmentPolicy &);
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IdAssignmentPolicy;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:66
+
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:59
+
+// Traits specializations.
+namespace TAO
+{
+
+#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY__TRAITS_CH_)
+#define _PORTABLESERVER_IDASSIGNMENTPOLICY__TRAITS_CH_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::IdAssignmentPolicy>
+  {
+    static ::PortableServer::IdAssignmentPolicy_ptr duplicate (
+        ::PortableServer::IdAssignmentPolicy_ptr
+      );
+    static void release (
+        ::PortableServer::IdAssignmentPolicy_ptr
+      );
+    static ::PortableServer::IdAssignmentPolicy_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::PortableServer::IdAssignmentPolicy_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_ch.cpp:51
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicyValue);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdAssignmentPolicyValue &);
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicy_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicy_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdAssignmentPolicy_ptr &);
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/cdr_op_ch.cpp:50
+
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdAssignmentPolicyValue &);
+TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdAssignmentPolicyValue &);
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:961
+
+#if defined (__ACE_INLINE__)
+#include "IdAssignmentPolicyC.inl"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyC.inl b/TAO/tao/PortableServer/IdAssignmentPolicyC.inl
new file mode 100644
index 00000000000..c944d806c1f
--- /dev/null
+++ b/TAO/tao/PortableServer/IdAssignmentPolicyC.inl
@@ -0,0 +1,27 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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/IdAssignmentStrategy.cpp b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp
new file mode 100644
index 00000000000..d857cf1b817
--- /dev/null
+++ b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp
@@ -0,0 +1,45 @@
+// $Id$
+
+#include "IdAssignmentStrategy.h"
+
+ACE_RCSID (PortableServer,
+           IdAssignmentStrategy,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    IdAssignmentStrategy::~IdAssignmentStrategy (void)
+    {
+    }
+
+    void
+    IdAssignmentStrategy::strategy_init (TAO_Root_POA * /*poa*/ ACE_ENV_ARG_DECL_NOT_USED)
+    {
+    }
+
+    void
+    IdAssignmentStrategy::strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    {
+    }
+
+    char
+    IdAssignmentStrategy::key_type_length (void) const
+    {
+      return sizeof (char);
+    }
+
+    void
+    IdAssignmentStrategy::create_key (
+      CORBA::Octet *buffer,
+      CORBA::ULong& starting_at)
+    {
+      // Copy the system id byte.
+      buffer[starting_at] = (CORBA::Octet) this->id_assignment_key_type ();
+      starting_at += this->key_type_length ();
+    }
+
+  }
+}
+
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.h b/TAO/tao/PortableServer/IdAssignmentStrategy.h
new file mode 100644
index 00000000000..345e6ba1790
--- /dev/null
+++ b/TAO/tao/PortableServer/IdAssignmentStrategy.h
@@ -0,0 +1,58 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file IdAssignmentStrategy.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_ID_ASSIGNMENT_STRATEGY_H
+#define TAO_ID_ASSIGNMENT_STRATEGY_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "Policy_Strategy.h"
+#include "tao/Basic_Types.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export IdAssignmentStrategy :
+       public virtual Policy_Strategy
+    {
+    public:
+      virtual ~IdAssignmentStrategy (void);
+
+      virtual void strategy_init(TAO_Root_POA *poa ACE_ENV_ARG_DECL);
+
+      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
+
+      /**
+       * Returns the key type the says which specific policy we have
+       */
+      virtual char id_assignment_key_type (void) const = 0;
+
+      /**
+       * Returns the length of the id_assignment type
+       */
+      char key_type_length (void) const;
+
+      void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at);
+
+      virtual bool has_system_id (void) const = 0;
+    };
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_ID_ASSIGNMENT_STRATEGY_H */
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h b/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h
new file mode 100644
index 00000000000..40ecb477f7b
--- /dev/null
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h
@@ -0,0 +1,48 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file IdAssignmentStrategyFactory.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORY_H
+#define TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORY_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "StrategyFactory.h"
+#include "IdAssignmentPolicyC.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class IdAssignmentStrategy;
+
+    class TAO_PortableServer_Export IdAssignmentStrategyFactory
+      : public virtual StrategyFactory
+    {
+    public:
+      /// Create a new servant retention strategy
+      virtual IdAssignmentStrategy* create (
+        ::PortableServer::IdAssignmentPolicyValue value) = 0;
+
+      virtual void destroy (
+        IdAssignmentStrategy *strategy
+        ACE_ENV_ARG_DECL) = 0;
+    };
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORY_H */
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
new file mode 100644
index 00000000000..f5d9254da66
--- /dev/null
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
@@ -0,0 +1,84 @@
+// $Id$
+
+#include "IdAssignmentStrategyFactoryImpl.h"
+#include "IdAssignmentStrategy.h"
+#include "ace/Dynamic_Service.h"
+
+ACE_RCSID (PortableServer,
+           IdAssignmentStrategyFactoryImpl,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    IdAssignmentStrategyFactoryImpl::~IdAssignmentStrategyFactoryImpl (void)
+    {
+    }
+    IdAssignmentStrategy*
+    IdAssignmentStrategyFactoryImpl::create (
+      ::PortableServer::IdAssignmentPolicyValue value)
+    {
+      IdAssignmentStrategy* strategy = 0;
+
+      switch (value)
+      {
+        case ::PortableServer::SYSTEM_ID :
+        {
+          strategy =
+            ACE_Dynamic_Service<IdAssignmentStrategy>::instance ("IdAssignmentStrategySystem");
+
+          if (strategy == 0)
+            ACE_ERROR ((LM_ERROR,
+                        ACE_TEXT ("(%P|%t) %p\n"),
+                        ACE_TEXT ("Unable to get ")
+                        ACE_TEXT ("IdAssignmentStrategySystem")));
+          break;
+        }
+        case ::PortableServer::USER_ID :
+        {
+          strategy =
+            ACE_Dynamic_Service<IdAssignmentStrategy>::instance ("IdAssignmentStrategyUser");
+
+          if (strategy == 0)
+            ACE_ERROR ((LM_ERROR,
+                        ACE_TEXT ("(%P|%t) %p\n"),
+                        ACE_TEXT ("Unable to get ")
+                        ACE_TEXT ("IdAssignmentStrategyUser")));
+          break;
+        }
+      }
+
+      return strategy;
+    }
+
+    void
+    IdAssignmentStrategyFactoryImpl::destroy (
+      IdAssignmentStrategy * /*strategy*/
+      ACE_ENV_ARG_DECL_NOT_USED)
+    {
+      // Noop because both types are singletons
+    }
+
+    ACE_STATIC_SVC_DEFINE (
+        IdAssignmentStrategyFactoryImpl,
+        ACE_TEXT ("IdAssignmentStrategyFactory"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (IdAssignmentStrategyFactoryImpl),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+
+    ACE_FACTORY_DEFINE (TAO_PortableServer, IdAssignmentStrategyFactoryImpl)
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+      template class ACE_Dynamic_Service<IdAssignmentStrategyFactoryImpl>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Dynamic_Service<IdAssignmentStrategyFactoryImpl>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  }
+}
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h
new file mode 100644
index 00000000000..93232f4d186
--- /dev/null
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h
@@ -0,0 +1,51 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file IdAssignmentStrategyFactoryImpl.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORYIMPL_H
+#define TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORYIMPL_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Service_Config.h"
+#include "IdAssignmentStrategyFactory.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export IdAssignmentStrategyFactoryImpl
+      : public virtual IdAssignmentStrategyFactory
+    {
+    public:
+      virtual ~IdAssignmentStrategyFactoryImpl (void);
+
+      /// Create a new servant retention strategy
+      virtual IdAssignmentStrategy* create (
+        ::PortableServer::IdAssignmentPolicyValue value);
+
+      virtual void destroy (
+        IdAssignmentStrategy *strategy
+        ACE_ENV_ARG_DECL);
+    };
+
+    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategyFactoryImpl)
+    ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategyFactoryImpl)
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp
new file mode 100644
index 00000000000..7ffc6c76380
--- /dev/null
+++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp
@@ -0,0 +1,47 @@
+// $Id$
+
+#include "IdAssignmentStrategySystem.h"
+
+ACE_RCSID (PortableServer,
+           Id_Assignment_Strategy,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    IdAssignmentStrategySystem::~IdAssignmentStrategySystem()
+    {
+    }
+
+    char
+    IdAssignmentStrategySystem::id_assignment_key_type (void) const
+    {
+      return 'S';
+    }
+
+    bool
+    IdAssignmentStrategySystem::has_system_id (void) const
+    {
+      return true;
+    }
+
+    ACE_FACTORY_DEFINE (TAO_PortableServer, IdAssignmentStrategySystem)
+
+    ACE_STATIC_SVC_DEFINE (
+        IdAssignmentStrategySystem,
+        ACE_TEXT ("IdAssignmentStrategySystem"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (IdAssignmentStrategySystem),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+
+    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+    template class ACE_Dynamic_Service<IdAssignmentStrategySystem>;
+    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+    #pragma instantiate ACE_Dynamic_Service<IdAssignmentStrategySystem>
+    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  }
+}
+
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h
new file mode 100644
index 00000000000..d4d8558003e
--- /dev/null
+++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h
@@ -0,0 +1,47 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file IdAssignmentStrategySystem.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_IDASSIGNMENTSTRATEGYSYSTEM_H
+#define TAO_IDASSIGNMENTSTRATEGYSYSTEM_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "IdAssignmentStrategy.h"
+#include "ace/Service_Config.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export IdAssignmentStrategySystem
+      : public virtual IdAssignmentStrategy
+    {
+    public:
+      virtual ~IdAssignmentStrategySystem (void);
+
+      virtual char id_assignment_key_type (void) const;
+
+      virtual bool has_system_id (void) const;
+    };
+
+    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategySystem)
+    ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategySystem)
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_IDASSIGNMENTSTRATEGYSYSTEM_H */
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp
new file mode 100644
index 00000000000..3cb95040b1b
--- /dev/null
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp
@@ -0,0 +1,47 @@
+// $Id$
+
+#include "IdAssignmentStrategyUser.h"
+
+ACE_RCSID (PortableServer,
+           Id_Assignment_Strategy,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    IdAssignmentStrategyUser::~IdAssignmentStrategyUser()
+    {
+    }
+
+    char
+    IdAssignmentStrategyUser::id_assignment_key_type (void) const
+    {
+      return 'U';
+    }
+
+    bool
+    IdAssignmentStrategyUser::has_system_id (void) const
+    {
+      return false;
+    }
+
+    ACE_FACTORY_DEFINE (TAO_PortableServer, IdAssignmentStrategyUser)
+
+    ACE_STATIC_SVC_DEFINE (
+        IdAssignmentStrategyUser,
+        ACE_TEXT ("IdAssignmentStrategyUser"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (IdAssignmentStrategyUser),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+
+    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+    template class ACE_Dynamic_Service<IdAssignmentStrategyUser>;
+    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+    #pragma instantiate ACE_Dynamic_Service<IdAssignmentStrategyUser>
+    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  }
+}
+
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.h b/TAO/tao/PortableServer/IdAssignmentStrategyUser.h
new file mode 100644
index 00000000000..57c716f2ccc
--- /dev/null
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.h
@@ -0,0 +1,47 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @fileIdAssignmentStrategyUser.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_IDASSIGNMENTSTRATEGYUSER_H
+#define TAO_IDASSIGNMENTSTRATEGYUSER_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "IdAssignmentStrategy.h"
+#include "ace/Service_Config.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export IdAssignmentStrategyUser
+      : public virtual IdAssignmentStrategy
+    {
+    public:
+      virtual ~IdAssignmentStrategyUser (void);
+
+      virtual char id_assignment_key_type (void) const;
+
+      virtual bool has_system_id (void) const;
+    };
+
+    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdAssignmentStrategyUser)
+    ACE_FACTORY_DECLARE (TAO_PortableServer, IdAssignmentStrategyUser)
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_IDASSIGNMENTSTRATEGYUSER_H */
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
new file mode 100644
index 00000000000..7dc969af49c
--- /dev/null
+++ b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
@@ -0,0 +1,64 @@
+#include "IdUniquenessPolicy.h"
+#include "PortableServer.h"
+
+ACE_RCSID (PortableServer,
+           IdUniquenessPolicy,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    IdUniquenessPolicy::IdUniquenessPolicy (
+      ::PortableServer::IdUniquenessPolicyValue value) :
+        value_ (value)
+    {
+    }
+
+    CORBA::Policy_ptr
+    IdUniquenessPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      IdUniquenessPolicy *copy = 0;
+      ACE_NEW_THROW_EX (copy,
+                        IdUniquenessPolicy (this->value_),
+                        CORBA::NO_MEMORY ());
+      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+
+      return copy;
+    }
+
+    void
+    IdUniquenessPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+    }
+
+    ::PortableServer::IdUniquenessPolicyValue
+    IdUniquenessPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      return value_;
+    }
+
+    CORBA::PolicyType
+    IdUniquenessPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      return ::PortableServer::ID_UNIQUENESS_POLICY_ID;
+    }
+
+    TAO_Cached_Policy_Type
+    IdUniquenessPolicy::_tao_cached_type (void) const
+    {
+      return TAO_CACHED_POLICY_ID_UNIQUENESS;
+    }
+
+    TAO_Policy_Scope
+    IdUniquenessPolicy::_tao_scope (void) const
+    {
+      return TAO_POLICY_POA_SCOPE;
+    }
+  }
+}
+
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.h b/TAO/tao/PortableServer/IdUniquenessPolicy.h
new file mode 100644
index 00000000000..3064d77924a
--- /dev/null
+++ b/TAO/tao/PortableServer/IdUniquenessPolicy.h
@@ -0,0 +1,73 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file IdUniquenessPolicy.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_IDUNIQUENESSTPOLICY_H
+#define TAO_PORTABLESERVER_IDUNIQUENESSTPOLICY_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "IdUniquenessPolicyC.h"
+#include "tao/LocalObject.h"
+
+// This is to remove "inherits via dominance" warnings from MSVC.
+// MSVC is being a little too paranoid.
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export IdUniquenessPolicy
+      : public virtual ::PortableServer::IdUniquenessPolicy,
+        public virtual TAO_Local_RefCounted_Object
+    {
+    public:
+      IdUniquenessPolicy (::PortableServer::IdUniquenessPolicyValue value);
+
+      CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      ::PortableServer::IdUniquenessPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      /// Return the cached policy type for this policy.
+      virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
+
+      /// Returns the scope at which this policy can be applied. See orbconf.h.
+      virtual TAO_Policy_Scope _tao_scope (void) const;
+
+    private:
+      ::PortableServer::IdUniquenessPolicyValue value_;
+    };
+  }
+}
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_IDUNIQUENESSTPOLICY_H */
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.pidl b/TAO/tao/PortableServer/IdUniquenessPolicy.pidl
new file mode 100644
index 00000000000..80fdd4f2a1a
--- /dev/null
+++ b/TAO/tao/PortableServer/IdUniquenessPolicy.pidl
@@ -0,0 +1,40 @@
+/**
+ * @file IdUniquenessPolicy.pidl
+ *
+ * $Id$
+ *
+ * @brief Pre-compiled IDL source for the PortableServer module.
+ *
+ * tao_idl.exe \
+ *     -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT)
+ *          -Wb,export_macro=TAO_PortableServer_Export \
+ *          -Wb,export_include="portableserver_export.h" \
+ *          -Wb,pre_include="ace/pre.h" \
+ *          -Wb,post_include="ace/post.h" \
+ *          IdUniquenessPolicy.pidl
+ */
+
+#ifndef _PORTABLESERVER_IDUNIQUENESSPOLICY_IDL_
+#define _PORTABLESERVER_IDUNIQUENESSPOLICY_IDL_
+
+#include <tao/Policy.pidl>
+
+#pragma prefix "omg.org"
+
+module PortableServer
+{
+# pragma version PortableServer 2.3
+
+  enum IdUniquenessPolicyValue
+  {
+    UNIQUE_ID,
+    MULTIPLE_ID
+  };
+
+  local interface IdUniquenessPolicy : CORBA::Policy
+  {
+    readonly attribute IdUniquenessPolicyValue value;
+  };
+};
+
+#endif // _PORTABLESERVER_IDUNIQUENESSPOLICY_IDL_
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp b/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp
new file mode 100644
index 00000000000..e47c2ab58a2
--- /dev/null
+++ b/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp
@@ -0,0 +1,251 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+
+#include "IdUniquenessPolicyC.h"
+#include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
+#include "tao/Any_Impl_T.h"
+#include "tao/Any_Basic_Impl_T.h"
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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 (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 (0x6c756500),  // name = IdUniquenessPolicyValue
+  2, // member count
+  10,
+  ACE_NTOHL (0x554e4951), 
+  ACE_NTOHL (0x55455f49), 
+  ACE_NTOHL (0x44000000),  // name = UNIQUE_ID
+  12,
+  ACE_NTOHL (0x4d554c54), 
+  ACE_NTOHL (0x49504c45), 
+  ACE_NTOHL (0x5f494400),  // name = MULTIPLE_ID
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdUniquenessPolicyValue (
+    CORBA::tk_enum,
+    sizeof (_oc_PortableServer_IdUniquenessPolicyValue),
+    (char *) &_oc_PortableServer_IdUniquenessPolicyValue,
+    0,
+    0
+  );
+
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_IdUniquenessPolicyValue =
+    &_tc_TAO_tc_PortableServer_IdUniquenessPolicyValue;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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 (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 (0x63790000),  // name = IdUniquenessPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdUniquenessPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_IdUniquenessPolicy),
+    (char *) &_oc_PortableServer_IdUniquenessPolicy,
+    0,
+    0
+  );
+
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_IdUniquenessPolicy =
+    &_tc_TAO_tc_PortableServer_IdUniquenessPolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::IdUniquenessPolicyValue _tao_elem
+  )
+{
+  TAO::Any_Basic_Impl_T<PortableServer::IdUniquenessPolicyValue>::insert (
+      _tao_any,
+      PortableServer::_tc_IdUniquenessPolicyValue,
+      _tao_elem
+    );
+}
+
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::IdUniquenessPolicyValue &_tao_elem
+  )
+{
+  return
+    TAO::Any_Basic_Impl_T<PortableServer::IdUniquenessPolicyValue>::extract (
+        _tao_any,
+        PortableServer::_tc_IdUniquenessPolicyValue,
+        _tao_elem 
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+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 false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::IdUniquenessPolicy_ptr _tao_elem
+  )
+{
+  PortableServer::IdUniquenessPolicy_ptr _tao_objptr =
+    PortableServer::IdUniquenessPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::IdUniquenessPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>::insert (
+      _tao_any,
+      PortableServer::IdUniquenessPolicy::_tao_any_destructor,
+      PortableServer::_tc_IdUniquenessPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::IdUniquenessPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>::extract (
+        _tao_any,
+        PortableServer::IdUniquenessPolicy::_tao_any_destructor,
+        PortableServer::_tc_IdUniquenessPolicy,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        PortableServer::IdUniquenessPolicyValue
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        PortableServer::IdUniquenessPolicy
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        PortableServer::IdUniquenessPolicyValue \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        PortableServer::IdUniquenessPolicy \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp b/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp
new file mode 100644
index 00000000000..3c1de6ba8fc
--- /dev/null
+++ b/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp
@@ -0,0 +1,255 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:302
+
+
+#include "IdUniquenessPolicyC.h"
+#include "tao/CDR.h"
+#include "ace/OS_NS_string.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if !defined (__ACE_INLINE__)
+#include "IdUniquenessPolicyC.inl"
+#endif /* !defined INLINE */
+
+// TAO_IDL - Generated from
+// be\be_visitor_arg_traits.cpp:66
+
+// Arg traits specializations.
+namespace TAO
+{
+}
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/interface_cs.cpp:60
+
+// Traits specializations for PortableServer::IdUniquenessPolicy.
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+PortableServer::IdUniquenessPolicy_ptr
+TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::duplicate (
+    PortableServer::IdUniquenessPolicy_ptr p
+  )
+{
+  return PortableServer::IdUniquenessPolicy::_duplicate (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+void
+TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::release (
+    PortableServer::IdUniquenessPolicy_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+PortableServer::IdUniquenessPolicy_ptr
+TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::nil (void)
+{
+  return PortableServer::IdUniquenessPolicy::_nil ();
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+CORBA::Boolean
+TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::marshal (
+    PortableServer::IdUniquenessPolicy_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return CORBA::Object::marshal (p, cdr);
+}
+
+PortableServer::IdUniquenessPolicy::IdUniquenessPolicy (void)
+{}
+
+PortableServer::IdUniquenessPolicy::~IdUniquenessPolicy (void)
+{}
+
+void 
+PortableServer::IdUniquenessPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  IdUniquenessPolicy *_tao_tmp_pointer =
+    static_cast<IdUniquenessPolicy *> (_tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
+}
+
+PortableServer::IdUniquenessPolicy_ptr
+PortableServer::IdUniquenessPolicy::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return IdUniquenessPolicy::_nil ();
+    }
+  
+  IdUniquenessPolicy_ptr proxy =
+    dynamic_cast<IdUniquenessPolicy_ptr> (_tao_objref);
+  
+  return IdUniquenessPolicy::_duplicate (proxy);
+}
+
+PortableServer::IdUniquenessPolicy_ptr
+PortableServer::IdUniquenessPolicy::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return IdUniquenessPolicy::_nil ();
+    }
+  
+  IdUniquenessPolicy_ptr proxy =
+    dynamic_cast<IdUniquenessPolicy_ptr> (_tao_objref);
+  
+  return IdUniquenessPolicy::_duplicate (proxy);
+}
+
+PortableServer::IdUniquenessPolicy_ptr
+PortableServer::IdUniquenessPolicy::_duplicate (IdUniquenessPolicy_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+CORBA::Boolean
+PortableServer::IdUniquenessPolicy::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/Policy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/PortableServer/IdUniquenessPolicy:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+    )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+const char* PortableServer::IdUniquenessPolicy::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/PortableServer/IdUniquenessPolicy:2.3";
+}
+
+CORBA::Boolean
+PortableServer::IdUniquenessPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/cdr_op_cs.cpp:51
+
+CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::IdUniquenessPolicyValue &_tao_enumval)
+{
+  CORBA::ULong _tao_temp = _tao_enumval;
+  return strm << _tao_temp;
+}
+
+CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdUniquenessPolicyValue &_tao_enumval)
+{
+  CORBA::ULong _tao_temp = 0;
+  CORBA::Boolean _tao_result = strm >> _tao_temp;
+  
+  if (_tao_result == 1)
+    {
+      _tao_enumval = static_cast<PortableServer::IdUniquenessPolicyValue> (_tao_temp);
+    }
+  
+  return _tao_result;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_root/root.cpp:1629
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Objref_Traits<
+        PortableServer::IdUniquenessPolicy
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::IdUniquenessPolicy
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::IdUniquenessPolicy
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Objref_Traits< \
+        PortableServer::IdUniquenessPolicy \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::IdUniquenessPolicy
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::IdUniquenessPolicy
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyC.h b/TAO/tao/PortableServer/IdUniquenessPolicyC.h
new file mode 100644
index 00000000000..e042e8cf04a
--- /dev/null
+++ b/TAO/tao/PortableServer/IdUniquenessPolicyC.h
@@ -0,0 +1,295 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:153
+
+#ifndef _TAO_IDL_ORIG_IDUNIQUENESSPOLICYC_H_
+#define _TAO_IDL_ORIG_IDUNIQUENESSPOLICYC_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "portableserver_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
+#include "tao/Environment.h"
+#include "tao/Object.h"
+#include "tao/Objref_VarOut_T.h"
+
+#include "tao/PolicyC.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_PortableServer_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_ch.cpp:62
+
+namespace TAO
+{
+  class Collocation_Proxy_Broker;
+  
+  template<typename T> class Narrow_Utils;
+  template<typename T> class AbstractBase_Narrow_Utils;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_enum/enum_ch.cpp:57
+  
+  enum IdUniquenessPolicyValue
+  {
+    UNIQUE_ID,
+    MULTIPLE_ID
+  };
+  
+  typedef IdUniquenessPolicyValue &IdUniquenessPolicyValue_out;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IdUniquenessPolicyValue;
+  
+  // TAO_IDL - Generated from
+  // be\be_interface.cpp:598
+
+#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;
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_interface/interface_ch.cpp:54
+
+#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;
+    
+    // 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 static_cast<IdUniquenessPolicy_ptr> (0);
+    }
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // 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
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::Policy_ptr copy (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void destroy (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_interface/interface_ch.cpp:208
+    
+    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:
+    // Abstract or local interface only.
+    IdUniquenessPolicy (void);
+    
+    virtual ~IdUniquenessPolicy (void);
+  
+  private:
+    // Private and unimplemented for concrete interfaces.
+    IdUniquenessPolicy (const IdUniquenessPolicy &);
+    
+    void operator= (const IdUniquenessPolicy &);
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IdUniquenessPolicy;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:66
+
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:59
+
+// Traits specializations.
+namespace TAO
+{
+
+#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY__TRAITS_CH_)
+#define _PORTABLESERVER_IDUNIQUENESSPOLICY__TRAITS_CH_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::IdUniquenessPolicy>
+  {
+    static ::PortableServer::IdUniquenessPolicy_ptr duplicate (
+        ::PortableServer::IdUniquenessPolicy_ptr
+      );
+    static void release (
+        ::PortableServer::IdUniquenessPolicy_ptr
+      );
+    static ::PortableServer::IdUniquenessPolicy_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::PortableServer::IdUniquenessPolicy_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_ch.cpp:51
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicyValue);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdUniquenessPolicyValue &);
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicy_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicy_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdUniquenessPolicy_ptr &);
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/cdr_op_ch.cpp:50
+
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdUniquenessPolicyValue &);
+TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdUniquenessPolicyValue &);
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:961
+
+#if defined (__ACE_INLINE__)
+#include "IdUniquenessPolicyC.inl"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyC.inl b/TAO/tao/PortableServer/IdUniquenessPolicyC.inl
new file mode 100644
index 00000000000..c944d806c1f
--- /dev/null
+++ b/TAO/tao/PortableServer/IdUniquenessPolicyC.inl
@@ -0,0 +1,27 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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/IdUniquenessStrategy.cpp b/TAO/tao/PortableServer/IdUniquenessStrategy.cpp
new file mode 100644
index 00000000000..e64ea29167f
--- /dev/null
+++ b/TAO/tao/PortableServer/IdUniquenessStrategy.cpp
@@ -0,0 +1,18 @@
+// $Id$
+
+#include "IdUniquenessStrategy.h"
+
+ACE_RCSID (PortableServer,
+           Id_Uniqueness_Strategy,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    IdUniquenessStrategy::~IdUniquenessStrategy()
+    {
+    }
+  }
+}
+
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategy.h b/TAO/tao/PortableServer/IdUniquenessStrategy.h
new file mode 100644
index 00000000000..f7cdedea0c0
--- /dev/null
+++ b/TAO/tao/PortableServer/IdUniquenessStrategy.h
@@ -0,0 +1,56 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file IdUniquenessStrategy.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_ID_UNIQUENESS_STRATEGY_H
+#define TAO_ID_UNIQUENESS_STRATEGY_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "Policy_Strategy.h"
+#include "IdUniquenessPolicyC.h"
+#include "PS_ForwardC.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class ServantRetentionStrategy;
+
+    class TAO_PortableServer_Export IdUniquenessStrategy
+      : public virtual Policy_Strategy
+    {
+    public:
+      virtual ~IdUniquenessStrategy (void);
+
+      /*
+       * Validate if the servant may be activated
+       * @retval true This servant may be activated
+       * @retval false This servant may not be activated
+       */
+      virtual bool is_servant_activation_allowed (
+        PortableServer::Servant s,
+        int &w) = 0;
+
+      virtual bool allow_multiple_activations (void) const = 0;
+
+      virtual ::PortableServer::IdUniquenessPolicyValue type() const = 0;
+    };
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_ID_UNIQUENESS_STRATEGY_H */
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h b/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h
new file mode 100644
index 00000000000..b38186003f3
--- /dev/null
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h
@@ -0,0 +1,49 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file IdUniquenessStrategyFactory.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORY_H
+#define TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORY_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "StrategyFactory.h"
+#include "IdUniquenessPolicyC.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class IdUniquenessStrategy;
+
+    class TAO_PortableServer_Export IdUniquenessStrategyFactory
+      : public virtual StrategyFactory
+    {
+    public:
+      /// Create a new servant retention strategy
+      virtual IdUniquenessStrategy* create (
+        ::PortableServer::IdUniquenessPolicyValue value) = 0;
+
+      /// Cleanup the given strategy instance
+      virtual void destroy (
+        IdUniquenessStrategy *strategy
+        ACE_ENV_ARG_DECL) = 0;
+    };
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORY_H */
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp
new file mode 100644
index 00000000000..ff1f25c84b3
--- /dev/null
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp
@@ -0,0 +1,103 @@
+// $Id$
+
+#include "IdUniquenessStrategyFactoryImpl.h"
+#include "IdUniquenessStrategy.h"
+#include "ace/Dynamic_Service.h"
+
+ACE_RCSID (PortableServer,
+           IdUniquenessStrategyFactoryImpl,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    IdUniquenessStrategyFactoryImpl::~IdUniquenessStrategyFactoryImpl (void)
+    {
+    }
+    IdUniquenessStrategy*
+    IdUniquenessStrategyFactoryImpl::create (
+      ::PortableServer::IdUniquenessPolicyValue value)
+    {
+      IdUniquenessStrategy* strategy = 0;
+
+      switch (value)
+      {
+        case ::PortableServer::MULTIPLE_ID :
+        {
+          strategy =
+            ACE_Dynamic_Service<IdUniquenessStrategy>::instance ("IdUniquenessStrategyMultiple");
+
+          if (strategy == 0)
+            ACE_ERROR ((LM_ERROR,
+                        ACE_TEXT ("(%P|%t) %p\n"),
+                        ACE_TEXT ("Unable to get ")
+                        ACE_TEXT ("IdUniquenessStrategyMultiple")));
+
+          break;
+        }
+        case ::PortableServer::UNIQUE_ID :
+        {
+          IdUniquenessStrategyFactory *strategy_factory =
+            ACE_Dynamic_Service<IdUniquenessStrategyFactory>::instance ("IdUniquenessStrategyUniqueFactory");
+
+          if (strategy_factory != 0)
+            strategy = strategy_factory->create (value);
+          else
+            ACE_ERROR ((LM_ERROR,
+                        ACE_TEXT ("(%P|%t) %p\n"),
+                        ACE_TEXT ("Unable to get ")
+                        ACE_TEXT ("IdUniquenessStrategyUniqueFactory")));
+
+          break;
+        }
+      }
+
+      return strategy;
+    }
+
+    void
+    IdUniquenessStrategyFactoryImpl::destroy (
+      IdUniquenessStrategy *strategy
+      ACE_ENV_ARG_DECL)
+    {
+      switch (strategy->type ())
+      {
+        case ::PortableServer::MULTIPLE_ID :
+        {
+          // Noop
+          break;
+        }
+        case ::PortableServer::UNIQUE_ID :
+        {
+          IdUniquenessStrategyFactory *strategy_factory =
+            ACE_Dynamic_Service<IdUniquenessStrategyFactory>::instance ("IdUniquenessStrategyUniqueFactory");
+
+          if (strategy_factory != 0)
+            {
+              strategy_factory->destroy (strategy ACE_ENV_ARG_PARAMETER);
+              ACE_CHECK;
+            }
+          break;
+        }
+      }
+    }
+
+    ACE_STATIC_SVC_DEFINE (
+        IdUniquenessStrategyFactoryImpl,
+        ACE_TEXT ("IdUniquenessStrategyFactory"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (IdUniquenessStrategyFactoryImpl),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+
+    ACE_FACTORY_DEFINE (TAO_PortableServer, IdUniquenessStrategyFactoryImpl)
+
+    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+    template class ACE_Dynamic_Service<IdUniquenessStrategyFactoryImpl>;
+    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+    #pragma instantiate ACE_Dynamic_Service<IdUniquenessStrategyFactoryImpl>
+    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  }
+}
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h
new file mode 100644
index 00000000000..0201368036d
--- /dev/null
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h
@@ -0,0 +1,51 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file IdUniquenessStrategyFactoryImpl.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORYIMPL_H
+#define TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORYIMPL_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Service_Config.h"
+#include "IdUniquenessStrategyFactory.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export IdUniquenessStrategyFactoryImpl
+      : public virtual IdUniquenessStrategyFactory
+    {
+    public:
+      virtual ~IdUniquenessStrategyFactoryImpl (void);
+
+      /// Create a new servant retention strategy
+      virtual IdUniquenessStrategy* create (
+        ::PortableServer::IdUniquenessPolicyValue value);
+
+      virtual void destroy (
+        IdUniquenessStrategy *strategy
+        ACE_ENV_ARG_DECL);
+    };
+
+    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyFactoryImpl)
+    ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyFactoryImpl)
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
new file mode 100644
index 00000000000..1fb5080a86d
--- /dev/null
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
@@ -0,0 +1,69 @@
+// $Id$
+
+#include "IdUniquenessStrategyMultiple.h"
+
+ACE_RCSID (PortableServer,
+           Id_Uniqueness_Strategy,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    IdUniquenessStrategyMultiple::~IdUniquenessStrategyMultiple()
+    {
+    }
+
+    void
+    IdUniquenessStrategyMultiple::strategy_init (
+      TAO_Root_POA * /*poa*/
+      ACE_ENV_ARG_DECL_NOT_USED)
+    {
+    }
+
+    void
+    IdUniquenessStrategyMultiple::strategy_cleanup(
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    {
+    }
+
+    bool
+    IdUniquenessStrategyMultiple::is_servant_activation_allowed (
+      PortableServer::Servant /*servant*/,
+      int & /*wait_occurred_restart_call*/)
+    {
+      // With the multiple id strategy we can always activate the servant
+      // another time
+      return true;
+    }
+
+    bool
+    IdUniquenessStrategyMultiple::allow_multiple_activations (void) const
+    {
+      return true;
+    }
+
+    ::PortableServer::IdUniquenessPolicyValue
+    IdUniquenessStrategyMultiple::type() const
+    {
+      return ::PortableServer::MULTIPLE_ID;
+    }
+
+    ACE_FACTORY_DEFINE (TAO_PortableServer, IdUniquenessStrategyMultiple)
+
+    ACE_STATIC_SVC_DEFINE (
+        IdUniquenessStrategyMultiple,
+        ACE_TEXT ("IdUniquenessStrategyMultiple"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (IdUniquenessStrategyMultiple),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+    template class ACE_Dynamic_Service<IdUniquenessStrategyMultiple>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Dynamic_Service<IdUniquenessStrategyMultiple>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  }
+}
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h
new file mode 100644
index 00000000000..5cb336938fc
--- /dev/null
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h
@@ -0,0 +1,55 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file IdUniquenessStrategyMultiple.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_ID_UNIQUENESSSTRATEGY_MULITPLE_H
+#define TAO_ID_UNIQUENESSSTRATEGY_MULITPLE_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "IdUniquenessStrategy.h"
+#include "ace/Service_Config.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export IdUniquenessStrategyMultiple
+      : public virtual IdUniquenessStrategy
+    {
+    public:
+      virtual ~IdUniquenessStrategyMultiple (void);
+
+      virtual void strategy_init (TAO_Root_POA *poa ACE_ENV_ARG_DECL);
+
+      virtual void strategy_cleanup (ACE_ENV_SINGLE_ARG_DECL);
+
+      virtual bool is_servant_activation_allowed (
+        PortableServer::Servant servant,
+        int &w);
+
+      virtual bool allow_multiple_activations (void) const;
+
+      virtual ::PortableServer::IdUniquenessPolicyValue type() const;
+    };
+
+    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyMultiple)
+    ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyMultiple)
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_ID_UNIQUENESSSTRATEGY_MULITPLE_H */
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
new file mode 100644
index 00000000000..64edae4df15
--- /dev/null
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
@@ -0,0 +1,81 @@
+// $Id$
+
+#include "IdUniquenessStrategyUnique.h"
+#include "Root_POA.h"
+
+ACE_RCSID (PortableServer,
+           Id_Uniqueness_Strategy,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    IdUniquenessStrategyUnique::IdUniquenessStrategyUnique (void) :
+      poa_ (0)
+    {
+    }
+
+    IdUniquenessStrategyUnique::~IdUniquenessStrategyUnique()
+    {
+    }
+
+    void
+    IdUniquenessStrategyUnique::strategy_init (
+      TAO_Root_POA *poa
+      ACE_ENV_ARG_DECL_NOT_USED)
+    {
+      poa_ = poa;
+    }
+
+    void
+    IdUniquenessStrategyUnique::strategy_cleanup (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    {
+      poa_ = 0;
+    }
+
+    bool
+    IdUniquenessStrategyUnique::is_servant_activation_allowed (
+      PortableServer::Servant servant,
+      int &wait_occurred_restart_call)
+    {
+      // If the specified servant is already in the Active Object Map, the
+      // ServantAlreadyActive exception is raised.
+      int result =
+        this->poa_->is_servant_active (servant,
+                                       wait_occurred_restart_call);
+
+      return (!(result || wait_occurred_restart_call));
+    }
+
+    bool
+    IdUniquenessStrategyUnique::allow_multiple_activations (void) const
+    {
+      return false;
+    }
+
+    ::PortableServer::IdUniquenessPolicyValue
+    IdUniquenessStrategyUnique::type() const
+    {
+      return ::PortableServer::UNIQUE_ID;
+    }
+
+    ACE_FACTORY_DEFINE (TAO_PortableServer, IdUniquenessStrategyUnique)
+
+    ACE_STATIC_SVC_DEFINE (
+        IdUniquenessStrategyUnique,
+        ACE_TEXT ("IdUniquenessStrategyUnique"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (IdUniquenessStrategyUnique),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+      template class ACE_Dynamic_Service<IdUniquenessStrategyUnique>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+#pragma instantiate ACE_Dynamic_Service<IdUniquenessStrategyUnique>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  }
+}
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h
new file mode 100644
index 00000000000..3fdf7dba796
--- /dev/null
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file IdUniquenessStrategyUnique.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_ID_UNIQUENESSSTRATEGYUNIQUE_H
+#define TAO_ID_UNIQUENESSSTRATEGYUNIQUE_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "IdUniquenessStrategy.h"
+#include "ace/Service_Config.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export IdUniquenessStrategyUnique
+      : public virtual IdUniquenessStrategy
+    {
+    public:
+      IdUniquenessStrategyUnique (void);
+
+      virtual ~IdUniquenessStrategyUnique (void);
+
+      virtual void strategy_init (TAO_Root_POA *poa
+                                  ACE_ENV_ARG_DECL);
+
+      virtual void strategy_cleanup (ACE_ENV_SINGLE_ARG_DECL);
+
+      virtual bool is_servant_activation_allowed (
+        PortableServer::Servant servant,
+        int &wait_occurred_restart_call);
+
+      virtual bool allow_multiple_activations (void) const;
+
+      virtual ::PortableServer::IdUniquenessPolicyValue type() const;
+
+    private:
+      TAO_Root_POA* poa_;
+    };
+
+    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyUnique)
+    ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyUnique)
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_ID_UNIQUENESSSTRATEGYUNIQUE_H */
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
new file mode 100644
index 00000000000..adf34ab10bd
--- /dev/null
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
@@ -0,0 +1,75 @@
+// $Id$
+
+#include "IdUniquenessStrategyUniqueFactoryImpl.h"
+#include "IdUniquenessStrategyUnique.h"
+#include "ace/Dynamic_Service.h"
+
+ACE_RCSID (PortableServer,
+           IdUniquenessStrategyUniqueFactoryImpl,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    IdUniquenessStrategyUniqueFactoryImpl::~IdUniquenessStrategyUniqueFactoryImpl (void)
+    {
+    }
+
+    IdUniquenessStrategy*
+    IdUniquenessStrategyUniqueFactoryImpl::create (
+      ::PortableServer::IdUniquenessPolicyValue value)
+    {
+      IdUniquenessStrategy* strategy = 0;
+
+      switch (value)
+      {
+        case ::PortableServer::UNIQUE_ID :
+        {
+          ACE_NEW_RETURN (strategy, IdUniquenessStrategyUnique, 0);
+          break;
+        }
+        case ::PortableServer::MULTIPLE_ID :
+        {
+          ACE_ERROR ((LM_ERROR, "Incorrect type in IdUniquenessStrategyUniqueFactoryImpl"));
+          break;
+        }
+      }
+
+      return strategy;
+    }
+
+    void
+    IdUniquenessStrategyUniqueFactoryImpl::destroy (
+      IdUniquenessStrategy *strategy
+      ACE_ENV_ARG_DECL)
+    {
+      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+
+      delete strategy;
+    }
+
+    ACE_STATIC_SVC_DEFINE (
+        IdUniquenessStrategyUniqueFactoryImpl,
+        ACE_TEXT ("IdUniquenessStrategyUniqueFactory"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (IdUniquenessStrategyUniqueFactoryImpl),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+
+    ACE_FACTORY_DEFINE (TAO_PortableServer, IdUniquenessStrategyUniqueFactoryImpl)
+
+    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+    template class ACE_Dynamic_Service<IdUniquenessStrategyUniqueFactoryImpl>;
+
+    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+    #pragma instantiate ACE_Dynamic_Service<IdUniquenessStrategyUniqueFactoryImpl>
+
+    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  }
+}
+
diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h
new file mode 100644
index 00000000000..f1a20375cb9
--- /dev/null
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h
@@ -0,0 +1,51 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file IdUniquenessStrategyUniqueFactoryImpl.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYUNIQUEFACTORYIMPL_H
+#define TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYUNIQUEFACTORYIMPL_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Service_Config.h"
+#include "IdUniquenessStrategyFactory.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export IdUniquenessStrategyUniqueFactoryImpl
+      : public virtual IdUniquenessStrategyFactory
+    {
+    public:
+      virtual ~IdUniquenessStrategyUniqueFactoryImpl (void);
+
+      /// Create a new  strategy
+      virtual IdUniquenessStrategy* create (
+        ::PortableServer::IdUniquenessPolicyValue value);
+
+      virtual void destroy (
+        IdUniquenessStrategy *strategy
+        ACE_ENV_ARG_DECL);
+    };
+
+    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, IdUniquenessStrategyUniqueFactoryImpl)
+    ACE_FACTORY_DECLARE (TAO_PortableServer, IdUniquenessStrategyUniqueFactoryImpl)
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYUNIQUEFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.cpp b/TAO/tao/PortableServer/ImR_Client_Adapter.cpp
new file mode 100644
index 00000000000..bd0afb4930c
--- /dev/null
+++ b/TAO/tao/PortableServer/ImR_Client_Adapter.cpp
@@ -0,0 +1,27 @@
+// @(#) $Id$
+
+#include "ImR_Client_Adapter.h"
+#include "ace/Dynamic_Service.h"
+
+ACE_RCSID (tao,
+           ImR_Client_Adapter,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+
+    ImR_Client_Adapter::~ImR_Client_Adapter (void)
+    {
+    }
+
+    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+    template class ACE_Dynamic_Service<ImR_Client_Adapter>;
+    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+    #pragma instantiate ACE_Dynamic_Service<ImR_Client_Adapter>
+
+    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  }
+}
+
diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.h b/TAO/tao/PortableServer/ImR_Client_Adapter.h
new file mode 100644
index 00000000000..019cc333669
--- /dev/null
+++ b/TAO/tao/PortableServer/ImR_Client_Adapter.h
@@ -0,0 +1,61 @@
+// This may look like C, but it's really -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    ImR_Client_Adapter.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+
+#ifndef TAO_IMR_CLIENT_ADAPTER_H
+#define TAO_IMR_CLIENT_ADAPTER_H
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Service_Object.h"
+#include "ace/CORBA_macros.h"
+#include "tao/orbconf.h"
+#include "tao/Environment.h"
+
+class TAO_Root_POA;
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    /**
+     * @class ImR_Client_Adapter
+     *
+     * @brief IFR_Client_Adapter.
+     *
+     * Class that adapts various functions in the PortableServer library
+     * which use the Implementation Repository. This is a base class for
+     * the actual implementation in the TAO_IMR_Client library.
+     */
+    class TAO_PortableServer_Export ImR_Client_Adapter :
+      public ACE_Service_Object
+    {
+    public:
+      virtual ~ImR_Client_Adapter (void);
+
+      /// ImplRepo helper method, notify the ImplRepo on startup
+      virtual void imr_notify_startup (TAO_Root_POA* poa ACE_ENV_ARG_DECL) = 0;
+
+      /// ImplRepo helper method, notify the ImplRepo on shutdown
+      virtual void imr_notify_shutdown (TAO_Root_POA* poa ACE_ENV_ARG_DECL) = 0;
+    };
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_IMR_CLIENT_ADAPTER_H */
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
new file mode 100644
index 00000000000..940a0f05b18
--- /dev/null
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
@@ -0,0 +1,67 @@
+#include "ImplicitActivationPolicy.h"
+#include "PortableServer.h"
+
+ACE_RCSID (PortableServer,
+           ImplicitActivationPolicy,
+           "$Id$")
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    ImplicitActivationPolicy::ImplicitActivationPolicy (
+      ::PortableServer::ImplicitActivationPolicyValue value) :
+        value_ (value)
+    {
+    }
+
+    CORBA::Policy_ptr
+    ImplicitActivationPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      ImplicitActivationPolicy *copy = 0;
+      ACE_NEW_THROW_EX (copy,
+                        ImplicitActivationPolicy (this->value_),
+                        CORBA::NO_MEMORY ());
+      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+
+      return copy;
+    }
+
+    void
+    ImplicitActivationPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+    }
+
+    ::PortableServer::ImplicitActivationPolicyValue
+    ImplicitActivationPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      return value_;
+    }
+
+    CORBA::PolicyType
+    ImplicitActivationPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      return ::PortableServer::IMPLICIT_ACTIVATION_POLICY_ID;
+    }
+
+    TAO_Cached_Policy_Type
+    ImplicitActivationPolicy::_tao_cached_type (void) const
+    {
+      return TAO_CACHED_POLICY_IMPLICIT_ACTIVATION;
+    }
+
+    TAO_Policy_Scope
+    ImplicitActivationPolicy::_tao_scope (void) const
+    {
+      return TAO_POLICY_POA_SCOPE;
+    }
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.h b/TAO/tao/PortableServer/ImplicitActivationPolicy.h
new file mode 100644
index 00000000000..6e9f11bea63
--- /dev/null
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.h
@@ -0,0 +1,77 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file ImplicitActivationPolicy.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_IMPLICITACTIVATIONPOLICY_H
+#define TAO_PORTABLESERVER_IMPLICITACTIVATIONPOLICY_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ImplicitActivationPolicyC.h"
+#include "tao/LocalObject.h"
+
+// This is to remove "inherits via dominance" warnings from MSVC.
+// MSVC is being a little too paranoid.
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export ImplicitActivationPolicy
+      : public virtual ::PortableServer::ImplicitActivationPolicy,
+        public virtual TAO_Local_RefCounted_Object
+    {
+    public:
+      ImplicitActivationPolicy (::PortableServer::ImplicitActivationPolicyValue value);
+
+      CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      ::PortableServer::ImplicitActivationPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      /// Return the cached policy type for this policy.
+      virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
+
+      /// Returns the scope at which this policy can be applied. See orbconf.h.
+      virtual TAO_Policy_Scope _tao_scope (void) const;
+
+    private:
+      ::PortableServer::ImplicitActivationPolicyValue value_;
+    };
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_IMPLICITACTIVATIONPOLICY_H */
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl b/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl
new file mode 100644
index 00000000000..ed0f8b58393
--- /dev/null
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.pidl
@@ -0,0 +1,40 @@
+/**
+ * @file ImplicitActivationPolicy.pidl
+ *
+ * $Id$
+ *
+ * @brief Pre-compiled IDL source for the PortableServer module.
+ *
+ * tao_idl.exe \
+ *     -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT)
+ *          -Wb,export_macro=TAO_PortableServer_Export \
+ *          -Wb,export_include="portableserver_export.h" \
+ *          -Wb,pre_include="ace/pre.h" \
+ *          -Wb,post_include="ace/post.h" \
+ *          ImplicitActivationPolicy.pidl
+ */
+
+#ifndef _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_IDL_
+#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_IDL_
+
+#include <tao/Policy.pidl>
+
+#pragma prefix "omg.org"
+
+module PortableServer
+{
+# pragma version PortableServer 2.3
+
+  enum ImplicitActivationPolicyValue
+  {
+    IMPLICIT_ACTIVATION,
+    NO_IMPLICIT_ACTIVATION
+  };
+
+  local interface ImplicitActivationPolicy : CORBA::Policy
+  {
+    readonly attribute ImplicitActivationPolicyValue value;
+  };
+};
+
+#endif // _PORTABLESERVER_IMPLICITACTIVATIONPOLICY_IDL_
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp
new file mode 100644
index 00000000000..d50da6cb975
--- /dev/null
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp
@@ -0,0 +1,267 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+
+#include "ImplicitActivationPolicyC.h"
+#include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
+#include "tao/Any_Impl_T.h"
+#include "tao/Any_Basic_Impl_T.h"
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+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 (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 (0x65000000),  // name = ImplicitActivationPolicyValue
+  2, // member count
+  20,
+  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 (0x4f4e0000),  // name = NO_IMPLICIT_ACTIVATION
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue (
+    CORBA::tk_enum,
+    sizeof (_oc_PortableServer_ImplicitActivationPolicyValue),
+    (char *) &_oc_PortableServer_ImplicitActivationPolicyValue,
+    0,
+    0
+  );
+
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_ImplicitActivationPolicyValue =
+    &_tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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 (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 (0x0),  // name = ImplicitActivationPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ImplicitActivationPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_ImplicitActivationPolicy),
+    (char *) &_oc_PortableServer_ImplicitActivationPolicy,
+    0,
+    0
+  );
+
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_ImplicitActivationPolicy =
+    &_tc_TAO_tc_PortableServer_ImplicitActivationPolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ImplicitActivationPolicyValue _tao_elem
+  )
+{
+  TAO::Any_Basic_Impl_T<PortableServer::ImplicitActivationPolicyValue>::insert (
+      _tao_any,
+      PortableServer::_tc_ImplicitActivationPolicyValue,
+      _tao_elem
+    );
+}
+
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ImplicitActivationPolicyValue &_tao_elem
+  )
+{
+  return
+    TAO::Any_Basic_Impl_T<PortableServer::ImplicitActivationPolicyValue>::extract (
+        _tao_any,
+        PortableServer::_tc_ImplicitActivationPolicyValue,
+        _tao_elem 
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+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 false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ImplicitActivationPolicy_ptr _tao_elem
+  )
+{
+  PortableServer::ImplicitActivationPolicy_ptr _tao_objptr =
+    PortableServer::ImplicitActivationPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ImplicitActivationPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>::insert (
+      _tao_any,
+      PortableServer::ImplicitActivationPolicy::_tao_any_destructor,
+      PortableServer::_tc_ImplicitActivationPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ImplicitActivationPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>::extract (
+        _tao_any,
+        PortableServer::ImplicitActivationPolicy::_tao_any_destructor,
+        PortableServer::_tc_ImplicitActivationPolicy,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        PortableServer::ImplicitActivationPolicyValue
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        PortableServer::ImplicitActivationPolicy
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        PortableServer::ImplicitActivationPolicyValue \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        PortableServer::ImplicitActivationPolicy \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp
new file mode 100644
index 00000000000..7238d4075f5
--- /dev/null
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp
@@ -0,0 +1,259 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:302
+
+
+#include "ImplicitActivationPolicyC.h"
+#include "tao/CDR.h"
+#include "ace/OS_NS_string.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if !defined (__ACE_INLINE__)
+#include "ImplicitActivationPolicyC.inl"
+#endif /* !defined INLINE */
+
+// TAO_IDL - Generated from
+// be\be_visitor_arg_traits.cpp:66
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+// Arg traits specializations.
+namespace TAO
+{
+}
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/interface_cs.cpp:60
+
+// Traits specializations for PortableServer::ImplicitActivationPolicy.
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+PortableServer::ImplicitActivationPolicy_ptr
+TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::duplicate (
+    PortableServer::ImplicitActivationPolicy_ptr p
+  )
+{
+  return PortableServer::ImplicitActivationPolicy::_duplicate (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+void
+TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::release (
+    PortableServer::ImplicitActivationPolicy_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+PortableServer::ImplicitActivationPolicy_ptr
+TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::nil (void)
+{
+  return PortableServer::ImplicitActivationPolicy::_nil ();
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+CORBA::Boolean
+TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::marshal (
+    PortableServer::ImplicitActivationPolicy_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return CORBA::Object::marshal (p, cdr);
+}
+
+PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy (void)
+{}
+
+PortableServer::ImplicitActivationPolicy::~ImplicitActivationPolicy (void)
+{}
+
+void 
+PortableServer::ImplicitActivationPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ImplicitActivationPolicy *_tao_tmp_pointer =
+    static_cast<ImplicitActivationPolicy *> (_tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
+}
+
+PortableServer::ImplicitActivationPolicy_ptr
+PortableServer::ImplicitActivationPolicy::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return ImplicitActivationPolicy::_nil ();
+    }
+  
+  ImplicitActivationPolicy_ptr proxy =
+    dynamic_cast<ImplicitActivationPolicy_ptr> (_tao_objref);
+  
+  return ImplicitActivationPolicy::_duplicate (proxy);
+}
+
+PortableServer::ImplicitActivationPolicy_ptr
+PortableServer::ImplicitActivationPolicy::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return ImplicitActivationPolicy::_nil ();
+    }
+  
+  ImplicitActivationPolicy_ptr proxy =
+    dynamic_cast<ImplicitActivationPolicy_ptr> (_tao_objref);
+  
+  return ImplicitActivationPolicy::_duplicate (proxy);
+}
+
+PortableServer::ImplicitActivationPolicy_ptr
+PortableServer::ImplicitActivationPolicy::_duplicate (ImplicitActivationPolicy_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+CORBA::Boolean
+PortableServer::ImplicitActivationPolicy::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/Policy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/PortableServer/ImplicitActivationPolicy:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+    )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+const char* PortableServer::ImplicitActivationPolicy::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/PortableServer/ImplicitActivationPolicy:2.3";
+}
+
+CORBA::Boolean
+PortableServer::ImplicitActivationPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/cdr_op_cs.cpp:51
+
+CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ImplicitActivationPolicyValue &_tao_enumval)
+{
+  CORBA::ULong _tao_temp = _tao_enumval;
+  return strm << _tao_temp;
+}
+
+CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ImplicitActivationPolicyValue &_tao_enumval)
+{
+  CORBA::ULong _tao_temp = 0;
+  CORBA::Boolean _tao_result = strm >> _tao_temp;
+  
+  if (_tao_result == 1)
+    {
+      _tao_enumval = static_cast<PortableServer::ImplicitActivationPolicyValue> (_tao_temp);
+    }
+  
+  return _tao_result;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_root/root.cpp:1629
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Objref_Traits<
+        PortableServer::ImplicitActivationPolicy
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::ImplicitActivationPolicy
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::ImplicitActivationPolicy
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Objref_Traits< \
+        PortableServer::ImplicitActivationPolicy \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::ImplicitActivationPolicy
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::ImplicitActivationPolicy
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyC.h b/TAO/tao/PortableServer/ImplicitActivationPolicyC.h
new file mode 100644
index 00000000000..1cccccf5c99
--- /dev/null
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicyC.h
@@ -0,0 +1,300 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:153
+
+#ifndef _TAO_IDL_ORIG_IMPLICITACTIVATIONPOLICYC_H_
+#define _TAO_IDL_ORIG_IMPLICITACTIVATIONPOLICYC_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "portableserver_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
+#include "tao/Environment.h"
+#include "tao/Object.h"
+#include "tao/Objref_VarOut_T.h"
+
+#include "tao/PolicyC.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_PortableServer_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_ch.cpp:62
+
+namespace TAO
+{
+  class Collocation_Proxy_Broker;
+  
+  template<typename T> class Narrow_Utils;
+  template<typename T> class AbstractBase_Narrow_Utils;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // 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
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ImplicitActivationPolicyValue;
+  
+  // TAO_IDL - Generated from
+  // be\be_interface.cpp:598
+
+#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;
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_interface/interface_ch.cpp:54
+
+#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;
+    
+    // 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 static_cast<ImplicitActivationPolicy_ptr> (0);
+    }
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // 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
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::Policy_ptr copy (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void destroy (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_interface/interface_ch.cpp:208
+    
+    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:
+    // Abstract or local interface only.
+    ImplicitActivationPolicy (void);
+    
+    virtual ~ImplicitActivationPolicy (void);
+  
+  private:
+    // Private and unimplemented for concrete interfaces.
+    ImplicitActivationPolicy (const ImplicitActivationPolicy &);
+    
+    void operator= (const ImplicitActivationPolicy &);
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ImplicitActivationPolicy;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:66
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:59
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+// Traits specializations.
+namespace TAO
+{
+
+#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY__TRAITS_CH_)
+#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY__TRAITS_CH_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ImplicitActivationPolicy>
+  {
+    static ::PortableServer::ImplicitActivationPolicy_ptr duplicate (
+        ::PortableServer::ImplicitActivationPolicy_ptr
+      );
+    static void release (
+        ::PortableServer::ImplicitActivationPolicy_ptr
+      );
+    static ::PortableServer::ImplicitActivationPolicy_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::PortableServer::ImplicitActivationPolicy_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_ch.cpp:51
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicyValue);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicyValue &);
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicy_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicy_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicy_ptr &);
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/cdr_op_ch.cpp:50
+
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &);
+TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicyValue &);
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:961
+
+#if defined (__ACE_INLINE__)
+#include "ImplicitActivationPolicyC.inl"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyC.inl b/TAO/tao/PortableServer/ImplicitActivationPolicyC.inl
new file mode 100644
index 00000000000..c944d806c1f
--- /dev/null
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicyC.inl
@@ -0,0 +1,27 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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/ImplicitActivationStrategy.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp
new file mode 100644
index 00000000000..5ff9d6f38ed
--- /dev/null
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp
@@ -0,0 +1,32 @@
+// -*- C++ -*-
+
+#include "ImplicitActivationStrategy.h"
+
+ACE_RCSID (PortableServer,
+           ImplicitActivationStrategy,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    ImplicitActivationStrategy::~ImplicitActivationStrategy (void)
+    {
+    }
+
+    void
+    ImplicitActivationStrategy::strategy_init (
+      TAO_Root_POA * /*poa*/
+      ACE_ENV_ARG_DECL_NOT_USED)
+    {
+      // dependent on type create the correct strategy.
+    }
+
+    void
+    ImplicitActivationStrategy::strategy_cleanup(
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    {
+    }
+  }
+}
+
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.h b/TAO/tao/PortableServer/ImplicitActivationStrategy.h
new file mode 100644
index 00000000000..5e5a0205b4a
--- /dev/null
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.h
@@ -0,0 +1,45 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file ImplicitActivationStrategy.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_ACTIVATION_STRATEGY_H
+#define TAO_ACTIVATION_STRATEGY_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "Policy_Strategy.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export ImplicitActivationStrategy
+      : public virtual Policy_Strategy
+    {
+    public:
+      virtual ~ImplicitActivationStrategy (void);
+
+      virtual void strategy_init(TAO_Root_POA *poa ACE_ENV_ARG_DECL);
+
+      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
+
+      virtual bool allow_implicit_activation (void) const = 0;
+    };
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_ACTIVATION_STRATEGY_H */
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
new file mode 100644
index 00000000000..37298a512d4
--- /dev/null
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
@@ -0,0 +1,41 @@
+// -*- C++ -*-
+
+#include "ImplicitActivationStrategyExplicit.h"
+
+ACE_RCSID (PortableServer,
+           ImplicitActivationStrategyExplicit,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    ImplicitActivationStrategyExplicit::~ImplicitActivationStrategyExplicit (void)
+    {
+    }
+
+    bool
+    ImplicitActivationStrategyExplicit::allow_implicit_activation (void) const
+    {
+      return false;
+    }
+
+    ACE_FACTORY_DEFINE (TAO_PortableServer, ImplicitActivationStrategyExplicit)
+
+    ACE_STATIC_SVC_DEFINE (
+        ImplicitActivationStrategyExplicit,
+        ACE_TEXT ("ImplicitActivationStrategyExplicit"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (ImplicitActivationStrategyExplicit),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+
+    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+    template class ACE_Dynamic_Service<ImplicitActivationStrategyExplicit>;
+    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+    #pragma instantiate ACE_Dynamic_Service<ImplicitActivationStrategyExplicit>
+    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  }
+}
+
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h
new file mode 100644
index 00000000000..4e2d82988eb
--- /dev/null
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h
@@ -0,0 +1,45 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file ImplicitActivationStrategyExplicit.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_IMPLICITACTIVATIONSTRATEGYEXPLICIT_H
+#define TAO_IMPLICITACTIVATIONSTRATEGYEXPLICIT_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ImplicitActivationStrategy.h"
+#include "ace/Service_Config.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export ImplicitActivationStrategyExplicit :
+       public virtual ImplicitActivationStrategy
+    {
+    public:
+      virtual ~ImplicitActivationStrategyExplicit (void);
+
+      virtual bool allow_implicit_activation (void) const;
+    };
+
+    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyExplicit)
+    ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyExplicit)
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_IMPLICITACTIVATIONSTRATEGYEXPLICIT_H */
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h b/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h
new file mode 100644
index 00000000000..a8456bcefdd
--- /dev/null
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h
@@ -0,0 +1,48 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file ImplicitActivationStrategyFactory.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORY_H
+#define TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORY_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "StrategyFactory.h"
+#include "ImplicitActivationPolicyC.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class ImplicitActivationStrategy;
+
+    class TAO_PortableServer_Export ImplicitActivationStrategyFactory
+      : public virtual StrategyFactory
+    {
+    public:
+      /// Create a new servant retention strategy
+      virtual ImplicitActivationStrategy* create (
+        ::PortableServer::ImplicitActivationPolicyValue value) = 0;
+
+      virtual void destroy (
+        ImplicitActivationStrategy *strategy
+        ACE_ENV_ARG_DECL) = 0;
+    };
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORY_H */
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
new file mode 100644
index 00000000000..4d30e9fa6f9
--- /dev/null
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
@@ -0,0 +1,82 @@
+// $Id$
+
+#include "ImplicitActivationStrategyFactoryImpl.h"
+#include "ace/Dynamic_Service.h"
+#include "ImplicitActivationStrategyImplicit.h"
+#include "ImplicitActivationStrategyExplicit.h"
+
+ACE_RCSID (PortableServer,
+           ImplicitActivationStrategyFactoryImpl,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    ImplicitActivationStrategyFactoryImpl::~ImplicitActivationStrategyFactoryImpl (void)
+    {
+    }
+    ImplicitActivationStrategy*
+    ImplicitActivationStrategyFactoryImpl::create (
+      ::PortableServer::ImplicitActivationPolicyValue value)
+    {
+      ImplicitActivationStrategy* strategy = 0;
+
+      switch (value)
+      {
+        case ::PortableServer::IMPLICIT_ACTIVATION :
+        {
+          strategy =
+            ACE_Dynamic_Service<ImplicitActivationStrategy>::instance ("ImplicitActivationStrategyImplicit");
+
+          if (strategy == 0)
+            ACE_ERROR ((LM_ERROR,
+                        ACE_TEXT ("(%P|%t) %p\n"),
+                        ACE_TEXT ("Unable to get ")
+                        ACE_TEXT ("ImplicitActivationStrategyImplicit")));
+          break;
+        }
+        case ::PortableServer::NO_IMPLICIT_ACTIVATION :
+        {
+          strategy =
+            ACE_Dynamic_Service<ImplicitActivationStrategy>::instance ("ImplicitActivationStrategyExplicit");
+
+          if (strategy == 0)
+            ACE_ERROR ((LM_ERROR,
+                        ACE_TEXT ("(%P|%t) %p\n"),
+                        ACE_TEXT ("Unable to get ")
+                        ACE_TEXT ("ImplicitActivationStrategyExplicit")));
+          break;
+        }
+      }
+
+      return strategy;
+    }
+
+    void
+    ImplicitActivationStrategyFactoryImpl::destroy (
+      ImplicitActivationStrategy * /*strategy*/
+      ACE_ENV_ARG_DECL_NOT_USED)
+    {
+      // Noop because both types are singletons
+    }
+
+    ACE_STATIC_SVC_DEFINE (
+        ImplicitActivationStrategyFactoryImpl,
+        ACE_TEXT ("ImplicitActivationStrategyFactory"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (ImplicitActivationStrategyFactoryImpl),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+
+    ACE_FACTORY_DEFINE (TAO_PortableServer, ImplicitActivationStrategyFactoryImpl)
+
+    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+    template class ACE_Dynamic_Service<ImplicitActivationStrategyFactoryImpl>;
+    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+    #pragma instantiate ACE_Dynamic_Service<ImplicitActivationStrategyFactoryImpl>
+    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  }
+}
+
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h
new file mode 100644
index 00000000000..c877e5c0ae3
--- /dev/null
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h
@@ -0,0 +1,51 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file ImplicitActivationStrategyFactoryImpl.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORYIMPL_H
+#define TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORYIMPL_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Service_Config.h"
+#include "ImplicitActivationStrategyFactory.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export ImplicitActivationStrategyFactoryImpl
+      : public virtual ImplicitActivationStrategyFactory
+    {
+    public:
+      virtual ~ImplicitActivationStrategyFactoryImpl (void);
+
+      /// Create a new servant retention strategy
+      virtual ImplicitActivationStrategy* create (
+        ::PortableServer::ImplicitActivationPolicyValue value);
+
+      virtual void destroy (
+        ImplicitActivationStrategy *strategy
+        ACE_ENV_ARG_DECL);
+    };
+
+    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyFactoryImpl)
+    ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyFactoryImpl)
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
new file mode 100644
index 00000000000..b5289d63bd0
--- /dev/null
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
@@ -0,0 +1,41 @@
+// -*- C++ -*-
+
+#include "ImplicitActivationStrategyImplicit.h"
+
+ACE_RCSID (PortableServer,
+           ImplicitActivationStrategyImplicit,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    ImplicitActivationStrategyImplicit::~ImplicitActivationStrategyImplicit (void)
+    {
+    }
+
+    bool
+    ImplicitActivationStrategyImplicit::allow_implicit_activation (void) const
+    {
+      return true;
+    }
+
+    ACE_FACTORY_DEFINE (TAO_PortableServer, ImplicitActivationStrategyImplicit)
+
+    ACE_STATIC_SVC_DEFINE (
+        ImplicitActivationStrategyImplicit,
+        ACE_TEXT ("ImplicitActivationStrategyImplicit"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (ImplicitActivationStrategyImplicit),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+
+    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+    template class ACE_Dynamic_Service<ImplicitActivationStrategyImplicit>;
+    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+    #pragma instantiate ACE_Dynamic_Service<ImplicitActivationStrategyImplicit>
+    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  }
+}
+
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h
new file mode 100644
index 00000000000..0aa4733a537
--- /dev/null
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h
@@ -0,0 +1,46 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file ImplicitActivationStrategyImplicit.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_IMPLICITACTIVATIONSTRATEGYIMPLICIT_H
+#define TAO_IMPLICITACTIVATIONSTRATEGYIMPLICIT_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ImplicitActivationStrategy.h"
+#include "ace/Service_Config.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export ImplicitActivationStrategyImplicit
+      : public virtual ImplicitActivationStrategy
+    {
+    public:
+      virtual ~ImplicitActivationStrategyImplicit (void);
+
+      virtual bool allow_implicit_activation (void) const;
+
+    };
+
+    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ImplicitActivationStrategyImplicit)
+    ACE_FACTORY_DECLARE (TAO_PortableServer, ImplicitActivationStrategyImplicit)
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_IMPLICITACTIVATIONSTRATEGYIMPLICIT_H */
diff --git a/TAO/tao/PortableServer/Key_Adapters.cpp b/TAO/tao/PortableServer/Key_Adapters.cpp
index ccc6fb3b61b..0765402e755 100644
--- a/TAO/tao/PortableServer/Key_Adapters.cpp
+++ b/TAO/tao/PortableServer/Key_Adapters.cpp
@@ -4,6 +4,11 @@
 
 #include "ace/ACE.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Map_T.h"
+
+ACE_RCSID (PortableServer,
+           Key_Adapters,
+           "$Id$")
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -49,7 +54,7 @@ TAO_Ignore_Original_Key_Adapter::encode (const PortableServer::ObjectId &origina
   size_t active_key_size = active_key.size ();
 
   // Resize to accommodate both the original data and the new active key.
-  modified_key.length (ACE_static_cast (CORBA::ULong, active_key_size));
+  modified_key.length (static_cast <CORBA::ULong> (active_key_size));
 
   // Copy active key data into user key.
   active_key.encode (modified_key.get_buffer ());
@@ -76,8 +81,8 @@ TAO_Ignore_Original_Key_Adapter::decode (const PortableServer::ObjectId &modifie
   // Smartly copy all the data; <original_key does not own the data>.
   original_key.replace (modified_key.maximum (),
                         modified_key.length (),
-                        ACE_const_cast (CORBA::Octet *,
-                                        modified_key.get_buffer ()),
+                        const_cast <CORBA::Octet *>
+                                   (modified_key.get_buffer ()),
                         0);
 
   // Success.
@@ -95,8 +100,7 @@ TAO_Preserve_Original_Key_Adapter::encode (const PortableServer::ObjectId &origi
   size_t active_key_size = active_key.size ();
 
   // Resize to accommodate both the original data and the new active key.
-  modified_key.length (ACE_static_cast (CORBA::ULong,
-                                        active_key_size)
+  modified_key.length (static_cast <CORBA::ULong> (active_key_size)
                          + original_key.length ());
 
   // Copy active key data into user key.
@@ -130,12 +134,12 @@ TAO_Preserve_Original_Key_Adapter::decode (const PortableServer::ObjectId &modif
   size_t active_key_size = ACE_Active_Map_Manager_Key::size ();
 
   // Smartly copy all the data; <original_key does not own the data>.
-  original_key.replace (ACE_static_cast (CORBA::ULong,
-                            modified_key.maximum () - active_key_size),
-                        ACE_static_cast (CORBA::ULong,
-                            modified_key.length () - active_key_size),
-                        ACE_const_cast (CORBA::Octet *,
-                                        modified_key.get_buffer ()) + active_key_size,
+  original_key.replace (static_cast <CORBA::ULong>
+                            (modified_key.maximum () - active_key_size),
+                        static_cast <CORBA::ULong>
+                            (modified_key.length () - active_key_size),
+                        const_cast <CORBA::Octet *>
+                            (modified_key.get_buffer ()) + active_key_size,
                         0);
 
   // Success.
diff --git a/TAO/tao/PortableServer/Key_Adapters.h b/TAO/tao/PortableServer/Key_Adapters.h
index 76aa08c087a..a7f8e544b5c 100644
--- a/TAO/tao/PortableServer/Key_Adapters.h
+++ b/TAO/tao/PortableServer/Key_Adapters.h
@@ -15,13 +15,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/Map_T.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "PortableServerC.h"
+#include "PS_ForwardC.h"
+
+class ACE_Active_Map_Manager_Key;
 
 ////////////////////////////////////////////////////////////////////////////////
 
diff --git a/TAO/tao/PortableServer/LifespanPolicy.cpp b/TAO/tao/PortableServer/LifespanPolicy.cpp
new file mode 100644
index 00000000000..377b34fedd6
--- /dev/null
+++ b/TAO/tao/PortableServer/LifespanPolicy.cpp
@@ -0,0 +1,64 @@
+#include "LifespanPolicy.h"
+#include "PortableServer.h"
+
+ACE_RCSID (PortableServer,
+           LifespanPolicy,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    LifespanPolicy::LifespanPolicy (
+      ::PortableServer::LifespanPolicyValue value) :
+        value_ (value)
+    {
+    }
+
+    CORBA::Policy_ptr
+    LifespanPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      LifespanPolicy *copy = 0;
+      ACE_NEW_THROW_EX (copy,
+                        LifespanPolicy (this->value_),
+                        CORBA::NO_MEMORY ());
+      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+
+      return copy;
+    }
+
+    void
+    LifespanPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+    }
+
+    ::PortableServer::LifespanPolicyValue
+    LifespanPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      return value_;
+    }
+
+    CORBA::PolicyType
+    LifespanPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      return ::PortableServer::LIFESPAN_POLICY_ID;
+    }
+
+    TAO_Cached_Policy_Type
+    LifespanPolicy::_tao_cached_type (void) const
+    {
+      return TAO_CACHED_POLICY_LIFESPAN;
+    }
+
+    TAO_Policy_Scope
+    LifespanPolicy::_tao_scope (void) const
+    {
+      return TAO_POLICY_POA_SCOPE;
+    }
+  }
+}
+
diff --git a/TAO/tao/PortableServer/LifespanPolicy.h b/TAO/tao/PortableServer/LifespanPolicy.h
new file mode 100644
index 00000000000..8d6f3aafc10
--- /dev/null
+++ b/TAO/tao/PortableServer/LifespanPolicy.h
@@ -0,0 +1,73 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file LifespanPolicy.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_POA_LIFESPANPOLICY_H
+#define TAO_POA_LIFESPANPOLICY_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "LifespanPolicyC.h"
+#include "tao/LocalObject.h"
+
+// This is to remove "inherits via dominance" warnings from MSVC.
+// MSVC is being a little too paranoid.
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export LifespanPolicy
+      : public virtual ::PortableServer::LifespanPolicy,
+        public virtual TAO_Local_RefCounted_Object
+    {
+    public:
+      LifespanPolicy (::PortableServer::LifespanPolicyValue value);
+
+      CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      ::PortableServer::LifespanPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      /// Return the cached policy type for this policy.
+      virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
+
+      /// Returns the scope at which this policy can be applied. See orbconf.h.
+      virtual TAO_Policy_Scope _tao_scope (void) const;
+
+    private:
+      ::PortableServer::LifespanPolicyValue value_;
+    };
+  }
+}
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_POA_LIFESPANPOLICY_H */
diff --git a/TAO/tao/PortableServer/LifespanPolicy.pidl b/TAO/tao/PortableServer/LifespanPolicy.pidl
new file mode 100644
index 00000000000..ef459cdc4cb
--- /dev/null
+++ b/TAO/tao/PortableServer/LifespanPolicy.pidl
@@ -0,0 +1,40 @@
+/**
+ * @file LifespanPolicy.pidl
+ *
+ * $Id$
+ *
+ * @brief Pre-compiled IDL source for the PortableServer module.
+ *
+ * tao_idl.exe \
+ *     -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT)
+ *          -Wb,export_macro=TAO_PortableServer_Export \
+ *          -Wb,export_include="portableserver_export.h" \
+ *          -Wb,pre_include="ace/pre.h" \
+ *          -Wb,post_include="ace/post.h" \
+ *          LifespanPolicy.pidl
+ */
+
+#ifndef _PORTABLESERVER_LIFESPANPOLICY_IDL_
+#define _PORTABLESERVER_LIFESPANPOLICY_IDL_
+
+#include <tao/Policy.pidl>
+
+#pragma prefix "omg.org"
+
+module PortableServer
+{
+# pragma version PortableServer 2.3
+
+  enum LifespanPolicyValue
+  {
+    TRANSIENT,
+    PERSISTENT
+  };
+
+  local interface LifespanPolicy : CORBA::Policy
+  {
+    readonly attribute LifespanPolicyValue value;
+  };
+};
+
+#endif // _PORTABLESERVER_LIFESPANPOLICY_IDL_
diff --git a/TAO/tao/PortableServer/LifespanPolicyA.cpp b/TAO/tao/PortableServer/LifespanPolicyA.cpp
new file mode 100644
index 00000000000..ae74dcc5f0f
--- /dev/null
+++ b/TAO/tao/PortableServer/LifespanPolicyA.cpp
@@ -0,0 +1,247 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+
+#include "LifespanPolicyC.h"
+#include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
+#include "tao/Any_Impl_T.h"
+#include "tao/Any_Basic_Impl_T.h"
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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 (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 (0x6c756500),  // name = LifespanPolicyValue
+  2, // member count
+  10,
+  ACE_NTOHL (0x5452414e), 
+  ACE_NTOHL (0x5349454e), 
+  ACE_NTOHL (0x54000000),  // name = TRANSIENT
+  11,
+  ACE_NTOHL (0x50455253), 
+  ACE_NTOHL (0x49535445), 
+  ACE_NTOHL (0x4e540000),  // name = PERSISTENT
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_LifespanPolicyValue (
+    CORBA::tk_enum,
+    sizeof (_oc_PortableServer_LifespanPolicyValue),
+    (char *) &_oc_PortableServer_LifespanPolicyValue,
+    0,
+    0
+  );
+
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_LifespanPolicyValue =
+    &_tc_TAO_tc_PortableServer_LifespanPolicyValue;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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 (0x33000000),  // repository ID = IDL:omg.org/PortableServer/LifespanPolicy:2.3
+    15,
+  ACE_NTOHL (0x4c696665), 
+  ACE_NTOHL (0x7370616e), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63790000),  // name = LifespanPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_LifespanPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_LifespanPolicy),
+    (char *) &_oc_PortableServer_LifespanPolicy,
+    0,
+    0
+  );
+
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_LifespanPolicy =
+    &_tc_TAO_tc_PortableServer_LifespanPolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::LifespanPolicyValue _tao_elem
+  )
+{
+  TAO::Any_Basic_Impl_T<PortableServer::LifespanPolicyValue>::insert (
+      _tao_any,
+      PortableServer::_tc_LifespanPolicyValue,
+      _tao_elem
+    );
+}
+
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::LifespanPolicyValue &_tao_elem
+  )
+{
+  return
+    TAO::Any_Basic_Impl_T<PortableServer::LifespanPolicyValue>::extract (
+        _tao_any,
+        PortableServer::_tc_LifespanPolicyValue,
+        _tao_elem 
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+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 false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::LifespanPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::LifespanPolicy_ptr _tao_elem
+  )
+{
+  PortableServer::LifespanPolicy_ptr _tao_objptr =
+    PortableServer::LifespanPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::LifespanPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::LifespanPolicy>::insert (
+      _tao_any,
+      PortableServer::LifespanPolicy::_tao_any_destructor,
+      PortableServer::_tc_LifespanPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::LifespanPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::LifespanPolicy>::extract (
+        _tao_any,
+        PortableServer::LifespanPolicy::_tao_any_destructor,
+        PortableServer::_tc_LifespanPolicy,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        PortableServer::LifespanPolicyValue
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        PortableServer::LifespanPolicy
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        PortableServer::LifespanPolicyValue \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        PortableServer::LifespanPolicy \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/LifespanPolicyC.cpp b/TAO/tao/PortableServer/LifespanPolicyC.cpp
new file mode 100644
index 00000000000..782618d6a53
--- /dev/null
+++ b/TAO/tao/PortableServer/LifespanPolicyC.cpp
@@ -0,0 +1,255 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:302
+
+
+#include "LifespanPolicyC.h"
+#include "tao/CDR.h"
+#include "ace/OS_NS_string.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if !defined (__ACE_INLINE__)
+#include "LifespanPolicyC.inl"
+#endif /* !defined INLINE */
+
+// TAO_IDL - Generated from
+// be\be_visitor_arg_traits.cpp:66
+
+// Arg traits specializations.
+namespace TAO
+{
+}
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/interface_cs.cpp:60
+
+// Traits specializations for PortableServer::LifespanPolicy.
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+PortableServer::LifespanPolicy_ptr
+TAO::Objref_Traits<PortableServer::LifespanPolicy>::duplicate (
+    PortableServer::LifespanPolicy_ptr p
+  )
+{
+  return PortableServer::LifespanPolicy::_duplicate (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+void
+TAO::Objref_Traits<PortableServer::LifespanPolicy>::release (
+    PortableServer::LifespanPolicy_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+PortableServer::LifespanPolicy_ptr
+TAO::Objref_Traits<PortableServer::LifespanPolicy>::nil (void)
+{
+  return PortableServer::LifespanPolicy::_nil ();
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+CORBA::Boolean
+TAO::Objref_Traits<PortableServer::LifespanPolicy>::marshal (
+    PortableServer::LifespanPolicy_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return CORBA::Object::marshal (p, cdr);
+}
+
+PortableServer::LifespanPolicy::LifespanPolicy (void)
+{}
+
+PortableServer::LifespanPolicy::~LifespanPolicy (void)
+{}
+
+void 
+PortableServer::LifespanPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  LifespanPolicy *_tao_tmp_pointer =
+    static_cast<LifespanPolicy *> (_tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
+}
+
+PortableServer::LifespanPolicy_ptr
+PortableServer::LifespanPolicy::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return LifespanPolicy::_nil ();
+    }
+  
+  LifespanPolicy_ptr proxy =
+    dynamic_cast<LifespanPolicy_ptr> (_tao_objref);
+  
+  return LifespanPolicy::_duplicate (proxy);
+}
+
+PortableServer::LifespanPolicy_ptr
+PortableServer::LifespanPolicy::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return LifespanPolicy::_nil ();
+    }
+  
+  LifespanPolicy_ptr proxy =
+    dynamic_cast<LifespanPolicy_ptr> (_tao_objref);
+  
+  return LifespanPolicy::_duplicate (proxy);
+}
+
+PortableServer::LifespanPolicy_ptr
+PortableServer::LifespanPolicy::_duplicate (LifespanPolicy_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+CORBA::Boolean
+PortableServer::LifespanPolicy::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/Policy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/PortableServer/LifespanPolicy:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+    )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+const char* PortableServer::LifespanPolicy::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/PortableServer/LifespanPolicy:2.3";
+}
+
+CORBA::Boolean
+PortableServer::LifespanPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/cdr_op_cs.cpp:51
+
+CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::LifespanPolicyValue &_tao_enumval)
+{
+  CORBA::ULong _tao_temp = _tao_enumval;
+  return strm << _tao_temp;
+}
+
+CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::LifespanPolicyValue &_tao_enumval)
+{
+  CORBA::ULong _tao_temp = 0;
+  CORBA::Boolean _tao_result = strm >> _tao_temp;
+  
+  if (_tao_result == 1)
+    {
+      _tao_enumval = static_cast<PortableServer::LifespanPolicyValue> (_tao_temp);
+    }
+  
+  return _tao_result;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_root/root.cpp:1629
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Objref_Traits<
+        PortableServer::LifespanPolicy
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::LifespanPolicy
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::LifespanPolicy
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Objref_Traits< \
+        PortableServer::LifespanPolicy \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::LifespanPolicy
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::LifespanPolicy
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/LifespanPolicyC.h b/TAO/tao/PortableServer/LifespanPolicyC.h
new file mode 100644
index 00000000000..52a6807cc44
--- /dev/null
+++ b/TAO/tao/PortableServer/LifespanPolicyC.h
@@ -0,0 +1,295 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:153
+
+#ifndef _TAO_IDL_ORIG_LIFESPANPOLICYC_H_
+#define _TAO_IDL_ORIG_LIFESPANPOLICYC_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "portableserver_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
+#include "tao/Environment.h"
+#include "tao/Object.h"
+#include "tao/Objref_VarOut_T.h"
+
+#include "tao/PolicyC.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_PortableServer_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_ch.cpp:62
+
+namespace TAO
+{
+  class Collocation_Proxy_Broker;
+  
+  template<typename T> class Narrow_Utils;
+  template<typename T> class AbstractBase_Narrow_Utils;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_enum/enum_ch.cpp:57
+  
+  enum LifespanPolicyValue
+  {
+    TRANSIENT,
+    PERSISTENT
+  };
+  
+  typedef LifespanPolicyValue &LifespanPolicyValue_out;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_LifespanPolicyValue;
+  
+  // TAO_IDL - Generated from
+  // be\be_interface.cpp:598
+
+#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;
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_interface/interface_ch.cpp:54
+
+#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;
+    
+    // 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 static_cast<LifespanPolicy_ptr> (0);
+    }
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // 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
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::Policy_ptr copy (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void destroy (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_interface/interface_ch.cpp:208
+    
+    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:
+    // Abstract or local interface only.
+    LifespanPolicy (void);
+    
+    virtual ~LifespanPolicy (void);
+  
+  private:
+    // Private and unimplemented for concrete interfaces.
+    LifespanPolicy (const LifespanPolicy &);
+    
+    void operator= (const LifespanPolicy &);
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_LifespanPolicy;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:66
+
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:59
+
+// Traits specializations.
+namespace TAO
+{
+
+#if !defined (_PORTABLESERVER_LIFESPANPOLICY__TRAITS_CH_)
+#define _PORTABLESERVER_LIFESPANPOLICY__TRAITS_CH_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::LifespanPolicy>
+  {
+    static ::PortableServer::LifespanPolicy_ptr duplicate (
+        ::PortableServer::LifespanPolicy_ptr
+      );
+    static void release (
+        ::PortableServer::LifespanPolicy_ptr
+      );
+    static ::PortableServer::LifespanPolicy_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::PortableServer::LifespanPolicy_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_ch.cpp:51
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicyValue);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::LifespanPolicyValue &);
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicy_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicy_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::LifespanPolicy_ptr &);
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/cdr_op_ch.cpp:50
+
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::LifespanPolicyValue &);
+TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::LifespanPolicyValue &);
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:961
+
+#if defined (__ACE_INLINE__)
+#include "LifespanPolicyC.inl"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/PortableServer/LifespanPolicyC.inl b/TAO/tao/PortableServer/LifespanPolicyC.inl
new file mode 100644
index 00000000000..c944d806c1f
--- /dev/null
+++ b/TAO/tao/PortableServer/LifespanPolicyC.inl
@@ -0,0 +1,27 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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/LifespanStrategy.cpp b/TAO/tao/PortableServer/LifespanStrategy.cpp
new file mode 100644
index 00000000000..98411f899fd
--- /dev/null
+++ b/TAO/tao/PortableServer/LifespanStrategy.cpp
@@ -0,0 +1,53 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    LifespanStrategy.cpp
+ *
+ *  $Id$
+ *
+ */
+//=============================================================================
+
+#include "LifespanStrategy.h"
+
+ACE_RCSID (PortableServer,
+           LifespanStrategy,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    LifespanStrategy::LifespanStrategy () :
+      poa_ (0)
+    {
+    }
+
+    LifespanStrategy::~LifespanStrategy ()
+    {
+    }
+
+    void
+    LifespanStrategy::strategy_init (
+      TAO_Root_POA *poa
+      ACE_ENV_ARG_DECL_NOT_USED)
+    {
+      poa_ = poa;
+    }
+
+    void
+    LifespanStrategy::strategy_cleanup(
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    {
+      poa_ = 0;
+    }
+
+    CORBA::ULong
+    LifespanStrategy::key_type_length (void) const
+    {
+      return sizeof (char);
+    }
+  } /* namespace Portable_Server */
+} /* namespace TAO */
+
diff --git a/TAO/tao/PortableServer/LifespanStrategy.h b/TAO/tao/PortableServer/LifespanStrategy.h
new file mode 100644
index 00000000000..49a94e67f17
--- /dev/null
+++ b/TAO/tao/PortableServer/LifespanStrategy.h
@@ -0,0 +1,88 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file LifespanStrategy.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_LIFESPANPOLICY_H
+#define TAO_PORTABLESERVER_LIFESPANPOLICY_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "Policy_Strategy.h"
+#include "LifespanPolicyC.h"
+#include "tao/Object_KeyC.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class Temporary_Creation_Time;
+
+    class TAO_PortableServer_Export LifespanStrategy
+      : public virtual Policy_Strategy
+    {
+    public:
+      LifespanStrategy (void);
+
+      virtual ~LifespanStrategy (void);
+
+      virtual void strategy_init(TAO_Root_POA *poa ACE_ENV_ARG_DECL);
+
+      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
+
+      void create (const char *name, const TAO::ObjectKey &key);
+
+      virtual void notify_startup (ACE_ENV_SINGLE_ARG_DECL) = 0;
+
+      virtual void notify_shutdown (ACE_ENV_SINGLE_ARG_DECL) = 0;
+
+      /**
+       * Validate the passed object key if it belongs to this POA.
+       */
+      bool validate (TAO::ObjectKey_var& key);
+
+      /**
+       * Returns the length of the key type
+       */
+      virtual CORBA::ULong key_length (void) const = 0;
+
+      CORBA::ULong key_type_length (void) const;
+
+      /// Do we have set persistent or not,
+      virtual CORBA::Boolean is_persistent (void) const = 0;
+
+      virtual void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at) = 0;
+
+      /// Validate whether this matches the set lifespan strategy
+      virtual bool validate (
+        CORBA::Boolean is_persistent,
+        const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const = 0;
+
+      /// Check the state of the POA.
+      virtual void check_state (ACE_ENV_SINGLE_ARG_DECL) = 0;
+
+      virtual ::PortableServer::LifespanPolicyValue type() const = 0;
+
+      virtual bool use_imr () const = 0;
+
+    protected:
+      TAO_Root_POA *poa_;
+    };
+
+  } /* namespace Portable_Server */
+} /* namespace TAO */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_LIFESPANPOLICY_H */
diff --git a/TAO/tao/PortableServer/LifespanStrategyFactory.h b/TAO/tao/PortableServer/LifespanStrategyFactory.h
new file mode 100644
index 00000000000..eae79bc2c4b
--- /dev/null
+++ b/TAO/tao/PortableServer/LifespanStrategyFactory.h
@@ -0,0 +1,49 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file LifespanStrategyFactory.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORY_H
+#define TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORY_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "StrategyFactory.h"
+#include "LifespanPolicyC.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class LifespanStrategy;
+
+    class TAO_PortableServer_Export LifespanStrategyFactory
+      : public virtual StrategyFactory
+    {
+    public:
+      /// Create a new servant retention strategy
+      virtual LifespanStrategy* create (
+        ::PortableServer::LifespanPolicyValue value) = 0;
+
+      /// Cleanup the given strategy instance
+      virtual void destroy (
+        LifespanStrategy *strategy
+        ACE_ENV_ARG_DECL) = 0;
+    };
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORY_H */
diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
new file mode 100644
index 00000000000..985aa1a1ebd
--- /dev/null
+++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
@@ -0,0 +1,116 @@
+// $Id$
+
+#include "LifespanStrategyFactoryImpl.h"
+#include "LifespanStrategy.h"
+#include "ace/Dynamic_Service.h"
+
+ACE_RCSID (PortableServer,
+           LifespanStrategyFactoryImpl,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    LifespanStrategyFactoryImpl::~LifespanStrategyFactoryImpl (void)
+    {
+    }
+    LifespanStrategy*
+    LifespanStrategyFactoryImpl::create (
+      ::PortableServer::LifespanPolicyValue value)
+    {
+      LifespanStrategy* strategy = 0;
+
+      switch (value)
+      {
+        case ::PortableServer::PERSISTENT :
+        {
+          LifespanStrategyFactory *strategy_factory =
+            ACE_Dynamic_Service<LifespanStrategyFactory>::instance ("LifespanStrategyPersistentFactory");
+
+          if (strategy_factory != 0)
+            strategy = strategy_factory->create (value);
+          else
+            ACE_ERROR ((LM_ERROR,
+                        ACE_TEXT ("(%P|%t) %p\n"),
+                        ACE_TEXT ("Unable to get ")
+                        ACE_TEXT ("LifespanStrategyPersistentFactory")));
+
+          break;
+        }
+        case ::PortableServer::TRANSIENT :
+        {
+          LifespanStrategyFactory *strategy_factory =
+            ACE_Dynamic_Service<LifespanStrategyFactory>::instance ("LifespanStrategyTransientFactory");
+
+          if (strategy_factory != 0)
+            strategy = strategy_factory->create (value);
+          else
+            ACE_ERROR ((LM_ERROR,
+                        ACE_TEXT ("(%P|%t) %p\n"),
+                        ACE_TEXT ("Unable to get ")
+                        ACE_TEXT ("LifespanStrategyTransientFactory")));
+          break;
+        }
+      }
+
+      return strategy;
+    }
+
+    void
+    LifespanStrategyFactoryImpl::destroy (
+      LifespanStrategy *strategy
+      ACE_ENV_ARG_DECL)
+    {
+      switch (strategy->type ())
+      {
+        case ::PortableServer::PERSISTENT :
+        {
+          LifespanStrategyFactory *strategy_factory =
+            ACE_Dynamic_Service<LifespanStrategyFactory>::instance ("LifespanStrategyPersistentFactory");
+
+          if (strategy_factory != 0)
+            {
+              strategy_factory->destroy (strategy ACE_ENV_ARG_PARAMETER);
+              ACE_CHECK;
+            }
+          break;
+        }
+        case ::PortableServer::TRANSIENT :
+        {
+          LifespanStrategyFactory *strategy_factory =
+            ACE_Dynamic_Service<LifespanStrategyFactory>::instance ("LifespanStrategyTransientFactory");
+
+          if (strategy_factory != 0)
+            {
+              strategy_factory->destroy (strategy ACE_ENV_ARG_PARAMETER);
+              ACE_CHECK;
+            }
+          break;
+        }
+      }
+    }
+
+    ACE_STATIC_SVC_DEFINE (
+        LifespanStrategyFactoryImpl,
+        ACE_TEXT ("LifespanStrategyFactory"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (LifespanStrategyFactoryImpl),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+
+    ACE_FACTORY_DEFINE (TAO_PortableServer, LifespanStrategyFactoryImpl)
+
+    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+    template class ACE_Dynamic_Service<LifespanStrategyFactoryImpl>;
+
+    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+    #pragma instantiate ACE_Dynamic_Service<LifespanStrategyFactoryImpl>
+
+    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  }
+}
+
diff --git a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h
new file mode 100644
index 00000000000..5df3c880f58
--- /dev/null
+++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h
@@ -0,0 +1,52 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file LifespanStrategyFactoryImpl.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORYIMPL_H
+#define TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORYIMPL_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Service_Config.h"
+#include "LifespanStrategyFactory.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export LifespanStrategyFactoryImpl
+      : public virtual LifespanStrategyFactory
+    {
+    public:
+      virtual ~LifespanStrategyFactoryImpl (void);
+
+      /// Create a new servant retention strategy
+      virtual LifespanStrategy* create (
+        ::PortableServer::LifespanPolicyValue value);
+
+      /// Cleanup the given strategy instance
+      virtual void destroy (
+        LifespanStrategy *strategy
+        ACE_ENV_ARG_DECL);
+    };
+
+    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, LifespanStrategyFactoryImpl)
+    ACE_FACTORY_DECLARE (TAO_PortableServer, LifespanStrategyFactoryImpl)
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
new file mode 100644
index 00000000000..0fbb8ecf0bb
--- /dev/null
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
@@ -0,0 +1,136 @@
+// -*- C++ -*-
+
+#include "LifespanStrategyPersistent.h"
+
+ACE_RCSID (PortableServer,
+           Lifespan_Strategy,
+           "$Id$")
+
+#include "Root_POA.h"
+#include "POAManager.h"
+#include "ImR_Client_Adapter.h"
+#include "tao/ORB_Core.h"
+#include "ace/OS_NS_sys_time.h"
+#include "ace/Dynamic_Service.h"
+#include "ace/Service_Config.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    bool
+    LifespanStrategyPersistent::validate (
+      CORBA::Boolean is_persistent,
+      const TAO::Portable_Server::Temporary_Creation_Time& /*creation_time*/) const
+    {
+      return is_persistent;
+    }
+
+    char
+    LifespanStrategyPersistent::key_type (void) const
+    {
+      // @@ Johnny, why can;t use the enum's defined within
+      // PortableServer IDL? Wouldn't they make life much simpler?
+      // @bala, this if for the IOR setup/parsing, I can't find these charachters
+      // in the pidl file. In the POA it are static methods, seems that this
+      // normal methods doesn't work, because in some static functions these are
+      // used. This still needs some work, but I want to get those info out of
+      // the POA.
+      return 'P';
+    }
+
+    CORBA::Boolean
+    LifespanStrategyPersistent::is_persistent (void) const
+    {
+      return true;
+    }
+
+    void
+    LifespanStrategyPersistent::create_key (
+      CORBA::Octet *buffer,
+      CORBA::ULong& starting_at)
+    {
+      // Copy the persistence byte.
+      buffer[starting_at] = static_cast<CORBA::Octet> (this->key_type ());
+      starting_at += this->key_type_length ();
+    }
+
+    CORBA::ULong
+    LifespanStrategyPersistent::key_length () const
+    {
+      return this->key_type_length ();
+    }
+
+    void
+    LifespanStrategyPersistent::notify_startup (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      ImR_Client_Adapter *adapter =
+        ACE_Dynamic_Service<ImR_Client_Adapter>::instance (
+          TAO_Root_POA::imr_client_adapter_name ()
+        );
+
+      if (adapter == 0)
+        {
+          ACE_Service_Config::process_directive (
+            ACE_TEXT("dynamic ImR_Client_Adapter Service_Object *")
+            ACE_TEXT("TAO_ImR_Client:_make_ImR_Client_Adapter_Impl()"));
+
+          adapter =
+            ACE_Dynamic_Service<ImR_Client_Adapter>::instance (
+              TAO_Root_POA::imr_client_adapter_name ());
+        }
+
+      if (adapter != 0)
+        {
+          bool old_use_imr = this->use_imr_;
+          this->use_imr_ = false;
+
+          adapter->imr_notify_startup (this->poa_ ACE_ENV_ARG_PARAMETER);
+
+          this->use_imr_ = old_use_imr;
+        }
+    }
+
+    void
+    LifespanStrategyPersistent::notify_shutdown (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      ImR_Client_Adapter *adapter =
+        ACE_Dynamic_Service<ImR_Client_Adapter>::instance (
+          TAO_Root_POA::imr_client_adapter_name ()
+        );
+
+      if (adapter != 0)
+        {
+          adapter->imr_notify_shutdown (this->poa_ ACE_ENV_ARG_PARAMETER);
+        }
+    }
+
+    LifespanStrategyPersistent::LifespanStrategyPersistent() :
+      use_imr_ (true)
+    {
+    }
+
+    LifespanStrategyPersistent::~LifespanStrategyPersistent ()
+    {
+    }
+
+    void
+    LifespanStrategyPersistent::check_state (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      this->poa_->tao_poa_manager().check_state (ACE_ENV_SINGLE_ARG_PARAMETER);
+    }
+
+    ::PortableServer::LifespanPolicyValue
+    LifespanStrategyPersistent::type() const
+    {
+      return ::PortableServer::PERSISTENT;
+    }
+
+    bool
+    LifespanStrategyPersistent::use_imr () const
+    {
+      return use_imr_;
+    }
+  } /* namespace Portable_Server */
+} /* namespace TAO */
+
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.h b/TAO/tao/PortableServer/LifespanStrategyPersistent.h
new file mode 100644
index 00000000000..97cbb04f633
--- /dev/null
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.h
@@ -0,0 +1,70 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file LifespanStrategyPersistent.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_LIFESPANSTRATEGYPERSISTENT_H
+#define TAO_LIFESPANSTRATEGYPERSISTENT_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "LifespanStrategy.h"
+#include "tao/Object_KeyC.h"
+
+class ServerObject_i;
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export LifespanStrategyPersistent
+      : public virtual LifespanStrategy
+    {
+    public:
+      LifespanStrategyPersistent ();
+
+      virtual ~LifespanStrategyPersistent (void);
+
+      virtual void notify_startup (ACE_ENV_SINGLE_ARG_DECL);
+
+      virtual void notify_shutdown (ACE_ENV_SINGLE_ARG_DECL);
+
+      char key_type (void) const;
+
+      virtual CORBA::Boolean is_persistent (void) const;
+
+      CORBA::ULong key_length (void) const;
+
+      virtual void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at);
+
+      virtual bool
+      validate (CORBA::Boolean is_persistent,
+                const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const;
+
+      /// Check the state of the POA.
+      virtual void check_state (ACE_ENV_SINGLE_ARG_DECL);
+
+      virtual ::PortableServer::LifespanPolicyValue type() const;
+
+      virtual bool use_imr () const;
+
+    private:
+      bool use_imr_;
+    };
+  } /* namespace Portable_Server */
+} /* namespace TAO */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_LIFESPANSTRATEGYPERSISTENT_H */
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
new file mode 100644
index 00000000000..8ff42737deb
--- /dev/null
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
@@ -0,0 +1,74 @@
+// $Id$
+
+#include "LifespanStrategyPersistentFactoryImpl.h"
+#include "ace/Dynamic_Service.h"
+#include "LifespanStrategyPersistent.h"
+
+ACE_RCSID (PortableServer,
+           LifespanStrategyFactoryImpl,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    LifespanStrategyPersistentFactoryImpl::~LifespanStrategyPersistentFactoryImpl (void)
+    {
+    }
+    LifespanStrategy*
+    LifespanStrategyPersistentFactoryImpl::create (
+      ::PortableServer::LifespanPolicyValue value)
+    {
+      LifespanStrategy* strategy = 0;
+
+      switch (value)
+      {
+        case ::PortableServer::PERSISTENT :
+        {
+          ACE_NEW_RETURN (strategy, LifespanStrategyPersistent, 0);
+          break;
+        }
+        case ::PortableServer::TRANSIENT :
+        {
+          ACE_ERROR ((LM_ERROR, "Incorrect type in LifespanStrategyPersistentFactoryImpl"));
+          break;
+        }
+      }
+
+      return strategy;
+    }
+
+    void
+    LifespanStrategyPersistentFactoryImpl::destroy (
+      LifespanStrategy *strategy
+      ACE_ENV_ARG_DECL)
+    {
+      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+
+      delete strategy;
+    }
+
+    ACE_STATIC_SVC_DEFINE (
+        LifespanStrategyPersistentFactoryImpl,
+        ACE_TEXT ("LifespanStrategyPersistentFactory"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (LifespanStrategyPersistentFactoryImpl),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+
+    ACE_FACTORY_DEFINE (TAO_PortableServer, LifespanStrategyPersistentFactoryImpl)
+
+    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+    template class ACE_Dynamic_Service<LifespanStrategyPersistentFactoryImpl>;
+
+    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+    #pragma instantiate ACE_Dynamic_Service<LifespanStrategyPersistentFactoryImpl>
+
+    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  }
+}
+
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h
new file mode 100644
index 00000000000..e3f1bb384e1
--- /dev/null
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h
@@ -0,0 +1,52 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file LifespanStrategyPersistentFactoryImpl.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_LIFEPSPANSTRATEGYPERSISTENTFACTORYIMPL_H
+#define TAO_PORTABLESERVER_LIFEPSPANSTRATEGYPERSISTENTFACTORYIMPL_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Service_Config.h"
+#include "LifespanStrategyFactory.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export LifespanStrategyPersistentFactoryImpl
+      : public virtual LifespanStrategyFactory
+    {
+    public:
+      virtual ~LifespanStrategyPersistentFactoryImpl (void);
+
+      /// Create a new strategy
+      virtual LifespanStrategy* create (
+        ::PortableServer::LifespanPolicyValue value);
+
+      /// Cleanup the given strategy instance
+      virtual void destroy (
+        LifespanStrategy *strategy
+        ACE_ENV_ARG_DECL);
+    };
+
+    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, LifespanStrategyPersistentFactoryImpl)
+    ACE_FACTORY_DECLARE (TAO_PortableServer, LifespanStrategyPersistentFactoryImpl)
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_LIFEPSPANSTRATEGYPERSISTENTFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp
new file mode 100644
index 00000000000..5b1034429c9
--- /dev/null
+++ b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp
@@ -0,0 +1,125 @@
+// -*- C++ -*-
+
+#include "LifespanStrategyTransient.h"
+
+ACE_RCSID (PortableServer,
+           Lifespan_Strategy,
+           "$Id$")
+
+#include "ace/OS_NS_sys_time.h"
+#include "ace/OS_NS_string.h"
+#include "POAManager.h"
+#include "Root_POA.h"
+#include "tao/ORB_Constants.h"
+#include "Creation_Time.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    LifespanStrategyTransient::LifespanStrategyTransient () :
+      creation_time_ (ACE_OS::gettimeofday ())
+    {
+    }
+
+    LifespanStrategyTransient::~LifespanStrategyTransient ()
+    {
+    }
+
+    void
+    LifespanStrategyTransient::notify_startup (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    {
+    }
+
+    void
+    LifespanStrategyTransient::notify_shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    {
+    }
+
+    CORBA::Boolean
+    LifespanStrategyTransient::is_persistent (void) const
+    {
+      return false;
+    }
+
+    bool
+    LifespanStrategyTransient::validate (
+      CORBA::Boolean is_persistent,
+      const TAO::Portable_Server::Temporary_Creation_Time &creation_time) const
+    {
+      return (!is_persistent && this->creation_time_ == creation_time);
+    }
+
+    CORBA::ULong
+    LifespanStrategyTransient::key_length (void) const
+    {
+      CORBA::ULong keylength = sizeof (char);
+
+      #if (POA_NO_TIMESTAMP == 0)
+        // Calculate the space required for the timestamp.
+          keylength += TAO::Portable_Server::Creation_Time::creation_time_length ();
+      #endif /* POA_NO_TIMESTAMP */
+
+      return keylength;
+    }
+
+    void
+    LifespanStrategyTransient::create_key (
+      CORBA::Octet *buffer,
+      CORBA::ULong& starting_at)
+    {
+      // Copy the persistence byte.
+      buffer[starting_at] = (CORBA::Octet) this->key_type ();
+      starting_at += this->key_type_length ();
+
+      #if (POA_NO_TIMESTAMP == 0)
+        // Then copy the timestamp for transient POAs.
+        ACE_OS::memcpy (&buffer[starting_at],
+                        this->creation_time_.creation_time (),
+                       TAO::Portable_Server::Creation_Time::creation_time_length ());
+        starting_at += TAO::Portable_Server::Creation_Time::creation_time_length ();
+      #endif /* POA_NO_TIMESTAMP */
+    }
+
+    char
+    LifespanStrategyTransient::key_type (void) const
+    {
+      // @@ Johnny, why can;t use the enum's defined within
+      // PortableServer IDL? Wouldn't they make life much simpler?
+      // @bala, this if for the IOR setup/parsing, I can't find these charachters
+      // in the pidl file. In the POA it are static methods, seems that this
+      // normal methods doesn't work, because in some static functions these are
+      // used. This still needs some work, but I want to get those info out of
+      // the POA.
+      return 'T';
+    }
+
+    void
+    LifespanStrategyTransient::check_state (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      if (this->poa_->tao_poa_manager().get_state_i () ==
+            PortableServer::POAManager::INACTIVE)
+      {
+        ACE_THROW (CORBA::OBJECT_NOT_EXIST (CORBA::OMGVMCID | 4,
+                                            CORBA::COMPLETED_NO));
+      }
+      else
+      {
+        this->poa_->tao_poa_manager().check_state (ACE_ENV_SINGLE_ARG_PARAMETER);
+      }
+    }
+
+    bool
+    LifespanStrategyTransient::use_imr () const
+    {
+      return false;
+    }
+
+    ::PortableServer::LifespanPolicyValue
+    LifespanStrategyTransient::type() const
+    {
+      return ::PortableServer::TRANSIENT;
+    }
+  } /* namespace Portable_Server */
+} /* namespace TAO */
+
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.h b/TAO/tao/PortableServer/LifespanStrategyTransient.h
new file mode 100644
index 00000000000..02addaf04b6
--- /dev/null
+++ b/TAO/tao/PortableServer/LifespanStrategyTransient.h
@@ -0,0 +1,69 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file LifespanStrategyTransient.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_LIFESPANSTRATEGYTRANSIENT_H
+#define TAO_LIFESPANSTRATEGYTRANSIENT_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "LifespanStrategy.h"
+#include "Creation_Time.h"
+#include "tao/Object_KeyC.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export LifespanStrategyTransient
+      : public virtual LifespanStrategy
+    {
+    public:
+      LifespanStrategyTransient (void);
+
+      virtual ~LifespanStrategyTransient (void);
+
+      virtual void notify_startup (ACE_ENV_SINGLE_ARG_DECL);
+
+      virtual void notify_shutdown (ACE_ENV_SINGLE_ARG_DECL);
+
+      char key_type (void) const;
+
+      virtual CORBA::Boolean is_persistent (void) const;
+
+      CORBA::ULong key_length (void) const;
+
+      virtual void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at);
+
+      virtual
+      bool validate (CORBA::Boolean is_persistent,
+                     const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const;
+
+      /// Check the state of the POA.
+      virtual void check_state (ACE_ENV_SINGLE_ARG_DECL);
+
+      virtual ::PortableServer::LifespanPolicyValue type() const;
+
+      virtual bool use_imr () const;
+
+    private:
+      TAO::Portable_Server::Creation_Time creation_time_;
+    };
+  } /* namespace Portable_Server */
+} /* namespace TAO */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_LIFESPANSTRATEGYTRANSIENT_H */
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
new file mode 100644
index 00000000000..fb54f07692c
--- /dev/null
+++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
@@ -0,0 +1,74 @@
+// $Id$
+
+#include "LifespanStrategyTransientFactoryImpl.h"
+#include "ace/Dynamic_Service.h"
+#include "LifespanStrategyTransient.h"
+
+ACE_RCSID (PortableServer,
+           LifespanStrategyFactoryImpl,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    LifespanStrategyTransientFactoryImpl::~LifespanStrategyTransientFactoryImpl (void)
+    {
+    }
+    LifespanStrategy*
+    LifespanStrategyTransientFactoryImpl::create (
+      ::PortableServer::LifespanPolicyValue value)
+    {
+      LifespanStrategy* strategy = 0;
+
+      switch (value)
+      {
+        case ::PortableServer::PERSISTENT :
+        {
+          ACE_ERROR ((LM_ERROR, "Incorrect type in LifespanStrategyTransientFactoryImpl"));
+          break;
+        }
+        case ::PortableServer::TRANSIENT :
+        {
+          ACE_NEW_RETURN (strategy, LifespanStrategyTransient, 0);
+          break;
+        }
+      }
+
+      return strategy;
+    }
+
+    void
+    LifespanStrategyTransientFactoryImpl::destroy (
+      LifespanStrategy *strategy
+      ACE_ENV_ARG_DECL)
+    {
+      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+
+      delete strategy;
+    }
+
+    ACE_STATIC_SVC_DEFINE (
+        LifespanStrategyTransientFactoryImpl,
+        ACE_TEXT ("LifespanStrategyTransientFactory"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (LifespanStrategyTransientFactoryImpl),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+
+    ACE_FACTORY_DEFINE (TAO_PortableServer, LifespanStrategyTransientFactoryImpl)
+
+    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+    template class ACE_Dynamic_Service<LifespanStrategyTransientFactoryImpl>;
+
+    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+    #pragma instantiate ACE_Dynamic_Service<LifespanStrategyTransientFactoryImpl>
+
+    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  }
+}
+
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h
new file mode 100644
index 00000000000..007107f398d
--- /dev/null
+++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h
@@ -0,0 +1,52 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file LifespanStrategyTransientFactoryImpl.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_LIFEPSPANSTRATEGYTRANSIENTFACTORYIMPL_H
+#define TAO_PORTABLESERVER_LIFEPSPANSTRATEGYTRANSIENTFACTORYIMPL_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Service_Config.h"
+#include "LifespanStrategyFactory.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export LifespanStrategyTransientFactoryImpl
+      : public virtual LifespanStrategyFactory
+    {
+    public:
+      virtual ~LifespanStrategyTransientFactoryImpl (void);
+
+      /// Create a new strategy
+      virtual LifespanStrategy* create (
+        ::PortableServer::LifespanPolicyValue value);
+
+      /// Cleanup the given strategy instance
+      virtual void destroy (
+        LifespanStrategy *strategy
+        ACE_ENV_ARG_DECL);
+    };
+
+    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, LifespanStrategyTransientFactoryImpl)
+    ACE_FACTORY_DECLARE (TAO_PortableServer, LifespanStrategyTransientFactoryImpl)
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_LIFEPSPANSTRATEGYTRANSIENTFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
new file mode 100644
index 00000000000..937eaf11ebc
--- /dev/null
+++ b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
@@ -0,0 +1,92 @@
+// $Id$
+
+#include "Non_Servant_Upcall.h"
+#include "Object_Adapter.h"
+#include "Root_POA.h"
+
+#if !defined (__ACE_INLINE__)
+# include "Non_Servant_Upcall.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID (PortableServer,
+           Non_Servant_Upcall,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    Non_Servant_Upcall::Non_Servant_Upcall (TAO_Root_POA &poa)
+      : object_adapter_ (poa.object_adapter ()),
+        poa_ (poa),
+        previous_ (0)
+    {
+      // Check if this is a nested non_servant_upcall.
+      if (this->object_adapter_.non_servant_upcall_nesting_level_ != 0)
+        {
+          // Remember previous instance of non_servant_upcall.
+          this->previous_ = this->object_adapter_.non_servant_upcall_in_progress_;
+
+          // Assert that the thread is the same as the one before.
+          ACE_ASSERT (ACE_OS::thr_equal (this->object_adapter_.non_servant_upcall_thread_,
+                                         ACE_OS::thr_self ()));
+        }
+
+      // Remember which thread is calling the adapter activators.
+      this->object_adapter_.non_servant_upcall_thread_ = ACE_OS::thr_self ();
+
+      // Mark the fact that a non-servant upcall is in progress.
+      this->object_adapter_.non_servant_upcall_in_progress_ = this;
+
+      // Adjust the nesting level.
+      this->object_adapter_.non_servant_upcall_nesting_level_++;
+
+      // We always release
+      this->object_adapter_.lock ().release ();
+    }
+
+    Non_Servant_Upcall::~Non_Servant_Upcall (void)
+    {
+      // Reacquire the Object Adapter lock.
+      this->object_adapter_.lock ().acquire ();
+
+      // Adjust the nesting level.
+      this->object_adapter_.non_servant_upcall_nesting_level_--;
+
+      // We are done with this nested upcall.
+      this->object_adapter_.non_servant_upcall_in_progress_ = this->previous_;
+
+      // If we are at the outer nested upcall.
+      if (this->object_adapter_.non_servant_upcall_nesting_level_ == 0)
+        {
+          // Reset thread id.
+          this->object_adapter_.non_servant_upcall_thread_ =
+            ACE_OS::NULL_thread;
+
+          // Check if all pending requests are over.
+          if (this->poa_.waiting_destruction () &&
+              this->poa_.outstanding_requests () == 0)
+            {
+              ACE_TRY_NEW_ENV
+                {
+                  this->poa_.complete_destruction_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+                  ACE_TRY_CHECK;
+                }
+              ACE_CATCHANY
+                {
+                  // Ignore exceptions
+                  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                                       "TAO_POA::complete_destruction_i");
+                }
+              ACE_ENDTRY;
+            }
+
+          // If locking is enabled.
+          if (this->object_adapter_.enable_locking_)
+            // Wakeup all waiting threads.
+            this->object_adapter_.non_servant_upcall_condition_.broadcast ();
+        }
+    }
+  }
+}
+
diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.h b/TAO/tao/PortableServer/Non_Servant_Upcall.h
new file mode 100644
index 00000000000..0e80bff606f
--- /dev/null
+++ b/TAO/tao/PortableServer/Non_Servant_Upcall.h
@@ -0,0 +1,73 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Non_Servant_Upcall.h
+ *
+ *  $Id$
+ *
+ *  @author Irfan Pyarali
+ */
+//=============================================================================
+
+#ifndef TAO_NONSERVANT_UPCALL_H
+#define TAO_NONSERVANT_UPCALL_H
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+// Forward declaration
+class TAO_Root_POA;
+class TAO_Object_Adapter;
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    /**
+     * @class Non_Servant_Upcall
+     *
+     * @brief This class helps us with a recursive thread lock without
+     * using a recursive thread lock.  Non_Servant_Upcall has a
+     * magic constructor and destructor.  We unlock the
+     * Object_Adapter lock for the duration of the non-servant
+     * (i.e., adapter activator and servant activator) upcalls;
+     * reacquiring once the upcalls complete.  Even though we are
+     * releasing the lock, other threads will not be able to make
+     * progress since
+     * <Object_Adapter::non_servant_upcall_in_progress_> has been
+     * set.
+     */
+    class TAO_PortableServer_Export Non_Servant_Upcall
+    {
+    public:
+
+      /// Constructor.
+      Non_Servant_Upcall (TAO_Root_POA &poa);
+
+      /// Destructor.
+      ~Non_Servant_Upcall (void);
+
+      TAO_Root_POA &poa (void) const;
+
+    protected:
+
+      TAO_Object_Adapter &object_adapter_;
+      TAO_Root_POA &poa_;
+      Non_Servant_Upcall *previous_;
+    };
+  }
+}
+
+#if defined (__ACE_INLINE__)
+# include "Non_Servant_Upcall.inl"
+#endif /* __ACE_INLINE__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_NONSERVANT_UPCALL_H */
diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.inl b/TAO/tao/PortableServer/Non_Servant_Upcall.inl
new file mode 100644
index 00000000000..ae80a514ca9
--- /dev/null
+++ b/TAO/tao/PortableServer/Non_Servant_Upcall.inl
@@ -0,0 +1,16 @@
+// -*- C++ -*-
+//
+// $Id$
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    ACE_INLINE TAO_Root_POA &
+    Non_Servant_Upcall::poa (void) const
+    {
+      return this->poa_;
+    }
+  }
+}
+
diff --git a/TAO/tao/PortableServer/ORT_Adapter.h b/TAO/tao/PortableServer/ORT_Adapter.h
index cd2b8bae0f7..9191635a4b6 100644
--- a/TAO/tao/PortableServer/ORT_Adapter.h
+++ b/TAO/tao/PortableServer/ORT_Adapter.h
@@ -26,9 +26,6 @@
 #include "ace/Array_Base.h"
 #include "tao/PI_ForwardC.h"
 
-
-class TAO_POA;
-
 namespace CORBA
 {
   class Object;
@@ -89,16 +86,17 @@ namespace TAO
     virtual void release (
       PortableInterceptor::ObjectReferenceTemplate * t) = 0;
 
-
-    // @@ Johnny, we won't be needing the exception specification
-    //    below for long.  Once bug 1852 is fixed, we can the
-    //    exception specification and the "tao/SystemException.h"
-    //    include above.
     /**
      * @name PortableInterceptor::ObjectReferenceFactory Methods
      *
      * Methods required by the
      * PortableInterceptor::ObjectReferenceFactory ValueType.
+     *
+     * @todo
+     * @@ Johnny, we won't be needing the exception specification
+     * below for long.  Once bug 1852 is fixed, we can the
+     * exception specification and the "tao/SystemException.h"
+     * include above.
      */
     //@{
     virtual CORBA::Object_ptr make_object (
@@ -108,7 +106,7 @@ namespace TAO
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  //@}
+    //@}
   };
 
  typedef
diff --git a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp b/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp
index 6a2b21f769d..883afbec490 100644
--- a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp
+++ b/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/PortableServer/ORT_Adapter_Factory.h"
+#include "ORT_Adapter_Factory.h"
 #include "ace/Dynamic_Service.h"
 
 ACE_RCSID (PortableServer,
diff --git a/TAO/tao/PortableServer/ORT_Adapter_Factory.h b/TAO/tao/PortableServer/ORT_Adapter_Factory.h
index 65fd37eb7bb..cfa353492e0 100644
--- a/TAO/tao/PortableServer/ORT_Adapter_Factory.h
+++ b/TAO/tao/PortableServer/ORT_Adapter_Factory.h
@@ -15,15 +15,14 @@
 #define TAO_ORT_ADAPTER_FACTORY_H
 
 #include /**/ "ace/pre.h"
-#include "ace/Service_Object.h"
+
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/SystemException.h"
-
-#include "portableserver_export.h"
+#include "ace/Service_Object.h"
 
 namespace TAO
 {
@@ -48,19 +47,10 @@ namespace TAO
   public:
     virtual ~ORT_Adapter_Factory (void);
 
-    // @@ Johnny, is there need to specify an exception specification
-    //    containing CORBA::SystemException for this method?  Removing
-    //    it would allow us to avoid including "tao/SystemException.h"
-    //    above.
-    virtual TAO::ORT_Adapter * create (
-        ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+    /// Create a new adapter, in case not possible to allocate, returns 0
+    virtual TAO::ORT_Adapter * create () = 0;
 
-    // @@ Johnny, same as above.
-    virtual void destroy (
-        TAO::ORT_Adapter * adapter
-        ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+    virtual void destroy (TAO::ORT_Adapter * adapter) = 0;
   };
 }
 
diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp
index 56c1eeed677..daac760650d 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -2,12 +2,18 @@
 
 // -- PortableServer Include --
 #include "Object_Adapter.h"
-#include "POA.h"
+#include "Non_Servant_Upcall.h"
+#include "Servant_Upcall.h"
+#include "Root_POA.h"
+#include "Regular_POA.h"
+#include "Creation_Time.h"
+#include "POA_Guard.h"
 #include "ServerRequestInfo.h"
 #include "Default_Servant_Dispatcher.h"
 #include "ServerInterceptorAdapter.h"
-#include "PortableServer_ORBInitializer.h"
 #include "Collocated_Object_Proxy_Broker.h"
+#include "POAManager.h"
+#include "Servant_Base.h"
 
 // -- ACE Include --
 #include "ace/Auto_Ptr.h"
@@ -27,18 +33,26 @@
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/Protocols_Hooks.h"
 
+#include "Policy_Creator_T.h"
+
 #if !defined (__ACE_INLINE__)
 # include "Object_Adapter.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/OS_NS_string.h"
 
+#include "ThreadPolicy.h"
+#include "LifespanPolicy.h"
+#include "IdAssignmentPolicy.h"
+#include "IdUniquenessPolicy.h"
+#include "ImplicitActivationPolicy.h"
+#include "RequestProcessingPolicy.h"
+#include "ServantRetentionPolicy.h"
 
 ACE_RCSID (PortableServer,
            Object_Adapter,
            "$Id$")
 
-
 // Timeprobes class
 #include "tao/Timeprobe.h"
 
@@ -110,7 +124,7 @@ TAO_Object_Adapter::set_transient_poa_name_size (const TAO_Server_Strategy_Facto
         case TAO_ACTIVE_DEMUX:
         default:
           TAO_Object_Adapter::transient_poa_name_size_ =
-            ACE_static_cast (CORBA::ULong,
+            static_cast <CORBA::ULong>(
                              ACE_Active_Map_Manager_Key::size ());
           break;
         }
@@ -220,46 +234,45 @@ TAO_Object_Adapter::init_default_policies (TAO_POA_Policy_Set &policies
                                            ACE_ENV_ARG_DECL)
 {
   // Initialize the default policies.
-
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  // Thread policy.
-  TAO_Thread_Policy thread_policy (PortableServer::ORB_CTRL_MODEL);
+  TAO::Portable_Server::ThreadPolicy thread_policy (PortableServer::ORB_CTRL_MODEL);
   policies.merge_policy (&thread_policy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   // Lifespan policy.
-  TAO_Lifespan_Policy lifespan_policy (PortableServer::TRANSIENT);
+  TAO::Portable_Server::LifespanPolicy lifespan_policy (PortableServer::TRANSIENT);
   policies.merge_policy (&lifespan_policy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // ID uniqueness policy.
-  TAO_Id_Uniqueness_Policy id_uniqueness_policy (PortableServer::UNIQUE_ID);
+  TAO::Portable_Server::IdUniquenessPolicy id_uniqueness_policy (PortableServer::UNIQUE_ID);
   policies.merge_policy (&id_uniqueness_policy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // ID assignment policy.
-  TAO_Id_Assignment_Policy id_assignment_policy (PortableServer::SYSTEM_ID);
+  TAO::Portable_Server::IdAssignmentPolicy id_assignment_policy (PortableServer::SYSTEM_ID);
   policies.merge_policy (&id_assignment_policy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
 #if (TAO_HAS_MINIMUM_POA == 0)
   // Implicit activation policy.
-  TAO_Implicit_Activation_Policy implicit_activation_policy
-                           (PortableServer::NO_IMPLICIT_ACTIVATION);
+  TAO::Portable_Server::ImplicitActivationPolicy implicit_activation_policy
+    (PortableServer::NO_IMPLICIT_ACTIVATION);
   policies.merge_policy (&implicit_activation_policy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Servant retention policy.
-  TAO_Servant_Retention_Policy servant_retention_policy (PortableServer::RETAIN);
+  TAO::Portable_Server::ServantRetentionPolicy servant_retention_policy
+    (PortableServer::RETAIN);
   policies.merge_policy (&servant_retention_policy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Request processing policy.
-  TAO_Request_Processing_Policy request_processing_policy
-                            (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY);
+  TAO::Portable_Server::RequestProcessingPolicy request_processing_policy
+    (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY);
   policies.merge_policy (&request_processing_policy ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
@@ -311,7 +324,7 @@ TAO_Object_Adapter::dispatch_servant (const TAO::ObjectKey &key,
 
   // This object is magical, i.e., it has a non-trivial constructor
   // and destructor.
-  Servant_Upcall servant_upcall (&this->orb_core_);
+  TAO::Portable_Server::Servant_Upcall servant_upcall (&this->orb_core_);
 
   // Set up state in the POA et al (including the POA Current), so
   // that we know that this servant is currently in an upcall.
@@ -347,21 +360,21 @@ TAO_Object_Adapter::dispatch_servant (const TAO::ObjectKey &key,
 void
 TAO_Object_Adapter::locate_poa (const TAO::ObjectKey &key,
                                 PortableServer::ObjectId &system_id,
-                                TAO_POA *&poa
+                                TAO_Root_POA *&poa
                                 ACE_ENV_ARG_DECL)
 {
   TAO_Object_Adapter::poa_name poa_system_name;
   CORBA::Boolean is_root = 0;
   CORBA::Boolean is_persistent = 0;
   CORBA::Boolean is_system_id = 0;
-  TAO_Temporary_Creation_Time poa_creation_time;
+  TAO::Portable_Server::Temporary_Creation_Time poa_creation_time;
 
   int result = 0;
 
   {
     ACE_FUNCTION_TIMEPROBE (TAO_POA_PARSE_KEY_START);
 
-    result = TAO_POA::parse_key (key,
+    result = TAO_Root_POA::parse_key (key,
                                  poa_system_name,
                                  system_id,
                                  is_root,
@@ -391,7 +404,7 @@ TAO_Object_Adapter::locate_poa (const TAO::ObjectKey &key,
 
 int
 TAO_Object_Adapter::activate_poa (const poa_name &folded_name,
-                                  TAO_POA *&poa
+                                  TAO_Root_POA *&poa
                                   ACE_ENV_ARG_DECL)
 {
   int result = -1;
@@ -402,7 +415,7 @@ TAO_Object_Adapter::activate_poa (const poa_name &folded_name,
   iteratable_poa_name::iterator iterator = ipn.begin ();
   iteratable_poa_name::iterator end = ipn.end ();
 
-  TAO_POA *parent = this->root_;
+  TAO_Root_POA *parent = this->root_;
   if (parent == 0 || parent->name () != *iterator)
     ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
                       -1);
@@ -413,7 +426,7 @@ TAO_Object_Adapter::activate_poa (const poa_name &folded_name,
        iterator != end;
        ++iterator)
     {
-      TAO_POA *current = 0;
+      TAO_Root_POA *current = 0;
 
       ACE_TRY
         {
@@ -446,8 +459,8 @@ TAO_Object_Adapter::activate_poa (const poa_name &folded_name,
 int
 TAO_Object_Adapter::find_transient_poa (const poa_name &system_name,
                                         CORBA::Boolean root,
-                                        const TAO_Temporary_Creation_Time &poa_creation_time,
-                                        TAO_POA *&poa
+                                        const TAO::Portable_Server::Temporary_Creation_Time &poa_creation_time,
+                                        TAO_Root_POA *&poa
                                         ACE_ENV_ARG_DECL_NOT_USED)
 {
   int result = 0;
@@ -463,7 +476,7 @@ TAO_Object_Adapter::find_transient_poa (const poa_name &system_name,
     }
 
   if (poa == 0
-      || (result == 0 && poa->creation_time () != poa_creation_time))
+      || (result == 0 && !poa->validate_lifespan (false, poa_creation_time)))
     result = -1;
 
   return result;
@@ -471,7 +484,7 @@ TAO_Object_Adapter::find_transient_poa (const poa_name &system_name,
 
 int
 TAO_Object_Adapter::bind_poa (const poa_name &folded_name,
-                              TAO_POA *poa,
+                              TAO_Root_POA *poa,
                               poa_name_out system_name)
 {
   if (poa->persistent ())
@@ -484,7 +497,7 @@ TAO_Object_Adapter::bind_poa (const poa_name &folded_name,
 }
 
 int
-TAO_Object_Adapter::unbind_poa (TAO_POA *poa,
+TAO_Object_Adapter::unbind_poa (TAO_Root_POA *poa,
                                 const poa_name &folded_name,
                                 const poa_name &system_name)
 {
@@ -499,8 +512,10 @@ int
 TAO_Object_Adapter::locate_servant_i (const TAO::ObjectKey &key
                                       ACE_ENV_ARG_DECL)
 {
+  ACE_FUNCTION_TIMEPROBE (TAO_POA_LOCATE_SERVANT_START);
+
   PortableServer::ObjectId id;
-  TAO_POA *poa = 0;
+  TAO_Root_POA *poa = 0;
 
   this->locate_poa (key,
                     id,
@@ -536,7 +551,7 @@ TAO_Object_Adapter::find_servant_i (const TAO::ObjectKey &key,
                                     ACE_ENV_ARG_DECL)
 {
   PortableServer::ObjectId id;
-  TAO_POA *poa = 0;
+  TAO_Root_POA *poa = 0;
 
   this->locate_poa (key,
                     id,
@@ -589,11 +604,11 @@ TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL)
   // takes a const reference and makes its own copy of the
   // policy.  (Otherwise, we'd have to allocate the policy
   // on the heap.)
-  TAO_Implicit_Activation_Policy
-    implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION);
-
-  policies.merge_policy (&implicit_activation_policy
-                         ACE_ENV_ARG_PARAMETER);
+  // Implicit activation policy.
+  TAO::Portable_Server::ImplicitActivationPolicy implicit_activation_policy
+    (PortableServer::IMPLICIT_ACTIVATION);
+  policies.merge_policy (&implicit_activation_policy ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   // Merge policies from the ORB level.
@@ -613,17 +628,16 @@ TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   // Construct a new POA
-  TAO_POA::String root_poa_name (TAO_DEFAULT_ROOTPOA_NAME);
+  TAO_Root_POA::String root_poa_name (TAO_DEFAULT_ROOTPOA_NAME);
   this->root_ =
-    this->servant_dispatcher_->create_POA (root_poa_name,
-                                           *poa_manager,
-                                           policies,
-                                           0,
-                                           this->lock (),
-                                           this->thread_lock (),
-                                           this->orb_core_,
-                                           this
-                                           ACE_ENV_ARG_PARAMETER);
+    this->servant_dispatcher_->create_Root_POA (root_poa_name,
+                                                *poa_manager,
+                                                policies,
+                                                this->lock (),
+                                                this->thread_lock (),
+                                                this->orb_core_,
+                                                this
+                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // The Object_Adapter will keep a reference to the Root POA so that
@@ -632,7 +646,7 @@ TAO_Object_Adapter::open (ACE_ENV_SINGLE_ARG_DECL)
   this->root_->_add_ref ();
 
   // Lock access for the duration of this transaction.
-  TAO_POA_Guard poa_guard (*this->root_ ACE_ENV_ARG_PARAMETER);
+  TAO::Portable_Server::POA_Guard poa_guard (*this->root_ ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Iterate over the registered IOR interceptors so that they may be
@@ -663,7 +677,7 @@ TAO_Object_Adapter::close (int wait_for_completion
   // etherealizations have finished and root POA has been destroyed
   // (implying that all descendent POAs have also been destroyed).
 
-  TAO_POA *root;
+  TAO_Root_POA *root = 0;
   {
     ACE_GUARD (ACE_Lock, ace_mon, this->lock ());
     if (this->root_ == 0)
@@ -683,7 +697,7 @@ void
 TAO_Object_Adapter::check_close (int wait_for_completion
                                  ACE_ENV_ARG_DECL)
 {
-  TAO_POA::check_for_valid_wait_for_completions (this->orb_core (),
+  TAO_Root_POA::check_for_valid_wait_for_completions (this->orb_core (),
                                                  wait_for_completion
                                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -703,8 +717,8 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key,
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::memcmp (key.get_buffer (),
-                      &TAO_POA::objectkey_prefix[0],
-                      TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE) != 0)
+                      &TAO_Root_POA::objectkey_prefix[0],
+                      TAO_Root_POA::TAO_OBJECTKEY_PREFIX_SIZE) != 0)
     {
       return TAO_Adapter::DS_MISMATCHED_KEY;
     }
@@ -872,8 +886,8 @@ TAO_Object_Adapter::get_collocated_servant (const TAO_MProfile &mp)
       TAO::ObjectKey_var objkey = profile->_key ();
 
       if (ACE_OS::memcmp (objkey->get_buffer (),
-                          &TAO_POA::objectkey_prefix[0],
-                          TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE) != 0)
+                          &TAO_Root_POA::objectkey_prefix[0],
+                          TAO_Root_POA::TAO_OBJECTKEY_PREFIX_SIZE) != 0)
         continue;
 
       TAO_ServantBase *servant = 0;
@@ -921,7 +935,7 @@ TAO_Object_Adapter::Active_Hint_Strategy::~Active_Hint_Strategy (void)
 int
 TAO_Object_Adapter::Active_Hint_Strategy::find_persistent_poa (
   const poa_name &system_name,
-  TAO_POA *&poa
+  TAO_Root_POA *&poa
   ACE_ENV_ARG_DECL)
 {
   poa_name folded_name;
@@ -955,7 +969,7 @@ TAO_Object_Adapter::Active_Hint_Strategy::find_persistent_poa (
 int
 TAO_Object_Adapter::Active_Hint_Strategy::bind_persistent_poa (
   const poa_name &folded_name,
-  TAO_POA *poa,
+  TAO_Root_POA *poa,
   poa_name_out system_name)
 {
   poa_name name = folded_name;
@@ -1000,7 +1014,7 @@ TAO_Object_Adapter::No_Hint_Strategy::~No_Hint_Strategy (void)
 int
 TAO_Object_Adapter::No_Hint_Strategy::find_persistent_poa (
   const poa_name &system_name,
-  TAO_POA *&poa
+  TAO_Root_POA *&poa
   ACE_ENV_ARG_DECL)
 {
   int result =
@@ -1021,7 +1035,7 @@ TAO_Object_Adapter::No_Hint_Strategy::find_persistent_poa (
 int
 TAO_Object_Adapter::No_Hint_Strategy::bind_persistent_poa (
   const poa_name &folded_name,
-  TAO_POA *poa,
+  TAO_Root_POA *poa,
   poa_name_out system_name)
 {
   int result =
@@ -1076,15 +1090,15 @@ TAO_Object_Adapter::poa_name_iterator::operator* () const
 {
   CORBA::ULong start_at =
     this->last_separator_ +
-    TAO_POA::name_separator_length ();
+    TAO_Root_POA::name_separator_length ();
 
   CORBA::ULong how_many =
     this->position_
     - this->last_separator_
-    - TAO_POA::name_separator_length ();
+    - TAO_Root_POA::name_separator_length ();
 
-  return ACE_CString (ACE_reinterpret_cast (const char *,
-                                            &this->folded_buffer_[start_at]),
+  return ACE_CString (reinterpret_cast <const char *>
+                                       (&this->folded_buffer_[start_at]),
                       how_many);
 }
 
@@ -1098,7 +1112,7 @@ TAO_Object_Adapter::poa_name_iterator::operator++ (void)
       ++this->position_;
       if (this->position_ < this->size_)
         {
-          if (this->folded_buffer_[this->position_] == TAO_POA::name_separator ())
+          if (this->folded_buffer_[this->position_] == TAO_Root_POA::name_separator ())
             break;
         }
       else
@@ -1130,385 +1144,6 @@ TAO_Object_Adapter::iteratable_poa_name::end (void) const
                    this->folded_name_.get_buffer ());
 }
 
-TAO_Object_Adapter::Non_Servant_Upcall::Non_Servant_Upcall (TAO_POA &poa)
-  : object_adapter_ (poa.object_adapter ()),
-    poa_ (poa),
-    previous_ (0)
-{
-  // Check if this is a nested non_servant_upcall.
-  if (this->object_adapter_.non_servant_upcall_nesting_level_ != 0)
-    {
-      // Remember previous instance of non_servant_upcall.
-      this->previous_ = this->object_adapter_.non_servant_upcall_in_progress_;
-
-      // Assert that the thread is the same as the one before.
-      ACE_ASSERT (ACE_OS::thr_equal (this->object_adapter_.non_servant_upcall_thread_,
-                                     ACE_OS::thr_self ()));
-    }
-
-  // Remember which thread is calling the adapter activators.
-  this->object_adapter_.non_servant_upcall_thread_ = ACE_OS::thr_self ();
-
-  // Mark the fact that a non-servant upcall is in progress.
-  this->object_adapter_.non_servant_upcall_in_progress_ = this;
-
-  // Adjust the nesting level.
-  this->object_adapter_.non_servant_upcall_nesting_level_++;
-
-  // We always release
-  this->object_adapter_.lock ().release ();
-}
-
-TAO_Object_Adapter::Non_Servant_Upcall::~Non_Servant_Upcall (void)
-{
-  // Reacquire the Object Adapter lock.
-  this->object_adapter_.lock ().acquire ();
-
-  this->object_adapter_.non_servant_upcall_nesting_level_--;
-
-  // We are done with this nested upcall.
-  this->object_adapter_.non_servant_upcall_in_progress_ = this->previous_;
-
-  // If we are at the outer nested upcall.
-  if (this->object_adapter_.non_servant_upcall_nesting_level_ == 0)
-    {
-      // Reset thread id.
-      this->object_adapter_.non_servant_upcall_thread_ =
-        ACE_OS::NULL_thread;
-
-      // Check if all pending requests are over.
-      if (this->poa_.waiting_destruction () &&
-          this->poa_.outstanding_requests () == 0)
-        {
-          ACE_TRY_NEW_ENV
-            {
-              this->poa_.complete_destruction_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-            }
-          ACE_CATCHANY
-            {
-              // Ignore exceptions
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                   "TAO_POA::complete_destruction_i");
-            }
-          ACE_ENDTRY;
-        }
-
-      // If locking is enabled.
-      if (this->object_adapter_.enable_locking_)
-        // Wakeup all waiting threads.
-        this->object_adapter_.non_servant_upcall_condition_.broadcast ();
-    }
-}
-
-TAO_Object_Adapter::Servant_Upcall::Servant_Upcall (TAO_ORB_Core *oc)
-  : object_adapter_ (0),
-    poa_ (0),
-    servant_ (0),
-    state_ (INITIAL_STAGE),
-    system_id_ (),
-    user_id_ (0),
-    current_context_ (),
-#if (TAO_HAS_MINIMUM_POA == 0)
-    cookie_ (0),
-    operation_ (0),
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-    active_object_map_entry_ (0),
-    using_servant_locator_ (0)
-{
-  TAO_Adapter *adapter = oc->poa_adapter ();
-  TAO_Object_Adapter *object_adapter =
-    ACE_dynamic_cast(TAO_Object_Adapter *, adapter);
-  this->object_adapter_ = object_adapter;
-}
-
-int
-TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall (
-  const TAO::ObjectKey &key,
-  const char *operation,
-  CORBA::Object_out forward_to
-  ACE_ENV_ARG_DECL)
-{
-  while (1)
-    {
-      int wait_occurred_restart_call = 0;
-
-      int result =
-        this->prepare_for_upcall_i (key,
-                                    operation,
-                                    forward_to,
-                                    wait_occurred_restart_call
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
-
-      if (result == TAO_Adapter::DS_FAILED &&
-          wait_occurred_restart_call)
-        {
-          // We ended up waiting on a condition variable.  The POA
-          // state may have changed while we are waiting.  Therefore,
-          // we need to call prepare_for_upcall_i() again.  We also
-          // need to cleanup the state of the upcall object before
-          // continuing.
-          this->upcall_cleanup ();
-          continue;
-        }
-      else
-        {
-          return result;
-        }
-    }
-}
-
-int
-TAO_Object_Adapter::Servant_Upcall::prepare_for_upcall_i (
-  const TAO::ObjectKey &key,
-  const char *operation,
-  CORBA::Object_out forward_to,
-  int &wait_occurred_restart_call
-  ACE_ENV_ARG_DECL)
-{
-  // Acquire the object adapter lock first.
-  int result = this->object_adapter_->lock ().acquire ();
-  if (result == -1)
-    // Locking error.
-    ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                      TAO_Adapter::DS_FAILED);
-
-  // We have acquired the object adapater lock.  Record this for later
-  // use.
-  this->state_ = OBJECT_ADAPTER_LOCK_ACQUIRED;
-
-  // Check if a non-servant upcall is in progress.  If a non-servant
-  // upcall is in progress, wait for it to complete.  Unless of
-  // course, the thread making the non-servant upcall is this thread.
-  this->object_adapter_->wait_for_non_servant_upcalls_to_complete (
-    ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
-
-  // Locate the POA.
-  this->object_adapter_->locate_poa (key,
-                                     this->system_id_,
-                                     this->poa_
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
-
-  // Check the state of the POA Manager.
-  this->poa_->check_poa_manager_state (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
-
-  // Setup current for this request.
-  this->current_context_.setup (this->poa_,
-                                key);
-
-  // Increase <poa->outstanding_requests_> for the duration of finding
-  // the POA, finding the servant, and making the upcall.
-  this->poa_->increment_outstanding_requests ();
-
-  // We have setup the POA Current.  Record this for later use.
-  this->state_ = POA_CURRENT_SETUP;
-
-  ACE_TRY
-    {
-      ACE_FUNCTION_TIMEPROBE (TAO_POA_LOCATE_SERVANT_START);
-
-      // Lookup the servant.
-      this->servant_ = this->poa_->locate_servant_i (operation,
-                                                     this->system_id_,
-                                                     *this,
-                                                     this->current_context_,
-                                                     wait_occurred_restart_call
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (wait_occurred_restart_call)
-        {
-          return TAO_Adapter::DS_FAILED;
-        }
-    }
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-  ACE_CATCH (PortableServer::ForwardRequest, forward_request)
-    {
-      forward_to =
-        CORBA::Object::_duplicate (forward_request.forward_reference.in ());
-      return TAO_Adapter::DS_FORWARD;
-    }
-#else
-  ACE_CATCHANY
-    {
-      ACE_UNUSED_ARG (forward_to);
-      ACE_RE_THROW;
-    }
-#endif /* TAO_HAS_MINIMUM_CORBA */
-  ACE_ENDTRY;
-
-  // Now that we know the servant.
-  this->current_context_.servant (this->servant_);
-
-  // For servants from Servant Locators, there is no active object map
-  // entry.
-  if (this->active_object_map_entry ())
-    this->current_context_.priority (this->active_object_map_entry ()->priority_);
-
-  if (this->state_ != OBJECT_ADAPTER_LOCK_RELEASED)
-    {
-      // Release the object adapter lock.
-      this->object_adapter_->lock ().release ();
-
-      // We have release the object adapater lock.  Record this for
-      // later use.
-      this->state_ = OBJECT_ADAPTER_LOCK_RELEASED;
-    }
-
-  // Serialize servants (if appropriate).
-  this->single_threaded_poa_setup (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
-
-  // We have acquired the servant lock.  Record this for later use.
-  this->state_ = SERVANT_LOCK_ACQUIRED;
-
-  // After this point, <this->servant_> is ready for dispatching.
-  return TAO_Adapter::DS_OK;
-}
-
-void
-TAO_Object_Adapter::Servant_Upcall::pre_invoke_remote_request (
-  TAO_ServerRequest &req
-  ACE_ENV_ARG_DECL)
-{
-  this->object_adapter_->servant_dispatcher_->pre_invoke_remote_request (
-    this->poa (),
-    this->priority (),
-    req,
-    this->pre_invoke_state_
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_Object_Adapter::Servant_Upcall::pre_invoke_collocated_request (
-  ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->object_adapter_->servant_dispatcher_->pre_invoke_collocated_request (
-    this->poa (),
-    this->priority (),
-    this->pre_invoke_state_
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_Object_Adapter::Servant_Upcall::post_invoke (void)
-{
-  this->object_adapter_->servant_dispatcher_->post_invoke (
-    this->poa (),
-    this->pre_invoke_state_);
-}
-
-TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State::Pre_Invoke_State (void)
-  : state_ (NO_ACTION_REQUIRED),
-    original_native_priority_ (0),
-    original_CORBA_priority_ (0)
-{
-}
-
-TAO_POA *
-TAO_Object_Adapter::Servant_Upcall::lookup_POA (const TAO::ObjectKey &key
-                                                ACE_ENV_ARG_DECL)
-{
-  // Acquire the object adapter lock first.
-  int result = this->object_adapter_->lock ().acquire ();
-  if (result == -1)
-    // Locking error.
-    ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                      0);
-
-  // We have acquired the object adapater lock.  Record this for later
-  // use.
-  this->state_ = OBJECT_ADAPTER_LOCK_ACQUIRED;
-
-  // Check if a non-servant upcall is in progress.  If a non-servant
-  // upcall is in progress, wait for it to complete.  Unless of
-  // course, the thread making the non-servant upcall is this thread.
-  this->object_adapter_->wait_for_non_servant_upcalls_to_complete (
-    ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // Locate the POA.
-  this->object_adapter_->locate_poa (key,
-                                     this->system_id_,
-                                     this->poa_
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return this->poa_;
-}
-
-TAO_Object_Adapter::Servant_Upcall::~Servant_Upcall (void)
-{
-  this->upcall_cleanup ();
-}
-
-void
-TAO_Object_Adapter::Servant_Upcall::upcall_cleanup (void)
-{
-  this->post_invoke ();
-
-  switch (this->state_)
-    {
-    case SERVANT_LOCK_ACQUIRED:
-      // Unlock servant (if appropriate).
-      this->single_threaded_poa_cleanup ();
-
-      /* FALLTHRU */
-
-    case OBJECT_ADAPTER_LOCK_RELEASED:
-      // Cleanup servant locator related state.  Note that because
-      // this operation does not change any Object Adapter related
-      // state, it is ok to call it outside the lock.
-      this->servant_locator_cleanup ();
-
-      // Since the object adapter lock was released, we must acquire
-      // it.
-      //
-      // Note that errors are ignored here since we cannot do much
-      // with it.
-      this->object_adapter_->lock ().acquire ();
-
-      // Check if a non-servant upcall is in progress.  If a
-      // non-servant upcall is in progress, wait for it to complete.
-      // Unless of course, the thread making the non-servant upcall is
-      // this thread.
-      this->object_adapter_->wait_for_non_servant_upcalls_to_complete ();
-
-      // Cleanup servant related state.
-      this->servant_cleanup ();
-
-      /* FALLTHRU */
-
-    case POA_CURRENT_SETUP:
-      // Cleanup POA related state.
-      this->poa_cleanup ();
-
-      // Teardown current for this request.
-      this->current_context_.teardown ();
-
-      /* FALLTHRU */
-
-    case OBJECT_ADAPTER_LOCK_ACQUIRED:
-      // Finally, since the object adapter lock was acquired, we must
-      // release it.
-      this->object_adapter_->lock ().release ();
-
-      /* FALLTHRU */
-
-    case INITIAL_STAGE:
-    default:
-      // @@ Keep compiler happy, the states above are the only
-      //    possible ones.
-      break;
-    }
-}
-
 void
 TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete (CORBA::Environment &ACE_TRY_ENV)
 {
@@ -1551,148 +1186,6 @@ TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete (void)
 }
 
 void
-TAO_Object_Adapter::Servant_Upcall::servant_locator_cleanup (void)
-{
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  if (this->using_servant_locator_)
-    {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      ACE_TRY
-        {
-          this->poa_->servant_locator_->postinvoke (this->current_context_.object_id (),
-                                                    this->poa_,
-                                                    this->operation_,
-                                                    this->cookie_,
-                                                    this->servant_
-                                                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          // Ignore errors from servant locator ....
-        }
-      ACE_ENDTRY;
-    }
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-}
-
-void
-TAO_Object_Adapter::Servant_Upcall::single_threaded_poa_setup (ACE_ENV_SINGLE_ARG_DECL)
-{
-#if (TAO_HAS_MINIMUM_POA == 0)
-  // Serialize servants (if necessary).
-  //
-  // Note that this lock must be acquired *after* the object adapter
-  // lock has been released.  This is necessary since we cannot block
-  // waiting for the servant lock while holding the object adapter
-  // lock.  Otherwise, the thread that wants to release this lock will
-  // not be able to do so since it can't acquire the object adapterx
-  // lock.
-  if (this->poa_->thread_policy () == PortableServer::SINGLE_THREAD_MODEL)
-    {
-      int result = this->poa_->single_threaded_lock ().acquire ();
-
-      if (result == -1)
-        // Locking error.
-        ACE_THROW (CORBA::OBJ_ADAPTER ());
-    }
-#else
-  ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
-#endif /* !TAO_HAS_MINIMUM_POA == 0 */
-}
-
-void
-TAO_Object_Adapter::Servant_Upcall::single_threaded_poa_cleanup (void)
-{
-#if (TAO_HAS_MINIMUM_POA == 0)
-  // Since the servant lock was acquired, we must release it.
-  if (this->poa_->thread_policy () == PortableServer::SINGLE_THREAD_MODEL)
-    this->poa_->single_threaded_lock ().release ();
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-}
-
-void
-TAO_Object_Adapter::Servant_Upcall::servant_cleanup (void)
-{
-  // Cleanup servant related stuff.
-  if (this->active_object_map_entry_ != 0)
-    {
-      // Decrement the reference count.
-      CORBA::UShort new_count = --this->active_object_map_entry_->reference_count_;
-
-      if (new_count == 0)
-        {
-          ACE_DECLARE_NEW_CORBA_ENV;
-          ACE_TRY
-            {
-              this->poa_->cleanup_servant (this->active_object_map_entry_
-                                           ACE_ENV_ARG_PARAMETER);
-
-              ACE_TRY_CHECK;
-            }
-          ACE_CATCHALL
-            {
-              // Ignore errors from servant cleanup ....
-            }
-          ACE_ENDTRY;
-
-          if (this->poa_->waiting_servant_deactivation_ > 0 &&
-              this->object_adapter_->enable_locking_)
-            {
-              // Wakeup all waiting threads.
-              this->poa_->servant_deactivation_condition_.broadcast ();
-            }
-        }
-    }
-}
-
-void
-TAO_Object_Adapter::Servant_Upcall::poa_cleanup (void)
-{
-  // Decrease <poa->outstanding_requests_> now that the upcall
-  // is complete.
-  //
-  // Note that the object adapter lock is acquired before
-  // <POA::outstanding_requests_> is decreased.
-  CORBA::ULong outstanding_requests =
-    this->poa_->decrement_outstanding_requests ();
-
-  // Check if all pending requests are over.
-  if (outstanding_requests == 0)
-    {
-      // If locking is enabled and some thread is waiting in POA::destroy.
-      if (this->object_adapter_->enable_locking_ &&
-          this->poa_->wait_for_completion_pending_)
-        {
-          // Wakeup all waiting threads.
-          this->poa_->outstanding_requests_condition_.broadcast ();
-        }
-
-      // Note that there is no need to check for
-      // <non_servant_upcall_in_progress> since it is not possible for
-      // non-servant upcalls to be in progress at this point.
-      if (this->poa_->waiting_destruction_)
-        {
-          ACE_TRY_NEW_ENV
-            {
-              this->poa_->complete_destruction_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-            }
-          ACE_CATCHANY
-            {
-              // Ignore exceptions
-              ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_POA::~complete_destruction_i");
-            }
-          ACE_ENDTRY;
-
-          this->poa_ = 0;
-        }
-    }
-}
-
-void
 TAO_Object_Adapter::servant_dispatcher (TAO_Servant_Dispatcher *dispatcher)
 {
   if (this->servant_dispatcher_)
@@ -1701,133 +1194,11 @@ TAO_Object_Adapter::servant_dispatcher (TAO_Servant_Dispatcher *dispatcher)
   this->servant_dispatcher_ = dispatcher;
 }
 
-TAO_POA_Current_Impl::TAO_POA_Current_Impl (void)
-  : poa_ (0),
-    object_id_ (),
-    object_key_ (0),
-    servant_ (0),
-    priority_ (TAO_INVALID_PRIORITY),
-    previous_current_impl_ (0),
-    setup_done_ (0)
-{
-}
-
-void
-TAO_POA_Current_Impl::setup (TAO_POA *p,
-                             const TAO::ObjectKey &key)
-{
-  // Remember information about this upcall.
-  this->poa_ = p;
-  this->object_key_ = &key;
-
-  // Set the current context and remember the old one.
-  this->tss_resources_ = TAO_TSS_RESOURCES::instance ();
-
-  this->previous_current_impl_ =
-    ACE_static_cast (TAO_POA_Current_Impl *,
-                     this->tss_resources_->poa_current_impl_);
-  this->tss_resources_->poa_current_impl_ = this;
-
-  // Setup is complete.
-  this->setup_done_ = 1;
-}
-
-TAO_POA_Current_Impl *
-TAO_POA_Current_Impl::previous (void) const
-{
-  return this->previous_current_impl_;
-}
-
-void
-TAO_POA_Current_Impl::teardown (void)
-{
-  if (this->setup_done_)
-    {
-      // Reset the old context.
-      this->tss_resources_->poa_current_impl_ = this->previous_current_impl_;
-    }
-}
-
-PortableServer::POA_ptr
-TAO_POA_Current_Impl::get_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::Current::NoContext))
-{
-  return PortableServer::POA::_duplicate (this->poa_);
-}
-
-PortableServer::ObjectId *
-TAO_POA_Current_Impl::get_object_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::Current::NoContext))
-{
-  PortableServer::ObjectId *objid = 0;
-
-  // Create a new one and pass it back
-  ACE_NEW_RETURN (objid,
-                  PortableServer::ObjectId (this->object_id_),
-                  0);
-  return objid;
-}
-
-TAO_ORB_Core &
-TAO_POA_Current_Impl::orb_core (void) const
-
-{
-  return this->poa_->orb_core_;
-}
-
-PortableServer::POA_ptr
-TAO_POA_Current::get_POA (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::Current::NoContext))
-{
-  TAO_POA_Current_Impl *impl = this->implementation ();
-
-  if (impl == 0)
-    ACE_THROW_RETURN (PortableServer::Current::NoContext (),
-                      0);
-  return impl->get_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-PortableServer::ObjectId *
-TAO_POA_Current::get_object_id (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::Current::NoContext))
-{
-  TAO_POA_Current_Impl *impl = this->implementation ();
-
-  if (impl == 0)
-    ACE_THROW_RETURN (PortableServer::Current::NoContext (),
-                      0);
-  return impl->get_object_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-TAO_POA_Current_Impl *
-TAO_POA_Current::implementation (void)
-{
-  return ACE_static_cast (TAO_POA_Current_Impl *,
-                          TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
-}
-
-TAO_POA_Current_Impl *
-TAO_POA_Current::implementation (TAO_POA_Current_Impl *new_current)
-{
-  TAO_TSS_Resources *tss =
-    TAO_TSS_RESOURCES::instance ();
-
-  TAO_POA_Current_Impl *old =
-    ACE_static_cast (TAO_POA_Current_Impl *,
-                     tss->poa_current_impl_);
-  tss->poa_current_impl_ = new_current;
-  return old;
-}
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 // Common typedefs.
 typedef TAO_Object_Adapter::poa_name key;
-typedef TAO_POA *value;
+typedef TAO_Root_POA *value;
 
 typedef ACE_Pair<key, value> expanded_value;
 typedef ACE_Reference_Pair<const key, value> tao_value_type;
@@ -1909,7 +1280,7 @@ template class ACE_Unbounded_Set_Iterator<TAO_POA_Manager *>;
 
 // Common typedefs.
 typedef TAO_Object_Adapter::poa_name key;
-typedef TAO_POA *value;
+typedef TAO_Root_POA *value;
 
 typedef ACE_Pair<key, value> expanded_value;
 typedef ACE_Reference_Pair<const key, value> tao_value_type;
diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h
index b6aadc05d8a..65490ac21fe 100644
--- a/TAO/tao/PortableServer/Object_Adapter.h
+++ b/TAO/tao/PortableServer/Object_Adapter.h
@@ -23,200 +23,42 @@
 
 #include "Key_Adapters.h"
 #include "poa_macros.h"
-
-// Active Object Table
-#include "Active_Object_Map.h"
+#include "Servant_Location.h"
+#include "Default_Policy_Validator.h"
+#include "POA_Policy_Set.h"
 
 #include "tao/Adapter.h"
 #include "tao/Adapter_Factory.h"
 #include "tao/Server_Strategy_Factory.h"
-
-// Local Object
 #include "tao/LocalObject.h"
 
-#include "ace/Service_Config.h"
 #include "ace/Reverse_Lock_T.h"
 #include "ace/Condition_Thread_Mutex.h"
-
-// Policy Validators
-#include "Default_Policy_Validator.h"
-
-// Policy Set
-#include "POA_Policy_Set.h"
+#include "ace/Map_T.h"
 
 #include "Servant_Location.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-// ****************************************************************
-
-// Forward declaration
-class TAO_POA;
+class TAO_Root_POA;
 class TAO_POA_Manager;
-class TAO_Temporary_Creation_Time;
-class TAO_POA_Current_Impl;
 class TAO_TSS_Resources;
 class TAO_Transport;
 class TAO_Servant_Dispatcher;
 
-class TAO_PortableServer_Export TAO_POA_Current
-  : public PortableServer::Current,
-    public TAO_Local_RefCounted_Object
+namespace TAO
 {
-public:
-  /// Constructor
-  TAO_POA_Current (void);
-
-  /**
-   * Returns the POA on which the current request is being invoked.
-   * Can raise the <CORBA::NoContext> exception if this function is
-   * not invoked in the context of an upcall.
-   */
-  PortableServer::POA_ptr get_POA (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::Current::NoContext));
-
-  /**
-   * Returns the object id of the current request being invoked.  Can
-   * raise the <CORBA::NoContext> exception if this function is not
-   * invoked in the context of an upcall.
-   */
-  PortableServer::ObjectId *get_object_id (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::Current::NoContext));
-
-  /// Returns the class that implements this interface.
-  TAO_POA_Current_Impl *implementation (void);
-
-  /// Sets the thread-specific pointer to the new POA Current state,
-  /// returning a pointer to the existing POA Current state.
-  TAO_POA_Current_Impl *implementation (TAO_POA_Current_Impl *new_current);
-};
-
-/**
- * @class TAO_POA_Current_Impl
- *
- * @brief Implementation of the PortableServer::Current object.
- *
- * Objects of this class hold state information regarding the
- * current POA invocation.  Savvy readers will notice that this
- * contains substantially more methods than the POA spec shows;
- * they exist because the ORB either (a) needs them or (b) finds
- * them useful for implementing a more efficient ORB.
- * The intent is that instances of this class are held in
- * Thread-Specific Storage so that upcalls can get context
- * information regarding their invocation.  The POA itself must
- * insure that all <set_*> operations are performed in the
- * execution thread so that the proper <TAO_POA_Current> pointer
- * is obtained from TSS.
- */
-class TAO_PortableServer_Export TAO_POA_Current_Impl
-{
-public:
-
-  friend class TAO_POA;
-
-  /// Return pointer to the invoking POA.  Raises the
-  /// <CORBA::NoContext> exception.
-  PortableServer::POA_ptr get_POA (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::Current::NoContext));
-
-  /**
-   * Return pointer to the object id through which this was invoked.
-   * This may be necessary in cases where a <Servant> is serving under
-   * the guise of multiple object ids.  This has _out semantics Raises
-   * the <CORBA::NoContext> exception.
-   */
-  PortableServer::ObjectId *get_object_id (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::Current::NoContext));
-
-  /// Set the POA implementation.
-  void poa (TAO_POA *);
-
-  /// Get the POA implemantation
-  TAO_POA *poa (void) const;
-
-  /// ORB Core for this current.
-  TAO_ORB_Core &orb_core (void) const;
-
-  /// Set the object ID.
-  void object_id (const PortableServer::ObjectId &id);
-
-  /// Get the object ID.
-  const PortableServer::ObjectId &object_id (void) const;
-
-  /// Set the object key.
-  void object_key (const TAO::ObjectKey &key);
-
-  /// Get the object key.
-  const TAO::ObjectKey &object_key (void) const;
-
-  /// Set the servant for the current upcall.
-  void servant (PortableServer::Servant servant);
-
-  /// Get the servant for the current upcall.
-  PortableServer::Servant servant (void) const;
-
-  /// Set the priority for the current upcall.
-  void priority (CORBA::Short priority);
-
-  /// Get the priority for the current upcall.
-  CORBA::Short priority (void) const;
-
-  /// Convenience constructor combining construction & initialization.
-  TAO_POA_Current_Impl (void);
-
-  /// Return the previous current implementation.
-  TAO_POA_Current_Impl *previous (void) const;
-
-  /// Teardown the current for this request.
-  void teardown (void);
-
-  /// Setup the current.
-  void setup (TAO_POA *impl,
-              const TAO::ObjectKey &key);
-
-protected:
-  /// The POA implementation invoking an upcall
-  TAO_POA *poa_;
-
-  /**
-   * The object ID of the current context.  This is the user id and
-   * not the id the goes into the IOR.  Note also that unlike the
-   * <object_key>, this field is stored by value.
-   */
-  PortableServer::ObjectId object_id_;
-
-  /// The object key of the current context.
-  const TAO::ObjectKey *object_key_;
-
-  /// The servant for the current upcall.
-  PortableServer::Servant servant_;
-
-  /// The priority for the current upcall.
-  CORBA::Short priority_;
-
-  /// void *previous_current_impl_;
-  /// Current previous from <this>.
-  TAO_POA_Current_Impl *previous_current_impl_;
-
-  /// Is setup complete?
-  int setup_done_;
-
-  /// Pointer to tss resources.
-  TAO_TSS_Resources *tss_resources_;
-
-  // = Hidden because we don't allow these
-  TAO_POA_Current_Impl (const TAO_POA_Current_Impl &);
-  void operator= (const TAO_POA_Current_Impl &);
-};
+  namespace Portable_Server
+  {
+    class Non_Servant_Upcall;
+    class Servant_Upcall;
+    class POA_Current_Impl;
+    class Temporary_Creation_Time;
+  }
+}
 
 /**
  * @class TAO_Object_Adapter
@@ -225,11 +67,12 @@ protected:
  *
  * This class will be used as a facade for the POAs in a server
  */
-class TAO_PortableServer_Export TAO_Object_Adapter : public TAO_Adapter
+class TAO_PortableServer_Export TAO_Object_Adapter
+  : public TAO_Adapter
 {
 public:
 
-  friend class TAO_POA;
+  friend class TAO_Root_POA;
 
   typedef PortableServer::ObjectId poa_name;
   typedef PortableServer::ObjectId_var poa_name_var;
@@ -257,20 +100,20 @@ public:
   int find_poa (const poa_name &system_name,
                 CORBA::Boolean activate_it,
                 CORBA::Boolean root,
-                const TAO_Temporary_Creation_Time &poa_creation_time,
-                TAO_POA *&poa
+                const TAO::Portable_Server::Temporary_Creation_Time &poa_creation_time,
+                TAO_Root_POA *&poa
                 ACE_ENV_ARG_DECL);
 
   int bind_poa (const poa_name &folded_name,
-                TAO_POA *poa,
+                TAO_Root_POA *poa,
                 poa_name_out system_name);
 
-  int unbind_poa (TAO_POA *poa,
+  int unbind_poa (TAO_Root_POA *poa,
                   const poa_name &folded_name,
                   const poa_name &system_name);
 
   int activate_poa (const poa_name &folded_name,
-                    TAO_POA *&poa
+                    TAO_Root_POA *&poa
                     ACE_ENV_ARG_DECL);
 
   ACE_Lock &lock (void);
@@ -280,7 +123,7 @@ public:
   ACE_Reverse_Lock<ACE_Lock> &reverse_lock (void);
 
   /// Access the root poa.
-  TAO_POA *root_poa (void) const;
+  TAO_Root_POA *root_poa (void) const;
 
   /// Access to ORB Core.
   TAO_ORB_Core &orb_core (void) const;
@@ -296,6 +139,8 @@ public:
   /// Return the validator.
   TAO_Policy_Validator &validator (void);
 
+  int enable_locking() const;
+
   /// Return the set of default policies.
   TAO_POA_Policy_Set &default_poa_policies (void);
 
@@ -345,24 +190,24 @@ protected:
 
   void locate_poa (const TAO::ObjectKey &key,
                    PortableServer::ObjectId &id,
-                   TAO_POA *&poa
+                   TAO_Root_POA *&poa
                    ACE_ENV_ARG_DECL);
 
   int find_transient_poa (const poa_name &system_name,
                           CORBA::Boolean root,
-                          const TAO_Temporary_Creation_Time &poa_creation_time,
-                          TAO_POA *&poa
+                          const TAO::Portable_Server::Temporary_Creation_Time &poa_creation_time,
+                          TAO_Root_POA *&poa
                           ACE_ENV_ARG_DECL);
 
   int find_persistent_poa (const poa_name &system_name,
-                           TAO_POA *&poa
+                           TAO_Root_POA *&poa
                            ACE_ENV_ARG_DECL);
 
-  int bind_transient_poa (TAO_POA *poa,
+  int bind_transient_poa (TAO_Root_POA *poa,
                           poa_name_out system_name);
 
   int bind_persistent_poa (const poa_name &folded_name,
-                           TAO_POA *poa,
+                           TAO_Root_POA *poa,
                            poa_name_out system_name);
 
   int unbind_transient_poa (const poa_name &system_name);
@@ -390,11 +235,11 @@ public:
     virtual ~Hint_Strategy (void);
 
     virtual int find_persistent_poa (const poa_name &system_name,
-                                     TAO_POA *&poa
+                                     TAO_Root_POA *&poa
                                      ACE_ENV_ARG_DECL) = 0;
 
     virtual int bind_persistent_poa (const poa_name &folded_name,
-                                     TAO_POA *poa,
+                                     TAO_Root_POA *poa,
                                      poa_name_out system_name) = 0;
 
     virtual int unbind_persistent_poa (const poa_name &folded_name,
@@ -425,11 +270,11 @@ public:
     virtual ~Active_Hint_Strategy (void);
 
     virtual int find_persistent_poa (const poa_name &system_name,
-                                     TAO_POA *&poa
+                                     TAO_Root_POA *&poa
                                      ACE_ENV_ARG_DECL);
 
     virtual int bind_persistent_poa (const poa_name &folded_name,
-                                     TAO_POA *poa,
+                                     TAO_Root_POA *poa,
                                      poa_name_out system_name);
 
     virtual int unbind_persistent_poa (const poa_name &folded_name,
@@ -439,12 +284,14 @@ public:
 
     typedef ACE_Active_Map_Manager_Adapter<
     poa_name,
-      TAO_POA *,
+      TAO_Root_POA *,
       TAO_Preserve_Original_Key_Adapter> persistent_poa_system_map;
 
     persistent_poa_system_map persistent_poa_system_map_;
   };
 
+  friend class Active_Hint_Strategy;
+
   /**
    * @class No_Hint_Strategy
    *
@@ -461,11 +308,11 @@ public:
     virtual ~No_Hint_Strategy (void);
 
     virtual int find_persistent_poa (const poa_name &system_name,
-                                     TAO_POA *&poa
+                                     TAO_Root_POA *&poa
                                      ACE_ENV_ARG_DECL);
 
     virtual int bind_persistent_poa (const poa_name &folded_name,
-                                     TAO_POA *poa,
+                                     TAO_Root_POA *poa,
                                      poa_name_out system_name);
 
     virtual int unbind_persistent_poa (const poa_name &folded_name,
@@ -473,6 +320,8 @@ public:
 
   };
 
+  friend class No_Hint_Strategy;
+
 protected:
 
   Hint_Strategy *hint_strategy_;
@@ -480,13 +329,13 @@ protected:
   /// Base class of the id map.
   typedef ACE_Map<
   poa_name,
-    TAO_POA *> transient_poa_map;
+    TAO_Root_POA *> transient_poa_map;
 
 #if (TAO_HAS_MINIMUM_POA_MAPS == 0)
   /// Id hash map.
   typedef ACE_Hash_Map_Manager_Ex_Adapter<
   poa_name,
-    TAO_POA *,
+    TAO_Root_POA *,
     TAO_ObjectId_Hash,
     ACE_Equal_To<poa_name>,
     TAO_Incremental_Key_Generator> transient_poa_hash_map;
@@ -496,25 +345,25 @@ protected:
   /// Id linear map.
   typedef ACE_Map_Manager_Adapter<
   poa_name,
-    TAO_POA *,
+    TAO_Root_POA *,
     TAO_Incremental_Key_Generator> transient_poa_linear_map;
 #endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */
 
   /// Id active map.
   typedef ACE_Active_Map_Manager_Adapter<
   poa_name,
-    TAO_POA *,
+    TAO_Root_POA *,
     TAO_Ignore_Original_Key_Adapter> transient_poa_active_map;
 
   /// Base class of the name map.
   typedef ACE_Map<
   poa_name,
-    TAO_POA *> persistent_poa_name_map;
+    TAO_Root_POA *> persistent_poa_name_map;
 
   /// Id hash map.
   typedef ACE_Hash_Map_Manager_Ex_Adapter<
   poa_name,
-    TAO_POA *,
+    TAO_Root_POA *,
     TAO_ObjectId_Hash,
     ACE_Equal_To<PortableServer::ObjectId>,
     ACE_Noop_Key_Generator<poa_name> > persistent_poa_name_hash_map;
@@ -523,16 +372,17 @@ protected:
   /// Id linear map.
   typedef ACE_Map_Manager_Adapter<
   poa_name,
-    TAO_POA *,
+    TAO_Root_POA *,
     ACE_Noop_Key_Generator<poa_name> > persistent_poa_name_linear_map;
 #endif /* TAO_HAS_MINIMUM_POA_MAPS == 0 */
 
   /// Strategy for dispatching a request to a servant.
   TAO_Servant_Dispatcher *servant_dispatcher_;
 
-public:
-
+  /// Persistent POA map
   persistent_poa_name_map *persistent_poa_name_map_;
+
+  /// Transient POA map
   transient_poa_map *transient_poa_map_;
 
 protected:
@@ -606,235 +456,15 @@ public:
     const poa_name &folded_name_;
   };
 
-  /**
-   * @class Non_Servant_Upcall
-   *
-   * @brief This class helps us with a recursive thread lock without
-   * using a recursive thread lock.  Non_Servant_Upcall has a
-   * magic constructor and destructor.  We unlock the
-   * Object_Adapter lock for the duration of the non-servant
-   * (i.e., adapter activator and servant activator) upcalls;
-   * reacquiring once the upcalls complete.  Even though we are
-   * releasing the lock, other threads will not be able to make
-   * progress since
-   * <Object_Adapter::non_servant_upcall_in_progress_> has been
-   * set.
-   */
-  class TAO_PortableServer_Export Non_Servant_Upcall
-  {
-  public:
-
-    /// Constructor.
-    Non_Servant_Upcall (TAO_POA &poa);
-
-    /// Destructor.
-    ~Non_Servant_Upcall (void);
-
-    TAO_POA &poa (void) const;
-
-  protected:
-
-    TAO_Object_Adapter &object_adapter_;
-    TAO_POA &poa_;
-    Non_Servant_Upcall *previous_;
-  };
-
-  friend class Non_Servant_Upcall;
-
-  /**
-   * @class Servant_Upcall
-   *
-   * @brief This class finds out the POA and the servant to perform an
-   * upcall.  It can only be instantiated without the object
-   * adapter's lock held.
-   */
-  class TAO_PortableServer_Export Servant_Upcall
-  {
-  public:
-
-    friend class TAO_POA;
-    friend class TAO_RT_Collocation_Resolver;
-
-    /**
-     * @class Pre_Invoke_State
-     *
-     * @brief This struct keeps track of state related to pre- and
-     * post-invoke operations.
-     */
-    class Pre_Invoke_State
-    {
-    public:
-      // Constructor.
-      Pre_Invoke_State (void);
-
-      enum State
-      {
-        NO_ACTION_REQUIRED,
-        PRIORITY_RESET_REQUIRED
-      };
-
-      // Indicates whether the priority of the thread needs to be
-      // reset back to its original value.
-      State state_;
-
-      // Original native priority of the thread.
-      CORBA::Short original_native_priority_;
-
-      // Original CORBA priority of the thread.
-      CORBA::Short original_CORBA_priority_;
-    };
-
-    // @@ POA: Servant_Upcall (TAO_Object_Adapter &object_adapter);
-    /// Constructor.
-    Servant_Upcall (TAO_ORB_Core *orb_core);
-
-    /// Destructor.
-    ~Servant_Upcall (void);
-
-    /// Locate POA and servant.
-    int prepare_for_upcall (const TAO::ObjectKey &key,
-                            const char *operation,
-                            CORBA::Object_out forward_to
-                            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// Helper.
-    int prepare_for_upcall_i (const TAO::ObjectKey &key,
-                              const char *operation,
-                              CORBA::Object_out forward_to,
-                              int &wait_occurred_restart_call
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// Run pre_invoke for a remote request.
-    void pre_invoke_remote_request (TAO_ServerRequest &req
-                                    ACE_ENV_ARG_DECL);
-
-    /// Run pre_invoke for a collocated request.
-    void pre_invoke_collocated_request (ACE_ENV_SINGLE_ARG_DECL);
-
-    /// Run post_invoke for a request.
-    void post_invoke (void);
-
-    /// Locate POA.
-    TAO_POA *lookup_POA (const TAO::ObjectKey &key
-                         ACE_ENV_ARG_DECL);
-
-    /// POA accessor.
-    TAO_POA &poa (void) const;
-
-    /// Object Adapter accessor.
-    TAO_Object_Adapter &object_adapter (void) const;
-
-    /// System ID accessor.
-    const PortableServer::ObjectId &id (void) const;
-
-    /// User ID accessors.  This is the same value returned by
-    /// PortableServer::Current::get_object_id().
-    void user_id (const PortableServer::ObjectId *);
-    const PortableServer::ObjectId &user_id (void) const;
-
-    /// Servant accessor.
-    PortableServer::Servant servant (void) const;
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-    /// Get the Servant Locator's cookie
-    PortableServer::ServantLocator::Cookie locator_cookie (void) const;
-
-    /// Set the Servant Locator's cookie
-    void locator_cookie (PortableServer::ServantLocator::Cookie cookie);
+  friend class TAO::Portable_Server::Non_Servant_Upcall;
 
-    /// Get the operation name.
-    const char *operation (void) const;
-
-    /// Set the operation name.
-    void operation (const char *);
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-    /// Set the <active_object_map_entry>.
-    void active_object_map_entry (TAO_Active_Object_Map::Map_Entry *entry);
-
-    /// Get the <active_object_map_entry>.
-    TAO_Active_Object_Map::Map_Entry *active_object_map_entry (void) const;
-
-    /// We are using the servant locator for this upcall.
-    void using_servant_locator (void);
-
-    /// Get the priority for the current upcall.
-    CORBA::Short priority (void) const;
-
-    enum State
-    {
-      INITIAL_STAGE,
-      OBJECT_ADAPTER_LOCK_ACQUIRED,
-      POA_CURRENT_SETUP,
-      OBJECT_ADAPTER_LOCK_RELEASED,
-      SERVANT_LOCK_ACQUIRED
-    };
-
-    // State accessors.
-    State state (void) const;
-    void state (State);
-
-  protected:
-
-    void servant_locator_cleanup (void);
-    void single_threaded_poa_setup (ACE_ENV_SINGLE_ARG_DECL);
-    void single_threaded_poa_cleanup (void);
-    void servant_cleanup (void);
-    void poa_cleanup (void);
-
-    /// Clean-up / reset state of this Servant_Upcall object.
-    void upcall_cleanup (void);
-
-  protected:
-
-    TAO_Object_Adapter *object_adapter_;
-
-    TAO_POA *poa_;
-
-    PortableServer::Servant servant_;
-
-    State state_;
-
-    PortableServer::ObjectId system_id_;
-
-    const PortableServer::ObjectId *user_id_;
-
-    TAO_POA_Current_Impl current_context_;
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-    /// Servant Locator's cookie
-    PortableServer::ServantLocator::Cookie cookie_;
-
-    /// Operation name for this current.
-    const char *operation_;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-    /// Pointer to the entry in the TAO_Active_Object_Map corresponding
-    /// to the servant for this request.
-    TAO_Active_Object_Map::Map_Entry *active_object_map_entry_;
-
-    /// Are we using the servant locator?
-    int using_servant_locator_;
-
-    /// Preinvoke data for the upcall.
-    Pre_Invoke_State pre_invoke_state_;
-
-  private:
-    Servant_Upcall (const Servant_Upcall &);
-    void operator= (const Servant_Upcall &);
-  };
-
-  friend class Servant_Upcall;
+  friend class TAO::Portable_Server::Servant_Upcall;
 
 public:
 
   /// Pointer to the non-servant upcall in progress.  If no non-servant
   /// upcall is in progress, this pointer is zero.
-  Non_Servant_Upcall *non_servant_upcall_in_progress (void) const;
+  TAO::Portable_Server::Non_Servant_Upcall *non_servant_upcall_in_progress (void) const;
 
 private:
 
@@ -848,7 +478,7 @@ private:
 
   /// Pointer to the non-servant upcall in progress.  If no non-servant
   /// upcall is in progress, this pointer is zero.
-  Non_Servant_Upcall *non_servant_upcall_in_progress_;
+  TAO::Portable_Server::Non_Servant_Upcall *non_servant_upcall_in_progress_;
 
   /// Current nesting level of non_servant_upcalls.
   unsigned int non_servant_upcall_nesting_level_;
@@ -857,7 +487,7 @@ private:
   ACE_thread_t non_servant_upcall_thread_;
 
   /// The Root POA
-  TAO_POA *root_;
+  TAO_Root_POA *root_;
 
   /// The default validator and the beginning of the chain of
   /// policy validators.
@@ -868,9 +498,7 @@ private:
   TAO_POA_Policy_Set default_poa_policies_;
 };
 
-// ****************************************************************
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/PortableServer/Object_Adapter.i b/TAO/tao/PortableServer/Object_Adapter.i
index e51bd87f527..ae4008bcc17 100644
--- a/TAO/tao/PortableServer/Object_Adapter.i
+++ b/TAO/tao/PortableServer/Object_Adapter.i
@@ -4,18 +4,18 @@
 
 #include "tao/SystemException.h"
 
-
-ACE_INLINE
-TAO_POA_Current::TAO_POA_Current (void)
-{
-}
-
 ACE_INLINE TAO_Policy_Validator &
 TAO_Object_Adapter::validator (void)
 {
   return this->default_validator_;
 }
 
+ACE_INLINE int
+TAO_Object_Adapter::enable_locking (void) const
+{
+  return this->enable_locking_;
+}
+
 ACE_INLINE TAO_POA_Policy_Set &
 TAO_Object_Adapter::default_poa_policies (void)
 {
@@ -73,7 +73,7 @@ TAO_Object_Adapter::find_servant (const TAO::ObjectKey &key,
 
 ACE_INLINE int
 TAO_Object_Adapter::find_persistent_poa (const poa_name &system_name,
-                                         TAO_POA *&poa
+                                         TAO_Root_POA *&poa
                                          ACE_ENV_ARG_DECL)
 {
   return this->hint_strategy_->find_persistent_poa (system_name,
@@ -85,8 +85,8 @@ ACE_INLINE int
 TAO_Object_Adapter::find_poa (const poa_name &system_name,
                               CORBA::Boolean activate_it,
                               CORBA::Boolean root,
-                              const TAO_Temporary_Creation_Time &poa_creation_time,
-                              TAO_POA *&poa
+                              const TAO::Portable_Server::Temporary_Creation_Time &poa_creation_time,
+                              TAO_Root_POA *&poa
                               ACE_ENV_ARG_DECL)
 {
   if (activate_it)
@@ -106,7 +106,7 @@ TAO_Object_Adapter::find_poa (const poa_name &system_name,
 }
 
 ACE_INLINE int
-TAO_Object_Adapter::bind_transient_poa (TAO_POA *poa,
+TAO_Object_Adapter::bind_transient_poa (TAO_Root_POA *poa,
                                         poa_name_out system_name)
 {
   poa_name name;
@@ -125,7 +125,7 @@ TAO_Object_Adapter::bind_transient_poa (TAO_POA *poa,
 
 ACE_INLINE int
 TAO_Object_Adapter::bind_persistent_poa (const poa_name &folded_name,
-                                         TAO_POA *poa,
+                                         TAO_Root_POA *poa,
                                          poa_name_out system_name)
 {
   return this->hint_strategy_->bind_persistent_poa (folded_name,
@@ -147,7 +147,7 @@ TAO_Object_Adapter::unbind_persistent_poa (const poa_name &folded_name,
                                                       system_name);
 }
 
-ACE_INLINE TAO_POA *
+ACE_INLINE TAO_Root_POA *
 TAO_Object_Adapter::root_poa (void) const
 {
   return this->root_;
@@ -159,179 +159,9 @@ TAO_Object_Adapter::orb_core (void) const
   return this->orb_core_;
 }
 
-ACE_INLINE TAO_Object_Adapter::Non_Servant_Upcall *
+ACE_INLINE TAO::Portable_Server::Non_Servant_Upcall *
 TAO_Object_Adapter::non_servant_upcall_in_progress (void) const
 {
   return this->non_servant_upcall_in_progress_;
 }
 
-// ****************************************************************
-
-ACE_INLINE TAO_POA &
-TAO_Object_Adapter::Non_Servant_Upcall::poa (void) const
-{
-  return this->poa_;
-}
-
-ACE_INLINE TAO_POA &
-TAO_Object_Adapter::Servant_Upcall::poa (void) const
-{
-  return *this->poa_;
-}
-
-ACE_INLINE PortableServer::Servant
-TAO_Object_Adapter::Servant_Upcall::servant (void) const
-{
-  return this->servant_;
-}
-
-ACE_INLINE TAO_Object_Adapter &
-TAO_Object_Adapter::Servant_Upcall::object_adapter (void) const
-{
-  return *this->object_adapter_;
-}
-
-ACE_INLINE const PortableServer::ObjectId &
-TAO_Object_Adapter::Servant_Upcall::id (void) const
-{
-  return this->system_id_;
-}
-
-ACE_INLINE void
-TAO_Object_Adapter::Servant_Upcall::user_id (
-  const PortableServer::ObjectId *id)
-{
-  this->user_id_ = id;
-}
-
-ACE_INLINE const PortableServer::ObjectId &
-TAO_Object_Adapter::Servant_Upcall::user_id (void) const
-{
-  return *(this->user_id_);
-}
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-ACE_INLINE PortableServer::ServantLocator::Cookie
-TAO_Object_Adapter::Servant_Upcall::locator_cookie (void) const
-{
-  return this->cookie_;
-}
-
-ACE_INLINE void
-TAO_Object_Adapter::Servant_Upcall::locator_cookie (PortableServer::ServantLocator::Cookie cookie)
-{
-  this->cookie_ = cookie;
-}
-
-ACE_INLINE const char *
-TAO_Object_Adapter::Servant_Upcall::operation (void) const
-{
-  return this->operation_;
-}
-
-ACE_INLINE void
-TAO_Object_Adapter::Servant_Upcall::operation (const char *name)
-{
-  this->operation_ = name;
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-ACE_INLINE void
-TAO_Object_Adapter::Servant_Upcall::active_object_map_entry (TAO_Active_Object_Map::Map_Entry *entry)
-{
-  this->active_object_map_entry_ = entry;
-}
-
-ACE_INLINE TAO_Active_Object_Map::Map_Entry *
-TAO_Object_Adapter::Servant_Upcall::active_object_map_entry (void) const
-{
-  return this->active_object_map_entry_;
-}
-
-ACE_INLINE void
-TAO_Object_Adapter::Servant_Upcall::using_servant_locator (void)
-{
-  this->using_servant_locator_ = 1;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-ACE_INLINE void
-TAO_POA_Current_Impl::poa (TAO_POA *p)
-{
-  this->poa_ = p;
-}
-
-ACE_INLINE TAO_POA *
-TAO_POA_Current_Impl::poa (void) const
-{
-  return this->poa_;
-}
-
-ACE_INLINE void
-TAO_POA_Current_Impl::object_id (const PortableServer::ObjectId &id)
-{
-  this->object_id_ = id;
-}
-
-ACE_INLINE const PortableServer::ObjectId &
-TAO_POA_Current_Impl::object_id (void) const
-{
-  return this->object_id_;
-}
-
-ACE_INLINE void
-TAO_POA_Current_Impl::object_key (const TAO::ObjectKey &key)
-{
-  this->object_key_ = &key;
-}
-
-ACE_INLINE const TAO::ObjectKey &
-TAO_POA_Current_Impl::object_key (void) const
-{
-  return *this->object_key_;
-}
-
-ACE_INLINE void
-TAO_POA_Current_Impl::servant (PortableServer::Servant servant)
-{
-  this->servant_ = servant;
-}
-
-ACE_INLINE PortableServer::Servant
-TAO_POA_Current_Impl::servant (void) const
-{
-  return this->servant_;
-}
-
-ACE_INLINE void
-TAO_POA_Current_Impl::priority (CORBA::Short priority)
-{
-  this->priority_ = priority;
-}
-
-ACE_INLINE CORBA::Short
-TAO_POA_Current_Impl::priority (void) const
-{
-  return this->priority_;
-}
-
-ACE_INLINE CORBA::Short
-TAO_Object_Adapter::Servant_Upcall::priority (void) const
-{
-  return this->current_context_.priority ();
-}
-
-ACE_INLINE TAO_Object_Adapter::Servant_Upcall::State
-TAO_Object_Adapter::Servant_Upcall::state (void) const
-{
-  return this->state_;
-}
-
-ACE_INLINE void
-TAO_Object_Adapter::Servant_Upcall::state (TAO_Object_Adapter::Servant_Upcall::State state)
-{
-  this->state_ = state;
-}
diff --git a/TAO/tao/PortableServer/Object_Adapter_Factory.cpp b/TAO/tao/PortableServer/Object_Adapter_Factory.cpp
index 0fbeb2cd661..46e07c53e27 100644
--- a/TAO/tao/PortableServer/Object_Adapter_Factory.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter_Factory.cpp
@@ -32,7 +32,7 @@ TAO_Object_Adapter_Factory::init (int /* argc */,
                         TAO_PortableServer_ORBInitializer,
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
       ACE_TRY_CHECK;
diff --git a/TAO/tao/PortableServer/PICurrent_Guard.h b/TAO/tao/PortableServer/PICurrent_Guard.h
index 667cb45e1ef..c4340fdbbf1 100644
--- a/TAO/tao/PortableServer/PICurrent_Guard.h
+++ b/TAO/tao/PortableServer/PICurrent_Guard.h
@@ -15,15 +15,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/orbconf.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if TAO_HAS_INTERCEPTORS == 1
+#include "tao/orbconf.h"
 
-#include "portableserver_export.h"
+#if TAO_HAS_INTERCEPTORS == 1
 
 /// Forward declarations.
 class TAO_ServerRequest;
@@ -96,7 +96,6 @@ namespace TAO
      * the thread scope, meaning that a logical copy is not enough.
      */
     const bool tsc_to_rsc_;
-
   };
 }
 
diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp
deleted file mode 100644
index 99a3c4c3118..00000000000
--- a/TAO/tao/PortableServer/POA.cpp
+++ /dev/null
@@ -1,4435 +0,0 @@
-#include "tao/PortableServer/POA.h"
-
-ACE_RCSID (PortableServer,
-           POA,
-           "$Id$")
-
-//
-// ImplRepo related.
-//
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-# include "tao/PortableServer/ImplRepo_i.h"
-# include "tao/PortableServer/ImplRepoC.h"
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-#include "tao/StringSeqC.h"
-
-#include "tao/PortableServer/Default_Acceptor_Filter.h"
-#include "tao/PortableServer/ORT_Adapter.h"
-#include "tao/PortableServer/ORT_Adapter_Factory.h"
-#include "tao/PortableInterceptorC.h"
-#include "tao/ORB_Core.h"
-#include "tao/ORB.h"
-#include "tao/Server_Strategy_Factory.h"
-#include "tao/Acceptor_Registry.h"
-#include "tao/Thread_Lane_Resources.h"
-#include "tao/Environment.h"
-#include "tao/Exception.h"
-#include "tao/Stub.h"
-#include "tao/Profile.h"
-#include "tao/TSS_Resources.h"
-#include "tao/IORInterceptor_Adapter.h"
-#include "tao/debug.h"
-#include "Default_Acceptor_Filter.h"
-#include "ace/OS_NS_wchar.h"
-#include "ace/OS_NS_sys_time.h"
-#include "ace/OS_NS_netdb.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_unistd.h"
-
-#include "PortableGroup_Hooks.h"
-
-// auto_ptr class
-#include "ace/Auto_Ptr.h"
-#include "ace/Dynamic_Service.h"
-
-#if !defined (__ACE_INLINE__)
-# include "POA.i"
-#endif /* ! __ACE_INLINE__ */
-
-// This is the TAO_Object_key-prefix that is appended to all TAO Object keys.
-// It's an array of constant octets representing ^t^a^o/0 in octal.
-CORBA::Octet const
-TAO_POA::objectkey_prefix [TAO_POA::TAO_OBJECTKEY_PREFIX_SIZE] = {
-  024, // octal for ^t
-  001, // octal for ^a
-  017, // octal for ^o
-  000
-};
-
-TAO_POA*
-TAO_POA::_tao_poa_downcast(void)
-{
-  return this;
-}
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-PortableServer::ThreadPolicy_ptr
-TAO_POA::create_thread_policy (PortableServer::ThreadPolicyValue value
-                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_Thread_Policy *thread_policy = 0;
-  ACE_NEW_THROW_EX (thread_policy,
-                    TAO_Thread_Policy (value),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::ThreadPolicy::_nil ());
-
-  return thread_policy;
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-PortableServer::LifespanPolicy_ptr
-TAO_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value
-                                 ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_Lifespan_Policy *lifespan_policy = 0;
-  ACE_NEW_THROW_EX (lifespan_policy,
-                    TAO_Lifespan_Policy (value),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::LifespanPolicy::_nil ());
-
-  return lifespan_policy;
-}
-
-PortableServer::IdUniquenessPolicy_ptr
-TAO_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value
-                                      ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_Id_Uniqueness_Policy *id_uniqueness_policy = 0;
-  ACE_NEW_THROW_EX (id_uniqueness_policy,
-                    TAO_Id_Uniqueness_Policy (value),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::IdUniquenessPolicy::_nil ());
-
-  return id_uniqueness_policy;
-}
-
-PortableServer::IdAssignmentPolicy_ptr
-TAO_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value
-                                      ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_Id_Assignment_Policy *id_assignment_policy = 0;
-  ACE_NEW_THROW_EX (id_assignment_policy,
-                    TAO_Id_Assignment_Policy (value),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::IdAssignmentPolicy::_nil ());
-
-  return id_assignment_policy;
-}
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-PortableServer::ImplicitActivationPolicy_ptr
-TAO_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value
-                                            ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_Implicit_Activation_Policy *implicit_activation_policy = 0;
-  ACE_NEW_THROW_EX (implicit_activation_policy,
-                    TAO_Implicit_Activation_Policy (value),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::ImplicitActivationPolicy::_nil ());
-
-  return implicit_activation_policy;
-}
-
-PortableServer::ServantRetentionPolicy_ptr
-TAO_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value
-                                          ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_Servant_Retention_Policy *servant_retention_policy = 0;
-  ACE_NEW_THROW_EX (servant_retention_policy,
-                    TAO_Servant_Retention_Policy (value),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::ServantRetentionPolicy::_nil ());
-
-  return servant_retention_policy;
-}
-
-PortableServer::RequestProcessingPolicy_ptr
-TAO_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value
-                                           ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_Request_Processing_Policy *request_processing_policy = 0;
-  ACE_NEW_THROW_EX (request_processing_policy,
-                    TAO_Request_Processing_Policy (value),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (PortableServer::RequestProcessingPolicy::_nil ());
-
-  return request_processing_policy;
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-void
-TAO_POA::set_obj_ref_factory (
-  PortableInterceptor::ObjectReferenceFactory *current_factory
-  ACE_ENV_ARG_DECL)
-{
-  if (this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER))
-    {
-      // Activate a different factory
-      this->ort_adapter_->set_obj_ref_factory (current_factory
-                                               ACE_ENV_ARG_PARAMETER);
-    }
-}
-
-TAO_POA::TAO_POA (const TAO_POA::String &name,
-                  TAO_POA_Manager &poa_manager,
-                  const TAO_POA_Policy_Set &policies,
-                  TAO_POA *parent,
-                  ACE_Lock &lock,
-                  TAO_SYNCH_MUTEX &thread_lock,
-                  TAO_ORB_Core &orb_core,
-                  TAO_Object_Adapter *object_adapter
-                  ACE_ENV_ARG_DECL)
-  : name_ (name),
-    poa_manager_ (poa_manager),
-    tagged_component_ (),
-    tagged_component_id_ (),
-    profile_id_array_ (0),
-    policies_ (policies),
-    parent_ (parent),
-    active_object_map_ (0),
-    ort_adapter_ (0),
-    adapter_state_ (PortableInterceptor::HOLDING),
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-    adapter_activator_ (),
-    servant_activator_ (),
-    servant_locator_ (),
-    default_servant_ (),
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-    //
-    // ImplRepo related.
-    //
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-    server_object_ (0),
-    use_imr_ (1),
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-    children_ (),
-    lock_ (lock),
-    creation_time_ (ACE_OS::gettimeofday ()),
-    orb_core_ (orb_core),
-    object_adapter_ (object_adapter),
-    cleanup_in_progress_ (0),
-    etherealize_objects_ (1),
-    outstanding_requests_ (0),
-    outstanding_requests_condition_ (thread_lock),
-    wait_for_completion_pending_ (0),
-    waiting_destruction_ (0),
-    servant_deactivation_condition_ (thread_lock),
-    waiting_servant_deactivation_ (0),
-    single_threaded_lock_ (0),
-    caller_key_to_object_ (0),
-    servant_for_key_to_object_ (0)
-{
-  // Parse the policies that are used in the critical path in
-  // a cache.
-  this->cached_policies_.update (this->policies_
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-#if (TAO_HAS_MINIMUM_POA == 1)
-  // If this is the RootPOA, set the value of the ImplicitActivationPolicy
-  // to IMPLICIT_ACTIVATION since it is impossible to pass the policy
-  // as it is not compiled into the library.
-  //
-  // If the ImplicitActivationPolicy policy is ever compiled in the
-  // minimum POA builds, remove this code and remove the guards
-  // in Object_Adapter.cpp when changing the default policy for the
-  // RootPOA.
-  if (ACE_OS::strcmp (this->name_.c_str (),
-                      TAO_DEFAULT_ROOTPOA_NAME) == 0)
-    {
-      this->cached_policies_.implicit_activation
-        (PortableServer::IMPLICIT_ACTIVATION);
-    }
-#endif /* TAO_HAS_MINIMUM_POA == 1 */
-
-  // Set the folded name of this POA.
-  this->set_folded_name ();
-
-  // Create the active object map.
-  TAO_Active_Object_Map *active_object_map = 0;
-  ACE_NEW_THROW_EX (active_object_map,
-                    TAO_Active_Object_Map (!this->system_id (),
-                                           this->cached_policies_.id_uniqueness () == PortableServer::UNIQUE_ID,
-                                           this->persistent (),
-                                           this->orb_core_.server_factory ()->active_object_map_creation_parameters ()
-                                           ACE_ENV_ARG_PARAMETER),
-                    CORBA::NO_MEMORY ());
-
-  // Give ownership of the new map to the auto pointer.  Note, that it
-  // is important for the auto pointer to take ownership before
-  // checking for exception since we may need to delete the new map.
-  auto_ptr<TAO_Active_Object_Map> new_active_object_map (active_object_map);
-
-  // Check for exception in construction of the active object map.
-  ACE_CHECK;
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  // Setup lock if POA is single threaded.
-  if (this->cached_policies_.thread () == PortableServer::SINGLE_THREAD_MODEL)
-    {
-      ACE_NEW_THROW_EX (this->single_threaded_lock_,
-                        TAO_SYNCH_RECURSIVE_MUTEX,
-                        CORBA::NO_MEMORY ());
-
-    }
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  // Register self with manager.
-  int result = this->poa_manager_.register_poa (this);
-  if (result != 0)
-    {
-      ACE_THROW (CORBA::OBJ_ADAPTER ());
-    }
-
-  // Add self to Object Adapter class.
-  result =
-    this->object_adapter ().bind_poa (this->folded_name_,
-                                      this,
-                                      this->system_name_.out ());
-  if (result != 0)
-    {
-      // Remove from POA Manager in case of errors. No checks of
-      // further errors...
-      this->poa_manager_.remove_poa (this);
-
-      ACE_THROW (CORBA::OBJ_ADAPTER ());
-    }
-
-  // Set the id for this POA.
-  this->set_id ();
-
-  // Finally everything is fine.  Make sure to take ownership away
-  // from the auto pointer.
-  this->active_object_map_ = new_active_object_map.release ();
-
-  //
-  // ImplRepo related.
-  //
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-  if (this->cached_policies_.lifespan () == PortableServer::PERSISTENT)
-    {
-      int temp = this->use_imr_;
-      this->use_imr_ = 0;
-      ACE_TRY
-        {
-          this->imr_notify_startup (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY
-        {
-          this->poa_manager_.remove_poa (this);
-          this->object_adapter ().unbind_poa (this,
-                                              this->folded_name_,
-                                              this->system_name_.in ());
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-
-      this->use_imr_ = temp;
-    }
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-}
-
-TAO_POA::~TAO_POA (void)
-{
-  delete this->single_threaded_lock_;
-}
-
-void
-TAO_POA::complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL)
-{
-  // No longer awaiting destruction.
-  this->waiting_destruction_ = 0;
-
-  // Delete the active object map.
-  delete this->active_object_map_;
-  active_object_map_ = 0;
-
-  // Remove POA from the POAManager.
-  int result = this->poa_manager_.remove_poa (this);
-
-  if (result != 0)
-    ACE_THROW (CORBA::OBJ_ADAPTER ());
-
-  // Remove POA from the Object Adapter.
-  result = this->object_adapter ().unbind_poa (this,
-                                               this->folded_name_,
-                                               this->system_name_.in ());
-  if (result != 0)
-    ACE_THROW (CORBA::OBJ_ADAPTER ());
-
-
-  // Forced cleanup.  The new memory management scheme is evil and can
-  // lead to reference deadlock, i.e., POA holds object A, but POA
-  // cannot die because object A hold POA.
-  {
-    //
-    // If new things are added to this cleanup code, make sure to move
-    // the minimum CORBA #define after the declaration of
-    // <non_servant_upcall>.
-    //
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-    // A recursive thread lock without using a recursive thread lock.
-    // Non_Servant_Upcall has a magic constructor and destructor.  We
-    // unlock the Object_Adapter lock for the duration of the servant
-    // activator upcalls; reacquiring once the upcalls complete.  Even
-    // though we are releasing the lock, other threads will not be
-    // able to make progress since
-    // <Object_Adapter::non_servant_upcall_in_progress_> has been set.
-
-    TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
-    ACE_UNUSED_ARG (non_servant_upcall);
-
-    this->adapter_activator_ = PortableServer::AdapterActivator::_nil ();
-
-    this->servant_activator_ = PortableServer::ServantActivator::_nil ();
-
-    this->servant_locator_ = PortableServer::ServantLocator::_nil ();
-
-    this->default_servant_ = 0;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  }
-
-  CORBA::release (this);
-}
-
-PortableServer::POA_ptr
-TAO_POA::create_POA_i (const char *adapter_name,
-                       PortableServer::POAManager_ptr poa_manager,
-                       const CORBA::PolicyList &policies
-                       ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterAlreadyExists,
-                   PortableServer::POA::InvalidPolicy))
-{
-  // Initialize a TAO_POA_Policy_Set instance so that it contains the
-  // default POA policies.
-  TAO_POA_Policy_Set tao_policies (this->object_adapter ().default_poa_policies ());
-
-  // Merge policies from the ORB level.
-  this->object_adapter ().validator ().merge_policies (tao_policies.policies ()
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Merge in any policies that the user may have specified.
-  tao_policies.merge_policies (policies
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // If any of the policy objects specified are not valid for the ORB
-  // implementation, if conflicting policy objects are specified, or
-  // if any of the specified policy objects require prior
-  // administrative action that has not been performed, an
-  // InvalidPolicy exception is raised containing the index in the
-  // policies parameter value of the first offending policy object.
-  tao_policies.validate_policies (this->object_adapter ().validator (),
-                                  this->orb_core_
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // If the poa_manager parameter is null, a new POAManager object is
-  // created and associated with the new POA. Otherwise, the specified
-  // POAManager object is associated with the new POA. The POAManager
-  // object can be obtained using the attribute name the_POAManager.
-
-  TAO_POA_Manager *tao_poa_manager = 0;
-  if (CORBA::is_nil (poa_manager))
-    {
-      ACE_NEW_THROW_EX (tao_poa_manager,
-                        TAO_POA_Manager (this->object_adapter ()),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-    }
-  else
-    {
-      tao_poa_manager = ACE_dynamic_cast (TAO_POA_Manager *,
-                                          poa_manager);
-    }
-
-  TAO_POA *poa = this->create_POA_i (adapter_name,
-                                     *tao_poa_manager,
-                                     tao_policies
-                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  return PortableServer::POA::_duplicate (poa);
-}
-
-TAO_POA *
-TAO_POA::new_POA (const String &name,
-                  TAO_POA_Manager &poa_manager,
-                  const TAO_POA_Policy_Set &policies,
-                  TAO_POA *parent,
-                  ACE_Lock &lock,
-                  TAO_SYNCH_MUTEX &thread_lock,
-                  TAO_ORB_Core &orb_core,
-                  TAO_Object_Adapter *object_adapter
-                  ACE_ENV_ARG_DECL)
-{
-  TAO_POA *poa;
-
-  ACE_NEW_THROW_EX (poa,
-                    TAO_POA (name,
-                             poa_manager,
-                             policies,
-                             parent,
-                             lock,
-                             thread_lock,
-                             orb_core,
-                             object_adapter
-                             ACE_ENV_ARG_PARAMETER),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  return poa;
-}
-
-TAO_POA *
-TAO_POA::create_POA_i (const TAO_POA::String &adapter_name,
-                       TAO_POA_Manager &poa_manager,
-                       const TAO_POA_Policy_Set &policies
-                       ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterAlreadyExists,
-                   PortableServer::POA::InvalidPolicy))
-{
-  // This operaton creates a new POA as a child of the target POA. The
-  // specified name identifies the new POA with respect to other POAs
-  // with the same parent POA. If the target POA already has a child
-  // POA with the specified name, the AdapterAlreadyExists exception
-  // is raised.
-  int result = this->children_.find (adapter_name);
-
-  // Child was found
-  if (result != -1)
-    {
-      ACE_THROW_RETURN (PortableServer::POA::AdapterAlreadyExists (),
-                        0);
-    }
-
-  //
-  // Child was not found
-  //
-
-  // The specified policy objects are associated with the POA and used
-  // to control its behavior. The policy objects are effectively
-  // copied before this operation returns, so the application is free
-  // to destroy them while the POA is in use. Policies are not
-  // inherited from the parent POA.
-  TAO_POA *poa = this->new_POA (adapter_name,
-                                poa_manager,
-                                policies,
-                                this,
-                                this->object_adapter ().lock (),
-                                this->object_adapter ().thread_lock (),
-                                this->orb_core_,
-                                this->object_adapter_
-                                ACE_ENV_ARG_PARAMETER);
-
-  // Give ownership of the new map to the POA_var.  Note, that it
-  // is important for the POA_var to take ownership before
-  // checking for exception since we may need to delete the new map.
-  PortableServer::POA_var new_poa = poa;
-
-  // Check for exception in construction of the POA.
-  ACE_CHECK_RETURN (0);
-
-  // Add to children map
-  result = this->children_.bind (adapter_name,
-                                 poa);
-  if (result != 0)
-    {
-      ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                        0);
-    }
-
-  // Iterate over the registered IOR interceptors so that they may be
-  // given the opportunity to add tagged components to the profiles
-  // for this servant.
-  poa->establish_components (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // Note: Creating a POA using a POA manager that is in the active
-  // state can lead to race conditions if the POA supports preexisting
-  // objects, because the new POA may receive a request before its
-  // adapter activator, servant manager, or default servant have been
-  // initialized. These problems do not occur if the POA is created by
-  // an adapter activator registered with a parent of the new POA,
-  // because requests are queued until the adapter activator
-  // returns. To avoid these problems when a POA must be explicitly
-  // initialized, the application can initialize the POA by invoking
-  // find_POA with a TRUE activate parameter.
-
-  // Everything is fine. Don't let the POA_var release the
-  // implementation.
-  (void) new_poa._retn ();  // We could do a "return new_poa._retn()"
-                            // but the return type doesn't match this
-                            // method's return type.
-
-  return poa;
-}
-
-PortableServer::POA_ptr
-TAO_POA::find_POA (const char *adapter_name,
-                   CORBA::Boolean activate_it
-                   ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterNonExistent))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (0);
-
-  TAO_POA *poa = this->find_POA_i (adapter_name,
-                                   activate_it
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  return PortableServer::POA::_duplicate (poa);
-}
-
-TAO_POA *
-TAO_POA::find_POA_i (const ACE_CString &child_name,
-                     CORBA::Boolean activate_it
-                     ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterNonExistent))
-{
-  TAO_POA *child;
-  int result = this->children_.find (child_name,
-                                     child);
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  if (result != 0)
-    {
-      if (activate_it)
-        {
-          if (!CORBA::is_nil (this->adapter_activator_.in ()))
-            {
-              // Check the state of the POA Manager.
-              this->check_poa_manager_state (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK_RETURN (0);
-
-              // A recursive thread lock without using a recursive
-              // thread lock. Non_Servant_Upcall has a magic
-              // constructor and destructor.  We unlock the
-              // Object_Adapter lock for the duration of the servant
-              // activator upcalls; reacquiring once the upcalls
-              // complete.  Even though we are releasing the lock,
-              // other threads will not be able to make progress since
-              // <Object_Adapter::non_servant_upcall_in_progress_> has
-              // been set.
-              TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
-              ACE_UNUSED_ARG (non_servant_upcall);
-
-              CORBA::Boolean success =
-                this->adapter_activator_->unknown_adapter (this,
-                                                           child_name.c_str ()
-                                                           ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK_RETURN (0);
-
-              if (success)
-                {
-                  result = this->children_.find (child_name,
-                                                 child);
-                }
-              else
-                {
-                  result = -1;
-                }
-            }
-          else
-            {
-              result = -1;
-            }
-        }
-      else
-        {
-          result = -1;
-        }
-    }
-#else
-  ACE_UNUSED_ARG (activate_it);
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  if (result == 0)
-    {
-      return child;
-    }
-  else
-    {
-      // Otherwise, the AdapterNonExistent exception is raised.
-      ACE_THROW_RETURN (PortableServer::POA::AdapterNonExistent (),
-                        0);
-    }
-}
-
-void
-TAO_POA::destroy_i (CORBA::Boolean etherealize_objects,
-                    CORBA::Boolean wait_for_completion
-                    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->cleanup_in_progress_)
-    return;
-
-  // Is the <wait_for_completion> semantics for this thread correct?
-  TAO_POA::check_for_valid_wait_for_completions (this->orb_core (),
-                                                 wait_for_completion
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->cleanup_in_progress_ = 1;
-
-  // This operation destroys the POA and all descendant POAs. The POA
-  // so destroyed (that is, the POA with its name) may be re-created
-  // later in the same process. (This differs from the
-  // POAManager::deactivate operation that does not allow a
-  // re-creation of its associated POA in the same process.)
-
-  // Remove POA from the parent
-  if (this->parent_ != 0)
-    {
-      int result = this->parent_->delete_child (this->name_);
-      if (result != 0)
-        {
-          ACE_THROW (CORBA::OBJ_ADAPTER ());
-        }
-    }
-
-  TAO::ORT_Array array_obj_ref_template (1);
-
-  CORBA::ULong i = 0;
-
-  // Gather all ObjectReferenceTemplates and change all adapter states
-  // to INACTIVE.
-  for (CHILDREN::iterator iterator = this->children_.begin ();
-       iterator != this->children_.end ();
-       ++iterator)
-    {
-      TAO_POA * const child_poa = (*iterator).int_id_;
-
-      TAO::ORT_Adapter * const adapter = child_poa->ORT_adapter_i ();
-
-      // In case no ORT library is linked we get zero.
-      if (adapter != 0)
-        {
-          // Get the ObjectReferenceTemplate for the child POA.
-          PortableInterceptor::ObjectReferenceTemplate * const ort =
-            adapter->get_adapter_template ();
-
-          // Add it to the sequence of object reference templates that
-          // will be destroyed.
-          array_obj_ref_template.size (1);
-
-          array_obj_ref_template[0] = ort;
-        }
-
-      child_poa->adapter_state_ =
-        PortableInterceptor::INACTIVE;
-
-      // Notify the state changes to the IORInterceptors
-      this->adapter_state_changed (array_obj_ref_template,
-                                   PortableInterceptor::INACTIVE
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (adapter != 0)
-        adapter->release (array_obj_ref_template[0]);
-
-      ++i;
-    }
-
-
-  // Destroy all child POA's now.
-  for (CHILDREN::iterator destroy_iterator = this->children_.begin ();
-       destroy_iterator != this->children_.end ();
-       ++destroy_iterator)
-    {
-      TAO_POA *destroy_child_poa = (*destroy_iterator).int_id_;
-
-      destroy_child_poa->destroy_i (etherealize_objects,
-                                    wait_for_completion
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-  //
-  // ImplRepo related.
-  //
-  if (this->cached_policies_.lifespan () == PortableServer::PERSISTENT)
-    {
-      this->imr_notify_shutdown ();
-      // Delete the servant, if there is one.
-
-      if (this->server_object_)
-        {
-          TAO_POA *tao_poa = 0;
-
-          PortableServer::POA_var poa =
-            this->server_object_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-
-          tao_poa = poa->_tao_poa_downcast ();
-          PortableServer::ObjectId_var id =
-            tao_poa->servant_to_id_i (this->server_object_
-                                      ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-
-          tao_poa->deactivate_object_i (id.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-    }
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  // When a POA is destroyed, any requests that have started execution
-  // continue to completion. Any requests that have not started
-  // execution are processed as if they were newly arrived, that is,
-  // the POA will attempt to cause recreation of the POA by invoking
-  // one or more adapter activators as described in Section 3.3.3.
-  // If the wait_for_completion parameter is TRUE, the destroy
-  // operation will return only after all requests in process have
-  // completed and all invocations of etherealize have
-  // completed. Otherwise, the destroy operation returns after
-  // destroying the POAs.
-
-  this->deactivate_all_objects_i (etherealize_objects,
-                                  wait_for_completion
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // If there are no outstanding requests and that we are not in a
-  // non-servant upcall or if we are in a non-servant upcall, make
-  // sure we are the POA related to the non-servant upcall.
-  TAO_Object_Adapter::Non_Servant_Upcall *non_servant_upcall_in_progress =
-    this->object_adapter ().non_servant_upcall_in_progress ();
-  if (this->outstanding_requests_ == 0 &&
-      (non_servant_upcall_in_progress == 0 ||
-       &non_servant_upcall_in_progress->poa () != this))
-    {
-      TAO::ORT_Array my_array_obj_ref_template;
-
-      TAO::ORT_Adapter * const ort_adapter =
-        this->ORT_adapter_i ();
-
-      // In case no ORT library is linked we get zero.
-      if (ort_adapter != 0)
-        {
-          // Get the ObjectReferenceTemplate.
-          PortableInterceptor::ObjectReferenceTemplate * const ort =
-            ort_adapter->get_adapter_template ();
-
-          // Add it to the sequence of object reference templates, we
-          // just notify for ourselves that we are now non_existent,
-          // our childs will do it for themselves.
-          my_array_obj_ref_template.size (1);
-          my_array_obj_ref_template[0] = ort;
-        }
-
-      // According to the ORT spec, after a POA is destroyed, its state
-      // has to be changed to NON_EXISTENT and all the registered
-      // interceptors are to be informed. Since, the POA is destroyed
-      // and is released in the complete_destruction_i method, we are
-      // trying to keep the poa still around by doing a duplicate of
-      // it. (a hack).
-      PortableServer::POA_var poa = PortableServer::POA::_duplicate (this);
-
-      this->complete_destruction_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      this->adapter_state_ = PortableInterceptor::NON_EXISTENT;
-
-      this->adapter_state_changed (my_array_obj_ref_template,
-                                   this->adapter_state_
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (ort_adapter != 0)
-        {
-          ort_adapter->release (my_array_obj_ref_template[0]);
-
-          TAO::ORT_Adapter_Factory *ort_factory =
-            this->ORT_adapter_factory ();
-
-          ort_factory->destroy (ort_adapter
-                                ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-
-          this->ort_adapter_ = 0;
-        }
-    }
-  else
-    {
-      // Mark that we are ready for destruction.
-      this->waiting_destruction_ = 1;
-    }
-}
-
-int
-TAO_POA::delete_child (const TAO_POA::String &child)
-{
-  int result = 0;
-
-  // If we are not closing down, we must remove this child from our
-  // collection.
-  if (!this->cleanup_in_progress_)
-    result = this->children_.unbind (child);
-
-  // Otherwise, if we are closing down, we are currently iterating
-  // over our children and there is not need to remove this child from
-  // our collection.
-
-  return result;
-}
-
-PortableServer::POAList *
-TAO_POA::the_children_i (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  PortableServer::POAList_var children;
-  CORBA::ULong child_current = ACE_static_cast (CORBA::ULong,
-                                                this->children_.current_size ());
-  ACE_NEW_THROW_EX (children,
-                    PortableServer::POAList (child_current),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  children->length (child_current);
-
-  CORBA::ULong index = 0;
-  for (CHILDREN::iterator iterator = this->children_.begin ();
-       iterator != this->children_.end ();
-       ++iterator, ++index)
-    {
-      TAO_POA *child_poa = (*iterator).int_id_;
-      children[index] = PortableServer::POA::_duplicate (child_poa);
-    }
-
-  return children._retn ();
-}
-
-PortableInterceptor::AdapterName *
-TAO_POA::adapter_name_i (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // The adapter name is the sequence of names starting from the
-  // RootPOA to the one whose name is requested.  The name of the
-  // RootPOA is "RootPOA".
-
-  PortableServer::POA_var poa = PortableServer::POA::_duplicate (this);
-
-  CORBA::ULong len = 0;
-
-  // Find the length of the adapter name sequence by traversing the
-  // POA hierarchy until the RootPOA is reached.  The RootPOA has no
-  // parent.
-  while (!CORBA::is_nil (poa.in ()))
-    {
-      poa = poa->the_parent (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      ++len;
-    }
-
-  // Empty adapter name sequence.
-  PortableInterceptor::AdapterName *names = 0;
-  ACE_NEW_THROW_EX (names,
-                    PortableInterceptor::AdapterName (len),
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
-
-  PortableInterceptor::AdapterName_var safe_names (names);
-
-  names->length (len);
-
-  poa = PortableServer::POA::_duplicate (this);
-
-  (*names)[0] = CORBA::string_dup ("RootPOA");
-
-  // Fill in the AdapterName sequence as the POA hierarchy is
-  // traversed.
-  CORBA::ULong ilen = len;
-  for (CORBA::ULong i = 1; i < len; ++i)
-    {
-      (*names)[--ilen] = poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      poa = poa->the_parent (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      // If this condition asserts, the POA hierarchy was modified
-      // (i.e. reduced in size) by another thread!
-      ACE_ASSERT ((ilen > 0 ? !CORBA::is_nil (poa.in ()) : 1));
-    }
-
-  return safe_names._retn ();
-}
-
-void
-TAO_POA::add_ior_component (TAO_MProfile & mprofile,
-                            const IOP::TaggedComponent &component
-                            ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Add the given tagged component to all profiles.
-
-  const CORBA::ULong profile_count = mprofile.profile_count ();
-
-  for (CORBA::ULong i = 0; i < profile_count; ++i)
-    {
-      TAO_Profile *profile = mprofile.get_profile (i);
-
-      profile->add_tagged_component (component
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-void
-TAO_POA::add_ior_component_to_profile (
-    TAO_MProfile & mprofile,
-    const IOP::TaggedComponent &component,
-    IOP::ProfileId profile_id
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Add the given tagged component to all profiles matching the given
-  // ProfileId.
-
-  int found_profile = 0;
-
-  const CORBA::ULong profile_count = mprofile.profile_count ();
-
-  for (CORBA::ULong i = 0; i < profile_count; ++i)
-    {
-      TAO_Profile *profile = mprofile.get_profile (i);
-
-      if (profile->tag () == profile_id)
-        {
-          profile->add_tagged_component (component
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-
-          found_profile = 1;
-        }
-    }
-
-  // According to the Portable Interceptor specification, we're
-  // supposed to throw a CORBA::BAD_PARAM exception if no profile
-  // matched the given ProfileId.
-  if (found_profile == 0)
-    ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 29,
-                                 CORBA::COMPLETED_NO));
-}
-
-void
-TAO_POA::adapter_state_changed (
-   const TAO::ORT_Array &array_obj_ref_template,
-   PortableInterceptor::AdapterState state
-   ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_IORInterceptor_Adapter *ior_adapter =
-    this->orb_core_.ior_interceptor_adapter ();
-
-  if (ior_adapter)
-    {
-      ior_adapter->adapter_state_changed (array_obj_ref_template,
-                                          state
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-PortableServer::ServantManager_ptr
-TAO_POA::get_servant_manager_i (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
-{
-  // This operation requires the USE_SERVANT_MANAGER policy; if not
-  // present, the WrongPolicy exception is raised.
-  if (this->cached_policies_.request_processing () !=
-      PortableServer::USE_SERVANT_MANAGER)
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        PortableServer::ServantManager::_nil ());
-    }
-
-  // This operation returns the servant manager associated with the
-  // POA.  If no servant manager has been associated with the POA, it
-  // returns a null reference.
-  if (this->cached_policies_.servant_retention () ==
-      PortableServer::RETAIN)
-    return PortableServer::ServantManager::_duplicate (this->servant_activator_.in ());
-  else
-    return PortableServer::ServantManager::_duplicate (this->servant_locator_.in ());
-}
-
-void
-TAO_POA::set_servant_manager_i (PortableServer::ServantManager_ptr imgr
-                                ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
-{
-  // This operation requires the USE_SERVANT_MANAGER policy; if not
-  // present, the WrongPolicy exception is raised.
-  if (this->cached_policies_.request_processing () != PortableServer::USE_SERVANT_MANAGER)
-    {
-      ACE_THROW (PortableServer::POA::WrongPolicy ());
-    }
-
-  // This operation sets the default servant manager associated with
-  // the POA.
-  if (this->cached_policies_.servant_retention () == PortableServer::RETAIN)
-    {
-      this->servant_activator_ = PortableServer::ServantActivator::_narrow (imgr
-                                                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (CORBA::is_nil (this->servant_activator_.in ()))
-        {
-          ACE_THROW (PortableServer::POA::WrongPolicy ());
-        }
-    }
-  else
-    {
-      this->servant_locator_ = PortableServer::ServantLocator::_narrow (imgr
-                                                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (CORBA::is_nil (this->servant_locator_.in ()))
-        {
-          ACE_THROW (PortableServer::POA::WrongPolicy ());
-        }
-    }
-}
-
-PortableServer::Servant
-TAO_POA::get_servant_i (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::NoServant,
-                   PortableServer::POA::WrongPolicy))
-{
-  // This operation requires the USE_DEFAULT_SERVANT policy; if not
-  // present, the WrongPolicy exception is raised.
-  if (this->cached_policies_.request_processing () != PortableServer::USE_DEFAULT_SERVANT)
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
-    }
-
-  // This operation returns the default servant associated with the
-  // POA.
-  PortableServer::Servant result = this->default_servant_.in ();
-  if (result != 0)
-    {
-      // A recursive thread lock without using a recursive thread
-      // lock.  Non_Servant_Upcall has a magic constructor and
-      // destructor.  We unlock the Object_Adapter lock for the
-      // duration of the servant activator upcalls; reacquiring once
-      // the upcalls complete.  Even though we are releasing the lock,
-      // other threads will not be able to make progress since
-      // <Object_Adapter::non_servant_upcall_in_progress_> has been
-      // set.
-      TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
-      ACE_UNUSED_ARG (non_servant_upcall);
-
-      // The POA invokes _add_ref once on the Servant before returning
-      // it. If the application uses reference counting, the caller of
-      // get_servant is responsible for invoking _remove_ref once on
-      // the returned Servant when it is finished with it. A
-      // conforming caller need not invoke _remove_ref on the returned
-      // Servant if the type of the Servant uses the default reference
-      // counting inherited from ServantBase.
-      result->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      return result;
-    }
-  else
-    // If no servant has been associated with the POA, the NoServant
-    // exception is raised.
-    {
-      ACE_THROW_RETURN (PortableServer::POA::NoServant (),
-                        0);
-    }
-}
-
-void
-TAO_POA::set_servant_i (PortableServer::Servant servant
-                        ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
-{
-  // This operation requires the USE_DEFAULT_SERVANT policy; if not
-  // present, the WrongPolicy exception is raised.
-  if (this->cached_policies_.request_processing () != PortableServer::USE_DEFAULT_SERVANT)
-    {
-      ACE_THROW (PortableServer::POA::WrongPolicy ());
-    }
-
-  // This operation registers the specified servant with the POA as
-  // the default servant. This servant will be used for all requests
-  // for which no servant is found in the Active Object Map.
-  this->default_servant_ = servant;
-
-  // The implementation of set_servant will invoke _add_ref at least
-  // once on the Servant argument before returning. When the POA no
-  // longer needs the Servant, it will invoke _remove_ref on it the
-  // same number of times.
-  if (servant != 0)
-    {
-      // A recursive thread lock without using a recursive thread
-      // lock.  Non_Servant_Upcall has a magic constructor and
-      // destructor.  We unlock the Object_Adapter lock for the
-      // duration of the servant activator upcalls; reacquiring once
-      // the upcalls complete.  Even though we are releasing the lock,
-      // other threads will not be able to make progress since
-      // <Object_Adapter::non_servant_upcall_in_progress_> has been
-      // set.
-      TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
-      ACE_UNUSED_ARG (non_servant_upcall);
-
-      servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-int
-TAO_POA::is_servant_in_map (PortableServer::Servant servant,
-                            int &wait_occurred_restart_call)
-{
-  int deactivated = 0;
-  int servant_in_map =
-    this->active_object_map ().is_servant_in_map (servant,
-                                                  deactivated);
-
-  if (!servant_in_map)
-    {
-      return 0;
-    }
-  else
-    {
-      if (deactivated)
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("(%t) TAO_POA::is_servant_in_map: waiting for servant to deactivate\n")));
-
-          // We are going to wait on this condition variable; the POA
-          // state may change by the time we get the lock again.
-          // Therefore, indicate to the caller that all conditions
-          // need to be checked again.
-          wait_occurred_restart_call = 1;
-
-          ++this->waiting_servant_deactivation_;
-
-          if (this->object_adapter ().enable_locking_)
-            this->servant_deactivation_condition_.wait ();
-
-          --this->waiting_servant_deactivation_;
-
-          return 0;
-        }
-      else
-        {
-          return 1;
-        }
-    }
-}
-
-int
-TAO_POA::is_user_id_in_map (const PortableServer::ObjectId &id,
-                            CORBA::Short priority,
-                            int &priorities_match,
-                            int &wait_occurred_restart_call)
-{
-  int deactivated = 0;
-  int user_id_in_map =
-    this->active_object_map ().is_user_id_in_map (id,
-                                                  priority,
-                                                  priorities_match,
-                                                  deactivated);
-
-  if (!user_id_in_map)
-    {
-      return 0;
-    }
-  else
-    {
-      if (deactivated)
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("(%t) TAO_POA::is_user_id_in_map: waiting for servant to deactivate\n")));
-
-          // We are going to wait on this condition variable; the POA
-          // state may change by the time we get the lock again.
-          // Therefore, indicate to the caller that all conditions
-          // need to be checked again.
-          wait_occurred_restart_call = 1;
-
-          ++this->waiting_servant_deactivation_;
-
-          if (this->object_adapter ().enable_locking_)
-            this->servant_deactivation_condition_.wait ();
-
-          --this->waiting_servant_deactivation_;
-
-          return 0;
-        }
-      else
-        {
-          return 1;
-        }
-    }
-}
-
-PortableServer::ObjectId *
-TAO_POA::activate_object_i (PortableServer::Servant servant,
-                            CORBA::Short priority,
-                            int &wait_occurred_restart_call
-                            ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  // This operation requires the SYSTEM_ID and RETAIN policy; if not
-  // present, the WrongPolicy exception is raised.
-  if (!(this->cached_policies_.id_assignment () == PortableServer::SYSTEM_ID &&
-        this->cached_policies_.servant_retention () == PortableServer::RETAIN))
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
-    }
-
-  // If the POA has the UNIQUE_ID policy and the specified servant is
-  // already in the Active Object Map, the ServantAlreadyActive
-  // exception is raised.
-  if (this->cached_policies_.id_uniqueness () == PortableServer::UNIQUE_ID)
-    {
-      int result =
-        this->is_servant_in_map (servant,
-                                 wait_occurred_restart_call);
-
-      if (result)
-        {
-          ACE_THROW_RETURN (PortableServer::POA::ServantAlreadyActive (),
-                            0);
-        }
-      else if (wait_occurred_restart_call)
-        {
-          // We ended up waiting on a condition variable, the POA
-          // state may have changed while we are waiting.  Therefore,
-          // we need to restart this call.
-          return 0;
-        }
-    }
-
-  // Otherwise, the activate_object operation generates an Object Id
-  // and enters the Object Id and the specified servant in the Active
-  // Object Map. The Object Id is returned.
-  PortableServer::ObjectId_var user_id;
-  if (this->active_object_map ().
-      bind_using_system_id_returning_user_id (servant,
-                                              priority,
-                                              user_id.out ()) != 0)
-    {
-      ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                        0);
-    }
-
-  //
-  // Everything is finally ok
-  //
-
-  // A recursive thread lock without using a recursive thread lock.
-  // Non_Servant_Upcall has a magic constructor and destructor.  We
-  // unlock the Object_Adapter lock for the duration of the servant
-  // activator upcalls; reacquiring once the upcalls complete.  Even
-  // though we are releasing the lock, other threads will not be able
-  // to make progress since
-  // <Object_Adapter::non_servant_upcall_in_progress_> has been set.
-  TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
-  ACE_UNUSED_ARG (non_servant_upcall);
-
-  // The implementation of activate_object will invoke _add_ref at
-  // least once on the Servant argument before returning. When the POA
-  // no longer needs the Servant, it will invoke _remove_ref on it the
-  // same number of times.
-  servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-
-  return user_id._retn ();
-}
-
-void
-TAO_POA::activate_object_with_id_i (const PortableServer::ObjectId &id,
-                                    PortableServer::Servant servant,
-                                    CORBA::Short priority,
-                                    int &wait_occurred_restart_call
-                                    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::ObjectAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  // This operation requires the RETAIN policy; if not present, the
-  // WrongPolicy exception is raised.
-  if (this->cached_policies_.servant_retention () != PortableServer::RETAIN)
-    {
-      ACE_THROW (PortableServer::POA::WrongPolicy ());
-    }
-
-  // If the POA has the SYSTEM_ID policy and it detects that the
-  // Object Id value was not generated by the system or for this POA,
-  // the activate_object_with_id operation may raise the BAD_PARAM
-  // system exception.  An ORB is not required to detect all such
-  // invalid Object Id values, but a portable application must not
-  // invoke activate_object_with_id on a POA that has the SYSTEM_ID
-  // policy with an Object Id value that was not previously generated
-  // by the system for that POA, or, if the POA also has the
-  // PERSISTENT policy, for a previous instantiation of the same POA.
-  if (this->cached_policies_.id_assignment () == PortableServer::SYSTEM_ID &&
-      !this->is_poa_generated_id (id))
-    {
-      ACE_THROW (CORBA::BAD_PARAM ());
-    }
-
-  // If the CORBA object denoted by the Object Id value is already
-  // active in this POA (there is a servant bound to it in the Active
-  // Object Map), the ObjectAlreadyActive exception is raised.
-  int priorities_match = 1;
-  int result =
-    this->is_user_id_in_map (id,
-                             priority,
-                             priorities_match,
-                             wait_occurred_restart_call);
-
-  if (result)
-    {
-      ACE_THROW (PortableServer::POA::ObjectAlreadyActive ());
-    }
-  else if (wait_occurred_restart_call)
-    {
-      // We ended up waiting on a condition variable, the POA state
-      // may have changed while we are waiting.  Therefore, we need to
-      // restart this call.
-      return;
-    }
-
-  // If the activate_object_with_id_and_priority operation is invoked
-  // with a different priority to an earlier invocation of one of the
-  // create reference with priority operations, for the same object,
-  // then the ORB shall raise a BAD_INV_ORDER system exception (with a
-  // Standard Minor Exception Code of 1). If the priority value is the
-  // same then the ORB shall return SUCCESS.
-  if (!priorities_match)
-    {
-      ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 1,
-                                       CORBA::COMPLETED_NO));
-    }
-
-  // If the POA has the UNIQUE_ID policy and the servant is already in
-  // the Active Object Map, the ServantAlreadyActive exception is
-  // raised.
-  if (this->cached_policies_.id_uniqueness () == PortableServer::UNIQUE_ID)
-    {
-      result =
-        this->is_servant_in_map (servant,
-                                 wait_occurred_restart_call);
-
-      if (result)
-        {
-          ACE_THROW (PortableServer::POA::ServantAlreadyActive ());
-        }
-      else if (wait_occurred_restart_call)
-        {
-          // We ended up waiting on a condition variable, the POA
-          // state may have changed while we are waiting.  Therefore,
-          // we need to restart this call.
-          return;
-        }
-    }
-
-  // Otherwise, the activate_object_with_id operation enters an
-  // association between the specified Object Id and the specified
-  // servant in the Active Object Map.
-  if (this->active_object_map ().bind_using_user_id (servant,
-                                                     id,
-                                                     priority) != 0)
-    {
-      ACE_THROW (CORBA::OBJ_ADAPTER ());
-    }
-
-  //
-  // Everything is finally ok
-  //
-
-  // A recursive thread lock without using a recursive thread lock.
-  // Non_Servant_Upcall has a magic constructor and destructor.  We
-  // unlock the Object_Adapter lock for the duration of the servant
-  // activator upcalls; reacquiring once the upcalls complete.  Even
-  // though we are releasing the lock, other threads will not be able
-  // to make progress since
-  // <Object_Adapter::non_servant_upcall_in_progress_> has been set.
-  TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
-  ACE_UNUSED_ARG (non_servant_upcall);
-
-  // The implementation of activate_object_with_id will invoke
-  // _add_ref at least once on the Servant argument before
-  // returning. When the POA no longer needs the Servant, it will
-  // invoke _remove_ref on it the same number of times.
-  servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects,
-                                   CORBA::Boolean wait_for_completion
-                                   ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
-{
-  this->deactivate_all_objects_i (etherealize_objects
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->wait_for_completions (wait_for_completion
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_POA::wait_for_completions (CORBA::Boolean wait_for_completion
-                               ACE_ENV_ARG_DECL)
-{
-  while (this->object_adapter ().enable_locking_ &&
-         wait_for_completion &&
-         this->outstanding_requests_ > 0)
-    {
-      this->wait_for_completion_pending_ = 1;
-
-      int result = this->outstanding_requests_condition_.wait ();
-      if (result == -1)
-        {
-          ACE_THROW (CORBA::OBJ_ADAPTER ());
-        }
-    }
-}
-
-/* static */
-void
-TAO_POA::check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core,
-                                               CORBA::Boolean wait_for_completion
-                                               ACE_ENV_ARG_DECL)
-{
-  if (wait_for_completion)
-    {
-      TAO_POA_Current_Impl *poa_current_impl =
-        ACE_static_cast (TAO_POA_Current_Impl *,
-                         TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
-
-      while (1)
-        {
-          // If wait_for_completion is TRUE and the current thread is
-          // in an invocation context dispatched from some POA
-          // belonging to the same ORB as this POA, the BAD_INV_ORDER
-          // system exception with standard minor code 3 is raised and
-          // POA destruction does not occur.
-          if (poa_current_impl != 0)
-            {
-              if (&orb_core == &poa_current_impl->orb_core ())
-                {
-                  // CORBA 2.3 specifies which minor code corresponds
-                  // to this particular problem.
-                  ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 3,
-                                                   CORBA::COMPLETED_NO));
-                }
-            }
-          else
-            break;
-
-          poa_current_impl =
-            poa_current_impl->previous_current_impl_;
-        }
-    }
-}
-
-void
-TAO_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects
-                                   ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
-{
-  this->etherealize_objects_ = etherealize_objects;
-
-  // This operation is a no-op for the non-RETAIN policy.
-  if (this->cached_policies_.servant_retention () != PortableServer::RETAIN)
-    {
-      return;
-    }
-
-  // If the etherealize_objects parameter is TRUE, the POA has the
-  // RETAIN policy, and a servant manager is registered with the POA,
-  // the etherealize operation on the servant manager will be called
-  // for each active object in the Active Object Map. The apparent
-  // destruction of the POA occurs before any calls to etherealize are
-  // made.  Thus, for example, an etherealize method that attempts to
-  // invoke operations on the POA will receive the OBJECT_NOT_EXIST
-  // exception.
-
-  // We must copy the map entries into a separate place since we
-  // cannot remove entries while iterating through the map.
-  ACE_Array_Base<TAO_Active_Object_Map::Map_Entry *> map_entries
-    (this->active_object_map ().current_size ());
-
-  size_t counter = 0;
-  TAO_Active_Object_Map::user_id_map::iterator end
-    = this->active_object_map ().user_id_map_->end ();
-
-  for (TAO_Active_Object_Map::user_id_map::iterator iter
-         = this->active_object_map ().user_id_map_->begin ();
-       iter != end;
-       ++iter)
-    {
-      TAO_Active_Object_Map::user_id_map::value_type map_pair = *iter;
-      TAO_Active_Object_Map::Map_Entry *active_object_map_entry = map_pair.second ();
-
-      if (!active_object_map_entry->deactivated_)
-        {
-          map_entries[counter] = active_object_map_entry;
-          ++counter;
-        }
-    }
-
-  for (size_t i = 0;
-       i < counter;
-       ++i)
-    {
-      this->deactivate_map_entry (map_entries[i]
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-void
-TAO_POA::deactivate_object_i (const PortableServer::ObjectId &id
-                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  // This operation requires the RETAIN policy; if not present, the
-  // WrongPolicy exception is raised.
-  if (this->cached_policies_.servant_retention () != PortableServer::RETAIN)
-    {
-      ACE_THROW (PortableServer::POA::WrongPolicy ());
-    }
-
-  TAO_Active_Object_Map::Map_Entry *active_object_map_entry = 0;
-  int result = this->active_object_map ().
-    find_servant_and_system_id_using_user_id (id,
-                                              active_object_map_entry);
-
-  // If there is no active object associated with the specified Object
-  // Id, the operation raises an ObjectNotActive exception.
-  if (result != 0)
-    {
-      ACE_THROW (PortableServer::POA::ObjectNotActive ());
-    }
-
-  this->deactivate_map_entry (active_object_map_entry
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_POA::deactivate_map_entry (TAO_Active_Object_Map::Map_Entry *active_object_map_entry
-                               ACE_ENV_ARG_DECL)
-{
-  // Decrement the reference count.
-  CORBA::UShort new_count = --active_object_map_entry->reference_count_;
-
-  if (new_count == 0)
-    {
-      this->cleanup_servant (active_object_map_entry
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  else
-    {
-      // It should be noted that there may be a period of time between
-      // an object's deactivation and the etherealization (during
-      // which outstanding requests are being processed) in which
-      // arriving requests on that object should not be passed to its
-      // servant. During this period, requests targeted for such an
-      // object act as if the POA were in holding state until
-      // etherealize completes. If etherealize is called as a
-      // consequence of a deactivate call with a etherealize_objects
-      // parameter of TRUE, incoming requests are rejected.
-
-      // Else mark entry as closed...
-      active_object_map_entry->deactivated_ = 1;
-    }
-}
-
-void
-TAO_POA::cleanup_servant (TAO_Active_Object_Map::Map_Entry *active_object_map_entry
-                          ACE_ENV_ARG_DECL)
-{
-  // If a servant manager is associated with the POA,
-  // ServantLocator::etherealize will be invoked with the oid and the
-  // servant. (The deactivate_object operation does not wait for the
-  // etherealize operation to complete before deactivate_object
-  // returns.)
-  //
-  // Note: If the servant associated with the oid is serving multiple
-  // Object Ids, ServantLocator::etherealize may be invoked multiple
-  // times with the same servant when the other objects are
-  // deactivated. It is the responsibility of the object
-  // implementation to refrain from destroying the servant while it is
-  // active with any Id.
-
-  // If the POA has no ServantActivator associated with it, the POA
-  // implementation calls _remove_ref when all operation invocations
-  // have completed. If there is a ServantActivator, the Servant is
-  // consumed by the call to ServantActivator::etherealize instead.
-
-  // First check for a non-zero servant.
-  if (active_object_map_entry->servant_)
-    {
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-      if (this->etherealize_objects_ &&
-          this->cached_policies_.request_processing () == PortableServer::USE_SERVANT_MANAGER &&
-          !CORBA::is_nil (this->servant_activator_.in ()))
-        {
-          CORBA::Boolean remaining_activations =
-            this->active_object_map ().
-            remaining_activations (active_object_map_entry->servant_);
-
-          // A recursive thread lock without using a recursive thread
-          // lock.  Non_Servant_Upcall has a magic constructor and
-          // destructor.  We unlock the Object_Adapter lock for the
-          // duration of the servant activator upcalls; reacquiring
-          // once the upcalls complete.  Even though we are releasing
-          // the lock, other threads will not be able to make progress
-          // since <Object_Adapter::non_servant_upcall_in_progress_>
-          // has been set.
-          TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
-          ACE_UNUSED_ARG (non_servant_upcall);
-
-          // If the cleanup_in_progress parameter is TRUE, the reason
-          // for the etherealize operation is that either the
-          // deactivate or destroy operation was called with an
-          // etherealize_objects parameter of TRUE. If the parameter
-          // is FALSE, the etherealize operation is called for other
-          // reasons.
-          this->servant_activator_->etherealize (active_object_map_entry->user_id_,
-                                                 this,
-                                                 active_object_map_entry->servant_,
-                                                 this->cleanup_in_progress_,
-                                                 remaining_activations
-                                                 ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-      else
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-        {
-          // A recursive thread lock without using a recursive thread
-          // lock.  Non_Servant_Upcall has a magic constructor and
-          // destructor.  We unlock the Object_Adapter lock for the
-          // duration of the servant activator upcalls; reacquiring
-          // once the upcalls complete.  Even though we are releasing
-          // the lock, other threads will not be able to make progress
-          // since <Object_Adapter::non_servant_upcall_in_progress_>
-          // has been set.
-          TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
-          ACE_UNUSED_ARG (non_servant_upcall);
-
-          active_object_map_entry->servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-    }
-
-  // This operation causes the association of the Object Id specified
-  // by the oid parameter and its servant to be removed from the
-  // Active Object Map.
-  int result = this->active_object_map ().
-    unbind_using_user_id (active_object_map_entry->user_id_);
-
-  if (result != 0)
-    {
-      ACE_THROW (CORBA::OBJ_ADAPTER ());
-    }
-}
-
-void
-TAO_POA::check_poa_manager_state (ACE_ENV_SINGLE_ARG_DECL)
-{
-  PortableServer::POAManager::State state = this->poa_manager_.get_state_i ();
-
-  if (state == PortableServer::POAManager::ACTIVE)
-    {
-      // When a POA manager is in the active state, the associated
-      // POAs will receive and start processing requests (assuming
-      // that appropriate thread resources are available).
-      return;
-    }
-
-  if (state == PortableServer::POAManager::DISCARDING)
-    {
-      // When a POA manager is in the discarding state, the associated
-      // POAs will discard all incoming requests (whose processing has
-      // not yet begun). When a request is discarded, the TRANSIENT
-      // system exception, with standard minor code 1, must be
-      // returned to the client-side to indicate that the request
-      // should be re-issued. (Of course, an ORB may always reject a
-      // request for other reasons and raise some other system
-      // exception.)
-      ACE_THROW (
-        CORBA::TRANSIENT (
-          CORBA::SystemException::_tao_minor_code (
-            TAO_POA_DISCARDING,
-            1),
-          CORBA::COMPLETED_NO));
-    }
-
-  if (state == PortableServer::POAManager::HOLDING)
-    {
-      // When a POA manager is in the holding state, the associated
-      // POAs will queue incoming requests. The number of requests
-      // that can be queued is an implementation limit. If this limit
-      // is reached, the POAs may discard requests and return the
-      // TRANSIENT system exception, with standard minor code 1, to
-      // the client to indicate that the client should reissue the
-      // request. (Of course, an ORB may always reject a request for
-      // other reasons and raise some other system exception.)
-
-      // Since there is no queuing in TAO, we immediately raise a
-      // TRANSIENT exception.
-      ACE_THROW (CORBA::TRANSIENT (
-        CORBA::SystemException::_tao_minor_code (
-          TAO_POA_HOLDING,
-          1),
-        CORBA::COMPLETED_NO));
-    }
-
-  if (state == PortableServer::POAManager::INACTIVE)
-    {
-      // The inactive state is entered when the associated POAs are to
-      // be shut down. Unlike the discarding state, the inactive state
-      // is not a temporary state. When a POA manager is in the
-      // inactive state, the associated POAs will reject new
-      // requests. The rejection mechanism used is specific to the
-
-      // vendor. The GIOP location forwarding mechanism and
-      // CloseConnection message are examples of mechanisms that could
-      // be used to indicate the rejection. If the client is
-      // co-resident in the same process, the ORB could raise the
-      // OBJ_ADAPTER system exception, with standard minor code 1, to
-      // indicate that the object implementation is unavailable.
-      ACE_THROW (CORBA::OBJ_ADAPTER (
-        CORBA::SystemException::_tao_minor_code (
-          TAO_POA_INACTIVE,
-          1),
-        CORBA::COMPLETED_NO));
-    }
-}
-
-CORBA::Object_ptr
-TAO_POA::create_reference_i (const char *intf,
-                             CORBA::Short priority
-                             ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
-{
-  // This operation requires the SYSTEM_ID policy; if not present, the
-  // WrongPolicy exception is raised.
-  if (this->cached_policies_.id_assignment () != PortableServer::SYSTEM_ID)
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        CORBA::Object::_nil ());
-    }
-
-  // This operation creates an object reference that encapsulates a
-  // POA-generated Object Id value and the specified interface
-  // repository id. This operation does not cause an activation to
-  // take place. The resulting reference may be passed to clients, so
-  // that subsequent requests on those references will cause the
-  // appropriate servant manager to be invoked, if one is
-  // available. The generated Object Id value may be obtained by
-  // invoking POA::reference_to_id with the created reference.
-
-  PortableServer::ObjectId_var system_id;
-  PortableServer::ObjectId user_id;
-
-  // Do the following if we going to retain this object in the active
-  // object map.
-  if (this->cached_policies_.servant_retention () == PortableServer::RETAIN)
-    {
-      if (this->active_object_map ().
-          bind_using_system_id_returning_system_id (0,
-                                                    priority,
-                                                    system_id.out ()) != 0)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            CORBA::Object::_nil ());
-        }
-
-      // Find user id from system id.
-      if (this->active_object_map ().
-          find_user_id_using_system_id (system_id.in (),
-                                        user_id) != 0)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            CORBA::Object::_nil ());
-        }
-    }
-  else
-    {
-      // Otherwise, it is the NON_RETAIN policy.  Therefore, any ol'
-      // object id will do (even an empty one).
-      PortableServer::ObjectId *sys_id;
-      ACE_NEW_THROW_EX (sys_id,
-                        PortableServer::ObjectId,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-      system_id = sys_id;
-
-      // User id is the same as system id.
-      user_id = system_id.in ();
-    }
-
-  // Remember params for potentially invoking <key_to_object> later.
-  this->key_to_object_params_.set (system_id,
-                                   intf,
-                                   0,
-                                   1,
-                                   priority);
-
-  return this->invoke_key_to_object_helper_i (intf,
-                                              user_id
-                                              ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object_ptr
-TAO_POA::invoke_key_to_object_helper_i (const char * repository_id,
-                                        const PortableServer::ObjectId & id
-                                        ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  const PortableInterceptor::ObjectId &user_oid =
-    reinterpret_cast <const PortableInterceptor::ObjectId &>(id);
-
-  // Ask the ORT to create the object.
-  if (this->ORT_adapter_i ())
-    {
-      // Ask the ORT to create the object.
-      return this->ort_adapter_->make_object (repository_id,
-                                              user_oid
-                                              ACE_ENV_ARG_PARAMETER);
-    }
-  else
-    {
-      return this->invoke_key_to_object (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-}
-
-CORBA::Object_ptr
-TAO_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id,
-                                     const char *intf,
-                                     CORBA::Short priority
-                                     ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
-{
-  // If the POA has the SYSTEM_ID policy and it detects that the
-  // Object Id value was not generated by the system or for this POA,
-  // the create_reference_with_id operation may raise the BAD_PARAM
-  // system exception. An ORB is not required to detect all such
-  // invalid Object Id values, but a portable application must not
-  // invoke this operation on a POA that has the SYSTEM_ID policy with
-  // an Object Id value that was not previously generated by the
-  // system for that POA, or, if the POA also has the PERSISTENT
-  // policy, for a previous instantiation of the same POA.
-  if (this->cached_policies_.id_assignment () == PortableServer::SYSTEM_ID &&
-      !this->is_poa_generated_id (user_id))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                        CORBA::Object::_nil ());
-    }
-
-  // This operation creates an object reference that encapsulates the
-  // specified Object Id and interface repository Id values. This
-  // operation does not cause an activation to take place.  The
-  // resulting reference may be passed to clients, so that subsequent
-  // requests on those references will cause the object to be
-  // activated if necessary, or the default servant used, depending on
-  // the applicable policies.
-
-  PortableServer::Servant servant = 0;
-  PortableServer::ObjectId_var system_id;
-
-  // Do the following if we going to retain this object in the active
-  // object map.
-  if (this->cached_policies_.servant_retention () == PortableServer::RETAIN)
-    {
-      // @@ We need something that can find the system id using
-      // appropriate strategy, at the same time, return the servant if
-      // one is available.  Before we have that function,
-      // <create_reference_with_id_i> basically generates broken
-      // collocated object when DIRECT collocation strategy is used.
-
-      if (this->active_object_map ().
-          find_system_id_using_user_id (user_id,
-                                        priority,
-                                        system_id.out ()) != 0)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            CORBA::Object::_nil ());
-        }
-    }
-  else
-    {
-      // Otherwise, it is the NON_RETAIN policy.  Therefore, user id
-      // is the same as system id.
-      PortableServer::ObjectId *sys_id;
-      ACE_NEW_THROW_EX (sys_id,
-                        PortableServer::ObjectId (user_id),
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-      system_id = sys_id;
-    }
-
-  // Remember params for potentially invoking <key_to_object> later.
-  this->key_to_object_params_.set (system_id,
-                                   intf,
-                                   servant,
-                                   1,
-                                   priority);
-
-  return this->invoke_key_to_object_helper_i (intf,
-                                              user_id
-                                              ACE_ENV_ARG_PARAMETER);
-}
-
-PortableServer::ObjectId *
-TAO_POA::servant_to_id_i (PortableServer::Servant servant
-                          ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  // This operation requires the RETAIN and either the UNIQUE_ID or
-  // IMPLICIT_ACTIVATION policies; or it requires the USE_DEFAULT_SERVANT
-  // policy; if not present, the WrongPolicy exception is raised.
-  if (!(this->cached_policies_.servant_retention () == PortableServer::RETAIN
-        && (this->cached_policies_.id_uniqueness () == PortableServer::UNIQUE_ID
-            || this->cached_policies_.implicit_activation () == PortableServer::IMPLICIT_ACTIVATION))
-      && !(this->cached_policies_.request_processing () == PortableServer::USE_DEFAULT_SERVANT))
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
-    }
-
-  // This operation has four possible behaviors.
-
-  // If the POA has the UNIQUE_ID policy and the specified servant is
-  // active, the Object Id associated with that servant is returned.
-  PortableServer::ObjectId_var user_id;
-  if (this->cached_policies_.id_uniqueness () == PortableServer::UNIQUE_ID &&
-      this->active_object_map ().
-      find_user_id_using_servant (servant,
-                                  user_id.out ()) != -1)
-    {
-      return user_id._retn ();
-    }
-
-  // If the POA has the IMPLICIT_ACTIVATION policy and either the POA
-  // has the MULTIPLE_ID policy or the specified servant is not
-  // active, the servant is activated using a POA-generated Object Id
-  // and the Interface Id associated with the servant, and that Object
-  // Id is returned.
-  if (this->cached_policies_.implicit_activation () == PortableServer::IMPLICIT_ACTIVATION)
-    {
-      // If we reach here, then we either have the MULTIPLE_ID policy
-      // or we have the UNIQUE_ID policy and we are not in the active
-      // object map.
-      PortableServer::ObjectId_var user_id;
-      if (this->active_object_map ().
-          bind_using_system_id_returning_user_id (servant,
-                                                  this->cached_policies_.server_priority (),
-                                                  user_id.out ()) != 0)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            0);
-        }
-
-      //
-      // Everything is finally ok
-      //
-
-      // A recursive thread lock without using a recursive thread
-      // lock.  Non_Servant_Upcall has a magic constructor and
-      // destructor.  We unlock the Object_Adapter lock for the
-      // duration of the servant activator upcalls; reacquiring once
-      // the upcalls complete.  Even though we are releasing the lock,
-      // other threads will not be able to make progress since
-      // <Object_Adapter::non_servant_upcall_in_progress_> has been
-      // set.
-      TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
-      ACE_UNUSED_ARG (non_servant_upcall);
-
-      // If this operation causes the object to be activated, _add_ref
-      // is invoked at least once on the Servant argument before
-      // returning. Otherwise, the POA does not increment or decrement
-      // the reference count of the Servant passed to this function.
-      servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      return user_id._retn ();
-    }
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  // If the POA has the USE_DEFAULT_SERVANT policy, the servant
-  // specified is the default servant, and the operation is being
-  // invoked in he context of executin a request on the default
-  // servant, then the ObjectId associated with the current invocation
-  // is returned.
-  if (this->cached_policies_.request_processing () == PortableServer::USE_DEFAULT_SERVANT)
-    {
-      // Compare the servant specified in the parameter list to the
-      // default servant registered with this POA.
-      PortableServer::Servant default_servant = this->default_servant_.in ();
-      if (default_servant != 0 &&
-          default_servant == servant)
-        {
-          // If they are the same servant, then check if we are in an
-          // upcall.
-          TAO_POA_Current_Impl *poa_current_impl =
-            ACE_static_cast(TAO_POA_Current_Impl *,
-                            TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
-          // If we are in an upcall on the default servant, return the
-          // ObjectId associated with the current invocation.
-          if (poa_current_impl != 0 &&
-              servant == poa_current_impl->servant ())
-            {
-              return poa_current_impl->get_object_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-            }
-        }
-    }
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  // Otherwise, the ServantNotActive exception is raised.
-  ACE_THROW_RETURN (PortableServer::POA::ServantNotActive (),
-                    0);
-}
-
-PortableServer::ObjectId *
-TAO_POA::servant_to_system_id_i (PortableServer::Servant servant,
-                                 CORBA::Short &priority
-                                 ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  // This operation requires the RETAIN and either the UNIQUE_ID or
-  // IMPLICIT_ACTIVATION policies; if not present, the WrongPolicy
-  // exception is raised.
-  if (!(this->cached_policies_.servant_retention () == PortableServer::RETAIN
-        && (this->cached_policies_.id_uniqueness () == PortableServer::UNIQUE_ID
-            || this->cached_policies_.implicit_activation () == PortableServer::IMPLICIT_ACTIVATION)))
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
-    }
-
-  // This operation has three possible behaviors.
-
-  // If the POA has the UNIQUE_ID policy and the specified servant is
-  // active, the Object Id associated with that servant is returned.
-  PortableServer::ObjectId_var system_id;
-  if (this->cached_policies_.id_uniqueness () == PortableServer::UNIQUE_ID &&
-      this->active_object_map ().
-      find_system_id_using_servant (servant,
-                                    system_id.out (),
-                                    priority) != -1)
-    {
-      return system_id._retn ();
-    }
-
-  // If the POA has the IMPLICIT_ACTIVATION policy and either the POA
-  // has the MULTIPLE_ID policy or the specified servant is not
-  // active, the servant is activated using a POA-generated Object Id
-  // and the Interface Id associated with the servant, and that Object
-  // Id is returned.
-  if (this->cached_policies_.implicit_activation () == PortableServer::IMPLICIT_ACTIVATION)
-    {
-      // If we reach here, then we either have the MULTIPLE_ID policy
-      // or we xhave the UNIQUE_ID policy and we are not in the active
-      // object map.
-      PortableServer::ObjectId_var system_id;
-      if (this->active_object_map ().
-          bind_using_system_id_returning_system_id (servant,
-                                                    priority,
-                                                    system_id.out ()) != 0)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            0);
-        }
-
-      //
-      // Everything is finally ok
-      //
-
-      // A recursive thread lock without using a recursive thread
-      // lock.  Non_Servant_Upcall has a magic constructor and
-      // destructor.  We unlock the Object_Adapter lock for the
-      // duration of the servant activator upcalls; reacquiring once
-      // the upcalls complete.  Even though we are releasing the lock,
-      // other threads will not be able to make progress since
-      // <Object_Adapter::non_servant_upcall_in_progress_> has been
-      // set.
-      TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
-      ACE_UNUSED_ARG (non_servant_upcall);
-
-      // If this operation causes the object to be activated, _add_ref
-      // is invoked at least once on the Servant argument before
-      // returning. Otherwise, the POA does not increment or decrement
-      // the reference count of the Servant passed to this function.
-      servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      return system_id._retn ();
-    }
-
-  // Otherwise, the ServantNotActive exception is raised.
-  ACE_THROW_RETURN (PortableServer::POA::ServantNotActive (),
-                    0);
-}
-
-CORBA::Object_ptr
-TAO_POA::servant_to_reference_i (PortableServer::Servant servant
-                                 ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  // Note: The allocation of an Object Id value and installation in
-  // the Active Object Map caused by implicit activation may actually
-  // be deferred until an attempt is made to externalize the
-  // reference. The real requirement here is that a reference is
-  // produced that will behave appropriately (that is, yield a
-  // consistent Object Id value when asked politely).
-  CORBA::Short priority =
-    this->cached_policies_.server_priority ();
-
-  PortableServer::ObjectId_var system_id =
-    this->servant_to_system_id_i (servant,
-                                  priority
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  PortableServer::ObjectId user_id;
-
-  // This operation requires the RETAIN, therefore don't worry about
-  // the NON_RETAIN case.
-  if (this->active_object_map ().
-      find_user_id_using_system_id (system_id.in (),
-                                    user_id) != 0)
-    {
-      ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                        CORBA::Object::_nil ());
-    }
-
-  // Remember params for potentially invoking <key_to_object> later.
-  this->key_to_object_params_.set (system_id,
-                                   servant->_interface_repository_id (),
-                                   servant,
-                                   1,
-                                   priority);
-
-  // Ask the ORT to create the object.
-  // @@NOTE:There is a possible deadlock lurking here. We held the
-  // lock, and we are possibly trying to make a call into the
-  // application code. Think what would happen if the app calls us
-  // back. We need to get to this at some point.
-  return this->invoke_key_to_object_helper_i (servant->_interface_repository_id (),
-                                              user_id
-                                              ACE_ENV_ARG_PARAMETER);
-}
-
-PortableServer::Servant
-TAO_POA::reference_to_servant_i (CORBA::Object_ptr reference
-                                 ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongAdapter,
-                   PortableServer::POA::WrongPolicy))
-{
-  // This operation requires the RETAIN policy or the
-  // USE_DEFAULT_SERVANT policy. If neither policy is present, the
-  // WrongPolicy exception is raised.
-  if (this->cached_policies_.servant_retention () != PortableServer::RETAIN &&
-      this->cached_policies_.request_processing () != PortableServer::USE_DEFAULT_SERVANT)
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
-    }
-
-  // Make sure that the reference is valid.
-  if (CORBA::is_nil (reference))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                        0);
-    }
-
-  // If the POA has the RETAIN policy and the specified object is
-  // present in the Active Object Map, this operation returns the
-  // servant associated with that object in the Active Object Map.
-  PortableServer::Servant servant = 0;
-  int result = -1;
-  if (this->cached_policies_.servant_retention () == PortableServer::RETAIN)
-    {
-      TAO::ObjectKey_var key = reference->_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      // If the object reference was not created by this POA, the
-      // WrongAdapter exception is raised.
-      PortableServer::ObjectId system_id;
-      TAO_Object_Adapter::poa_name poa_system_name;
-      CORBA::Boolean is_root = 0;
-      CORBA::Boolean is_persistent = 0;
-      CORBA::Boolean is_system_id = 0;
-      TAO_Temporary_Creation_Time poa_creation_time;
-
-      int parse_result =
-        this->parse_key (key.in (),
-                         poa_system_name,
-                         system_id,
-                         is_root,
-                         is_persistent,
-                         is_system_id,
-                         poa_creation_time);
-      if (parse_result != 0 ||
-          !this->root () &&
-          poa_system_name != this->system_name () ||
-          is_root != this->root () ||
-          is_persistent != this->persistent () ||
-          is_system_id != this->system_id () ||
-          !this->persistent () &&
-          poa_creation_time != this->creation_time_)
-        {
-          ACE_THROW_RETURN (PortableServer::POA::WrongAdapter (),
-                            0);
-        }
-
-      // Find user id from system id.
-      PortableServer::ObjectId user_id;
-      if (this->active_object_map ().
-          find_user_id_using_system_id (system_id,
-                                        user_id) != 0)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            0);
-        }
-
-      // This operation returns the active servant associated with the
-      // specified system Object Id value.  If the Object Id value is
-      // not active in the POA, an ObjectNotActive exception is
-      // raised.
-      TAO_Active_Object_Map::Map_Entry *entry = 0;
-
-      result =
-        this->active_object_map ().
-        find_servant_using_system_id_and_user_id (system_id,
-                                                  user_id,
-                                                  servant,
-                                                  entry);
-    }
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  else
-    {
-      // Otherwise, if the POA has the USE_DEFAULT_SERVANT policy and
-      // a default servant has been registered with the POA, this
-      // operation returns the default servant.
-      servant =
-        this->default_servant_.in ();
-
-      if (servant == 0)
-        result = -1;
-      else
-        result = 0;
-    }
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  if (result != -1)
-    {
-      // A recursive thread lock without using a recursive thread
-      // lock.  Non_Servant_Upcall has a magic constructor and
-      // destructor.  We unlock the Object_Adapter lock for the
-      // duration of the servant activator upcalls; reacquiring once
-      // the upcalls complete.  Even though we are releasing the lock,
-      // other threads will not be able to make progress since
-      // <Object_Adapter::non_servant_upcall_in_progress_> has been
-      // set.
-      TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
-      ACE_UNUSED_ARG (non_servant_upcall);
-
-      // The POA invokes _add_ref once on the Servant before returning
-      // it. If the application uses reference counting, the caller of
-      // id_to_servant is responsible for invoking _remove_ref once on
-      // the returned Servant when it is finished with it. A
-      // conforming caller need not invoke _remove_ref on the returned
-      // Servant if the type of the Servant uses the default reference
-      // counting inherited from ServantBase.
-      servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      return servant;
-    }
-  else
-    {
-      // Otherwise the ObjectNotActive exception is raised.
-      ACE_THROW_RETURN (PortableServer::POA::ObjectNotActive (),
-                        0);
-    }
-}
-
-PortableServer::ObjectId *
-TAO_POA::reference_to_id (CORBA::Object_ptr reference
-                          ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongAdapter,
-                   PortableServer::POA::WrongPolicy))
-{
-  // Make sure that the reference is valid.
-  if (CORBA::is_nil (reference))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                        0);
-    }
-
-  // The WrongPolicy exception is declared to allow future extensions.
-
-  // This operation returns the Object Id value encapsulated by the
-  // specified reference.
-
-  // This operation is valid only if the reference was created by the
-  // POA on which the operation is being performed.  If the object
-  // reference was not created by this POA, the WrongAdapter exception
-  // is raised.
-  TAO::ObjectKey_var key = reference->_key (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  PortableServer::ObjectId system_id;
-  TAO_Object_Adapter::poa_name poa_system_name;
-  CORBA::Boolean is_root = 0;
-  CORBA::Boolean is_persistent = 0;
-  CORBA::Boolean is_system_id = 0;
-  TAO_Temporary_Creation_Time poa_creation_time;
-
-  int result = this->parse_key (key.in (),
-                                poa_system_name,
-                                system_id,
-                                is_root,
-                                is_persistent,
-                                is_system_id,
-                                poa_creation_time);
-  if (result != 0 ||
-      !this->root () &&
-      poa_system_name != this->system_name () ||
-      is_root != this->root () ||
-      is_persistent != this->persistent () ||
-      is_system_id != this->system_id () ||
-      !this->persistent () &&
-      poa_creation_time != this->creation_time_)
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongAdapter (),
-                        0);
-    }
-
-  // Do the following if we have the RETAIN policy.
-  if (this->cached_policies_.servant_retention () == PortableServer::RETAIN)
-    {
-      // Lock access for the duration of this transaction.
-      TAO_POA_GUARD_RETURN (0);
-
-      // The object denoted by the reference does not have to be
-      // active for this operation to succeed.
-      PortableServer::ObjectId_var user_id;
-      if (this->active_object_map ().
-          find_user_id_using_system_id (system_id,
-                                        user_id.out ()) != 0)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            0);
-        }
-
-      return user_id._retn ();
-    }
-
-  // Otherwise, it is the NON_RETAIN policy.  Therefore, the
-  // system id is the id (and no conversion/transformation is
-  // needed).
-  return new PortableServer::ObjectId (system_id);
-}
-
-PortableServer::Servant
-TAO_POA::id_to_servant_i (const PortableServer::ObjectId &id
-                          ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  // This operation requires the RETAIN policy or the
-  // USE_DEFAULT_SERVANT policy.  If neither policy is present, the
-  // WrongPolicy exception is raised.
-  if (this->cached_policies_.servant_retention () != PortableServer::RETAIN &&
-      this->cached_policies_.request_processing () != PortableServer::USE_DEFAULT_SERVANT)
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        0);
-    }
-
-  // If the POA has the RETAIN policy and the specified ObjectId is in
-  // the Active Object Map, this operation returns the servant
-  // associated with that object in the Active Object Map.
-  PortableServer::Servant servant = 0;
-  int result = -1;
-  if (this->cached_policies_.servant_retention () == PortableServer::RETAIN)
-    {
-      result =
-        this->active_object_map ().
-        find_servant_using_user_id (id,
-                                    servant);
-    }
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  else
-    {
-      // Otherwise, if the POA has the USE_DEFAULT_SERVANT policy and
-      // a default servant has been registered with the POA, this
-      // operation returns the default servant.
-      servant =
-        this->default_servant_.in ();
-
-      if (servant == 0)
-        result = -1;
-      else
-        result = 0;
-    }
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  if (result != -1)
-    {
-      // A recursive thread lock without using a recursive thread
-      // lock.  Non_Servant_Upcall has a magic constructor and
-      // destructor.  We unlock the Object_Adapter lock for the
-      // duration of the servant activator upcalls; reacquiring once
-      // the upcalls complete.  Even though we are releasing the lock,
-      // other threads will not be able to make progress since
-      // <Object_Adapter::non_servant_upcall_in_progress_> has been
-      // set.
-      TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
-      ACE_UNUSED_ARG (non_servant_upcall);
-
-      // The POA invokes _add_ref once on the Servant before returning
-      // it. If the application uses reference counting, the caller of
-      // id_to_servant is responsible for invoking _remove_ref once on
-      // the returned Servant when it is finished with it. A
-      // conforming caller need not invoke _remove_ref on the returned
-      // Servant if the type of the Servant uses the default reference
-      // counting inherited from ServantBase.
-      servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      return servant;
-    }
-  else
-    {
-      // Otherwise the ObjectNotActive exception is raised.
-      ACE_THROW_RETURN (PortableServer::POA::ObjectNotActive (),
-                        0);
-    }
-}
-
-CORBA::Object_ptr
-TAO_POA::id_to_reference_i (const PortableServer::ObjectId &id
-                            ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  // This operation requires the RETAIN policy; if not present, the
-  // WrongPolicy exception is raised.
-  if (this->cached_policies_.servant_retention () != PortableServer::RETAIN)
-    {
-      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
-                        CORBA::Object::_nil ());
-    }
-
-  // If an object with the specified Object Id value is currently
-  // active, a reference encapsulating the information used to
-  // activate the object is returned.
-  PortableServer::ObjectId_var system_id;
-  PortableServer::Servant servant;
-  CORBA::Short priority;
-
-  if (this->active_object_map ().
-      find_servant_and_system_id_using_user_id (id,
-                                                servant,
-                                                system_id.out (),
-                                                priority) == 0)
-    {
-      // Remember params for potentially invoking <key_to_object> later.
-      this->key_to_object_params_.set (system_id,
-                                       servant->_interface_repository_id (),
-                                       servant,
-                                       1,
-                                       priority);
-
-      return this->invoke_key_to_object_helper_i (servant->_interface_repository_id (),
-                                                  id
-                                                  ACE_ENV_ARG_PARAMETER);
-    }
-  else
-    // If the Object Id value is not active in the POA, an
-    // ObjectNotActive exception is raised.
-    {
-      ACE_THROW_RETURN (PortableServer::POA::ObjectNotActive (),
-                        CORBA::Object::_nil ());
-    }
-}
-
-CORBA::OctetSeq *
-TAO_POA::id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return new CORBA::OctetSeq (this->id_);
-}
-
-TAO_SERVANT_LOCATION
-TAO_POA::locate_servant_i (const PortableServer::ObjectId &system_id,
-                           PortableServer::Servant &servant
-                           ACE_ENV_ARG_DECL)
-{
-  // If the POA has the RETAIN policy, the POA looks in the Active
-  // Object Map to find if there is a servant associated with the
-  // Object Id value from the request. If such a servant exists,
-  // return TAO_SERVANT_FOUND.
-  if (this->cached_policies_.servant_retention () == PortableServer::RETAIN)
-    {
-      // Find user id from system id.
-      PortableServer::ObjectId user_id;
-      if (this->active_object_map ().
-          find_user_id_using_system_id (system_id,
-                                        user_id) != 0)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            TAO_SERVANT_NOT_FOUND);
-        }
-
-      TAO_Active_Object_Map::Map_Entry *entry = 0;
-      int result = this->active_object_map ().
-        find_servant_using_system_id_and_user_id (system_id,
-                                                  user_id,
-                                                  servant,
-                                                  entry);
-      if (result == 0)
-        {
-          // Success
-          return TAO_SERVANT_FOUND;
-        }
-    }
-
-  // If the POA has the NON_RETAIN policy or has the RETAIN policy but
-  // didn't find a servant in the Active Object Map, the POA takes the
-  // following actions:
-
-  // If the USE_ACTIVE_OBJECT_MAP_ONLY policy is in effect, the POA raises
-  // the OBJECT_NOT_EXIST system exception.
-  if (this->cached_policies_.request_processing () == PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY)
-    {
-      return TAO_SERVANT_NOT_FOUND;
-    }
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  // If the POA has the USE_DEFAULT_SERVANT policy, a default servant
-  // has been associated with the POA, return TAO_DEFAULT_SERVANT. If
-  // no servant has been associated with the POA, return
-  // TAO_SERVANT_NOT_FOUND.
-  if (this->cached_policies_.request_processing () == PortableServer::USE_DEFAULT_SERVANT)
-    {
-      if (this->default_servant_.in () == 0)
-        {
-          return TAO_SERVANT_NOT_FOUND;
-        }
-      else
-        {
-          // Success
-          return TAO_DEFAULT_SERVANT;
-        }
-    }
-
-  // If the POA has the USE_SERVANT_MANAGER policy, a servant manager
-  // has been associated with the POA, return
-  // TAO_SERVANT_MANAGER. If no servant manager has been
-  // associated with the POA, return TAO_SERVANT_NOT_FOUND.
-  if (this->cached_policies_.request_processing () == PortableServer::USE_SERVANT_MANAGER)
-    {
-      if (CORBA::is_nil (this->servant_activator_.in ()) &&
-          CORBA::is_nil (this->servant_locator_.in ()))
-        {
-          return TAO_SERVANT_NOT_FOUND;
-        }
-      else
-        {
-          // Success
-          return TAO_SERVANT_MANAGER;
-        }
-    }
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  // Failure
-  return TAO_SERVANT_NOT_FOUND;
-}
-
-PortableServer::Servant
-TAO_POA::locate_servant_i (const char *operation,
-                           const PortableServer::ObjectId &system_id,
-                           TAO_Object_Adapter::Servant_Upcall &servant_upcall,
-                           TAO_POA_Current_Impl &poa_current_impl,
-                           int &wait_occurred_restart_call
-                           ACE_ENV_ARG_DECL)
-{
-  // If we have the RETAIN policy, convert/transform from system id to
-  // user id.
-  if (this->cached_policies_.servant_retention () == PortableServer::RETAIN)
-    {
-      if (this->active_object_map ().
-          find_user_id_using_system_id (system_id,
-                                        poa_current_impl.object_id_) != 0)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            0);
-        }
-
-      servant_upcall.user_id (&poa_current_impl.object_id_);
-    }
-  else
-    {
-      // We have the NON_RETAIN policy, user id is the system id.
-
-      // Smartly copy all the data; <poa_current_impl.object_id_> does
-      // not own the data.
-      poa_current_impl.object_id_.replace (system_id.maximum (),
-                                           system_id.length (),
-                                           ACE_const_cast (CORBA::Octet *,
-                                                           system_id.get_buffer ()),
-                                           0);
-
-      servant_upcall.user_id (&system_id);
-    }
-
-  // If the POA has the RETAIN policy, the POA looks in the Active
-  // Object Map to find if there is a servant associated with the
-  // Object Id value from the request. If such a servant exists, the
-  // POA invokes the appropriate method on the servant.
-  if (this->cached_policies_.servant_retention () == PortableServer::RETAIN)
-    {
-      PortableServer::Servant servant = 0;
-      int result = this->active_object_map ().
-        find_servant_using_system_id_and_user_id (system_id,
-                                                  poa_current_impl.object_id (),
-                                                  servant,
-                                                  servant_upcall.active_object_map_entry_);
-
-      if (result == 0)
-        {
-          // Increment the reference count.
-          ++servant_upcall.active_object_map_entry ()->reference_count_;
-
-          // Success
-          return servant;
-        }
-    }
-
-  // If the POA has the NON_RETAIN policy or has the RETAIN policy but
-  // didn't find a servant in the Active Object Map, the POA takes the
-  // following actions:
-
-  // If the USE_ACTIVE_OBJECT_MAP_ONLY policy is in effect, the POA raises
-  // the OBJECT_NOT_EXIST system exception.
-  if (this->cached_policies_.request_processing () == PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY)
-    {
-      ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
-                        0);
-    }
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  // If the POA has the USE_DEFAULT_SERVANT policy, a default servant
-  // has been associated with the POA so the POA will invoke the
-  // appropriate method on that servant. If no servant has been
-  // associated with the POA, the POA raises the OBJ_ADAPTER system
-  // exception.
-  if (this->cached_policies_.request_processing () == PortableServer::USE_DEFAULT_SERVANT)
-    {
-      PortableServer::Servant result = this->default_servant_.in ();
-      if (result == 0)
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            0);
-        }
-      else
-        {
-          // Success
-          return result;
-        }
-    }
-
-  // If the POA has the USE_SERVANT_MANAGER policy, a servant manager
-  // has been associated with the POA so the POA will invoke incarnate
-  // or preinvoke on it to find a servant that may handle the
-  // request. (The choice of method depends on the NON_RETAIN or
-  // RETAIN policy of the POA.) If no servant manager has been
-  // associated with the POA, the POA raises the OBJ_ADAPTER system
-  // exception.
-  //
-  // If a servant manager is located and invoked, but the servant
-  // manager is not directly capable of incarnating the object, it
-  // (the servant manager) may deal with the circumstance in a variety
-  // of ways, all of which are the application's responsibility.  Any
-  // system exception raised by the servant manager will be returned
-  // to the client in the reply. In addition to standard CORBA
-  // exceptions, a servant manager is capable of raising a
-  // ForwardRequest exception. This exception includes an object
-  // reference.
-  //
-  if (this->cached_policies_.request_processing () == PortableServer::USE_SERVANT_MANAGER)
-    {
-      if (CORBA::is_nil (this->servant_activator_.in ()) &&
-          CORBA::is_nil (this->servant_locator_.in ()))
-        {
-          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                            0);
-        }
-
-      PortableServer::Servant servant = 0;
-      if (this->cached_policies_.servant_retention () == PortableServer::RETAIN)
-        {
-          {
-            // A recursive thread lock without using a recursive
-            // thread lock.  Non_Servant_Upcall has a magic
-            // constructor and destructor.  We unlock the
-            // Object_Adapter lock for the duration of the servant
-            // activator upcalls; reacquiring once the upcalls
-            // complete.  Even though we are releasing the lock, other
-            // threads will not be able to make progress since
-            // <Object_Adapter::non_servant_upcall_in_progress_> has
-            // been set.
-            TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
-            ACE_UNUSED_ARG (non_servant_upcall);
-
-            // @@
-            // Invocations of incarnate on the servant manager are serialized.
-            // Invocations of etherealize on the servant manager are serialized.
-            // Invocations of incarnate and etherealize on the servant manager are mutually exclusive.
-            servant = this->servant_activator_->incarnate (poa_current_impl.object_id (),
-                                                           this
-                                                           ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK_RETURN (0);
-
-            if (servant == 0)
-              {
-                ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                                  0);
-              }
-          }
-
-          int error = 0;
-
-          // If the incarnate operation returns a servant that is
-          // already active for a different Object Id and if the POA
-          // also has the UNIQUE_ID policy, the incarnate has violated
-          // the POA policy and is considered to be in error. The POA
-          // will raise an OBJ_ADAPTER system exception for the
-          // request.
-          if (this->cached_policies_.id_uniqueness () == PortableServer::UNIQUE_ID)
-            {
-              int result =
-                this->is_servant_in_map (servant,
-                                         wait_occurred_restart_call);
-              if (result)
-                error = 1;
-            }
-
-          // The POA enters the returned Servant value into the Active
-          // Object Map so that subsequent requests with the same
-          // ObjectId value will be delivered directly to that servant
-          // without invoking the servant manager.  Only run if there
-          // are no errors or if a restart is not required.
-          if (!error && !wait_occurred_restart_call)
-            {
-              int result = this->active_object_map ().
-                rebind_using_user_id_and_system_id (servant,
-                                                    poa_current_impl.object_id (),
-                                                    system_id,
-                                                    servant_upcall.active_object_map_entry_);
-              if (result != 0)
-                error = 1;
-            }
-
-          // If error occurred or a restart is required, etherealize
-          // the incarnated servant.
-          if (error || wait_occurred_restart_call)
-            {
-              CORBA::Boolean remaining_activations =
-                this->active_object_map ().remaining_activations (servant);
-
-              // A recursive thread lock without using a recursive
-              // thread lock.  Non_Servant_Upcall has a magic
-              // constructor and destructor.  We unlock the
-              // Object_Adapter lock for the duration of the servant
-              // activator upcalls; reacquiring once the upcalls
-              // complete.  Even though we are releasing the lock,
-              // other threads will not be able to make progress since
-              // <Object_Adapter::non_servant_upcall_in_progress_> has
-              // been set.
-              TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
-              ACE_UNUSED_ARG (non_servant_upcall);
-
-              CORBA::Boolean cleanup_in_progress = 0;
-              this->servant_activator_->etherealize (poa_current_impl.object_id (),
-                                                     this,
-                                                     servant,
-                                                     cleanup_in_progress,
-                                                     remaining_activations
-                                                     ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK_RETURN (0);
-
-              // If error, throw exception.
-              if (error)
-                {
-                  ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                                    0);
-                }
-              else
-                {
-                  // We ended up waiting on a condition variable, the
-                  // POA state may have changed while we are waiting.
-                  // Therefore, we need to restart this call.
-                  return 0;
-                }
-            }
-          else
-            {
-              // Increment the reference count.
-              ++servant_upcall.active_object_map_entry ()->reference_count_;
-
-              // Success
-              return servant;
-            }
-        }
-      else
-        //
-        // Don't retain servant
-        //
-        {
-          // No serialization of invocations of preinvoke or
-          // postinvoke may be assumed; there may be multiple
-          // concurrent invocations of preinvoke for the same
-          // ObjectId.
-          //
-          // The same thread will be used to preinvoke the object,
-          // process the request, and postinvoke the object.
-
-          // @@ Note that it is possible for some other thread to
-          // reset the servant locator once the lock is released.
-          // However, this possiblility also exists for postinvoke()
-          // which is also called outside the lock.
-
-          // Release the object adapter lock.
-          this->object_adapter_->lock ().release ();
-
-          // We have release the object adapater lock.  Record this
-          // for later use.
-          servant_upcall.state (TAO_Object_Adapter::Servant_Upcall::OBJECT_ADAPTER_LOCK_RELEASED);
-
-          PortableServer::ServantLocator::Cookie cookie = 0;
-          PortableServer::Servant servant =
-            this->servant_locator_->preinvoke (poa_current_impl.object_id (),
-                                               this,
-                                               operation,
-                                               cookie
-                                               ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (0);
-
-          if (servant == 0)
-            {
-              ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                                0);
-            }
-
-          // Remember to invoke <postinvoke>
-          servant_upcall.using_servant_locator ();
-
-          // Remember the cookie
-          servant_upcall.locator_cookie (cookie);
-
-          // Remember operation name.
-          servant_upcall.operation (operation);
-
-          // Success
-          return servant;
-        }
-    }
-#else
-  ACE_UNUSED_ARG (operation);
-  ACE_UNUSED_ARG (wait_occurred_restart_call);
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  // Failure
-  ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
-                    0);
-}
-
-/* static */
-int
-TAO_POA::parse_key (const TAO::ObjectKey &key,
-                    TAO_Object_Adapter::poa_name &poa_system_name,
-                    PortableServer::ObjectId &system_id,
-                    CORBA::Boolean &is_root,
-                    CORBA::Boolean &is_persistent,
-                    CORBA::Boolean &is_system_id,
-                    TAO_Temporary_Creation_Time &poa_creation_time)
-{
-  // Start at zero.
-  CORBA::ULong starting_at = 0;
-
-  // Get the object key octets.
-  const CORBA::Octet *key_data = key.get_buffer ();
-
-  // Skip the object key prefix since we have already checked for
-  // this.
-  starting_at += TAO_OBJECTKEY_PREFIX_SIZE;
-
-  // Check the root indicator.
-  char root_key_type = key_data[starting_at];
-  if (root_key_type == TAO_POA::root_key_char ())
-    {
-      is_root = 1;
-    }
-  else if (root_key_type == TAO_POA::non_root_key_char ())
-    {
-      is_root = 0;
-    }
-  else
-    {
-      // Incorrect key
-      return -1;
-    }
-
-  // Skip past the system id indicator
-  starting_at += TAO_POA::root_key_type_length ();
-
-  // Check the system id indicator.
-  char system_id_key_type = key_data[starting_at];
-  if (system_id_key_type == TAO_POA::system_id_key_char ())
-    {
-      is_system_id = 1;
-    }
-  else if (system_id_key_type == TAO_POA::user_id_key_char ())
-    {
-      is_system_id = 0;
-    }
-  else
-    {
-      // Incorrect key
-      return -1;
-    }
-
-  // Skip past the system id indicator
-  starting_at += TAO_POA::system_id_key_type_length ();
-
-  // Check the persistence indicator
-  char persistent_key_type = key_data[starting_at];
-  if (persistent_key_type == TAO_POA::persistent_key_char ())
-    {
-      is_persistent = 1;
-    }
-  else if (persistent_key_type == TAO_POA::transient_key_char ())
-    {
-      is_persistent = 0;
-    }
-  else
-    {
-      // Incorrect key
-      return -1;
-    }
-
-  // Skip past the persistent indicator
-  starting_at += TAO_POA::persistent_key_type_length ();
-
-#if (POA_NO_TIMESTAMP == 0)
-  // Grab the timestamp for transient POAs.
-  if (!is_persistent)
-    {
-      // Take the creation time for the timestamp
-      poa_creation_time.creation_time (key_data + starting_at);
-
-      // Skip past the timestamp
-      starting_at += TAO_Creation_Time::creation_time_length ();
-    }
-#else
-  ACE_UNUSED_ARG (poa_creation_time);
-#endif /* POA_NO_TIMESTAMP */
-
-  // Calculate the size of the POA name.
-  CORBA::ULong poa_name_size = 0;
-  if (!is_persistent)
-    {
-      // Transient POAs have fixed size.
-      poa_name_size = TAO_Object_Adapter::transient_poa_name_size ();
-    }
-  else if (is_system_id)
-    {
-      // System ids have fixed size.
-      poa_name_size = ACE_static_cast (CORBA::ULong,
-                                       key.length () - starting_at -
-                                       TAO_Active_Object_Map::system_id_size ());
-    }
-  else
-    {
-      // Get the size from the object key.
-      ACE_OS::memcpy (&poa_name_size,
-                      key_data + starting_at,
-                      sizeof (poa_name_size));
-      poa_name_size = ACE_NTOHL (poa_name_size);
-
-      starting_at += sizeof (poa_name_size);
-    }
-
-  // For non-root POAs, grab their name.
-  if (!is_root)
-    {
-      poa_system_name.replace (poa_name_size,
-                               poa_name_size,
-                               (CORBA::Octet *) key_data + starting_at,
-                               0);
-
-      starting_at += poa_name_size;
-    }
-
-  // The rest is the system id.
-  CORBA::ULong system_id_size = key.length () - starting_at;
-
-  // Reset <system_id>.
-  system_id.replace (system_id_size,
-                     system_id_size,
-                     (CORBA::Octet *) key_data + starting_at,
-                     0);
-
-  // Success
-  return 0;
-}
-
-TAO::ObjectKey *
-TAO_POA::create_object_key (const PortableServer::ObjectId &id)
-{
-  // Calculate the space required for the key.
-  CORBA::ULong buffer_size =
-    this->id_.length () +
-    id.length ();
-
-  // Create the buffer for the key.
-  CORBA::Octet *buffer = TAO::ObjectKey::allocbuf (buffer_size);
-
-  // First copy the POA id into the key.
-  ACE_OS::memcpy (&buffer[0],
-                  this->id_.get_buffer (),
-                  this->id_.length ());
-
-  // Then copy the object id into the key.
-  ACE_OS::memcpy (&buffer[this->id_.length ()],
-                  id.get_buffer (),
-                  id.length ());
-
-  // Create the key, giving the ownership of the buffer to the
-  // sequence.
-  TAO::ObjectKey *key = 0;
-  ACE_NEW_RETURN (key,
-                  TAO::ObjectKey (buffer_size,
-                                 buffer_size,
-                                 buffer,
-                                 1),
-                  0);
-
-  return key;
-}
-
-void
-TAO_POA::set_id (void)
-{
-  // Calculate the prefix size.
-  CORBA::ULong prefix_size = 0;
-  prefix_size += TAO_OBJECTKEY_PREFIX_SIZE;
-
-  // If we are dealing with a persistent POA and user ids are being
-  // used, then we need to add the POA name length field to the object
-  // key. Otherwise, the POA name length can be calculated by looking
-  // at the remainder after extracting other parts of the key.
-  int add_poa_name_length =
-    this->persistent () &&
-    !this->system_id ();
-
-  // Size required by the POA name.
-  CORBA::ULong poa_name = 0;
-
-  // Calculate the space required for the POA name.
-  CORBA::ULong poa_name_length = this->system_name_->length ();
-  if (!this->root ())
-    {
-      poa_name += poa_name_length;
-    }
-
-  // Check if we need to added the length of the POA name.
-  if (add_poa_name_length)
-    {
-      poa_name += sizeof (poa_name_length);
-    }
-
-  // Calculate the space required for the timestamp and the persistent
-  // byte.
-  CORBA::ULong creation_time = this->persistent_key_type_length ();
-#if (POA_NO_TIMESTAMP == 0)
-  // Calculate the space required for the timestamp.
-  CORBA::ULong creation_time_length = TAO_Creation_Time::creation_time_length ();
-  if (!this->persistent ())
-    {
-      creation_time += creation_time_length;
-    }
-#endif /* POA_NO_TIMESTAMP */
-
-  // Calculate the space required for the POA id.
-  CORBA::ULong buffer_size =
-    prefix_size +
-    this->root_key_type_length () +
-    this->system_id_key_type_length () +
-    creation_time +
-    poa_name;
-
-  // Create the buffer for the POA id.
-  this->id_.length (buffer_size);
-  CORBA::Octet *buffer = &this->id_[0];
-
-  // Keeps track of where the next infomation goes; start at 0 byte.
-  CORBA::ULong starting_at = 0;
-
-  // Add the object key prefix.
-  ACE_OS::memcpy (&buffer[starting_at],
-                  &objectkey_prefix[0],
-                  TAO_OBJECTKEY_PREFIX_SIZE);
-
-  starting_at += TAO_OBJECTKEY_PREFIX_SIZE;
-
-  // Copy the root byte.
-  buffer[starting_at] = (CORBA::Octet) this->root_key_type ();
-  starting_at += this->root_key_type_length ();
-
-  // Copy the system id byte.
-  buffer[starting_at] = (CORBA::Octet) this->system_id_key_type ();
-  starting_at += this->system_id_key_type_length ();
-
-  // Copy the persistence byte.
-  buffer[starting_at] = (CORBA::Octet) this->persistent_key_type ();
-  starting_at += this->persistent_key_type_length ();
-
-#if (POA_NO_TIMESTAMP == 0)
-  // Then copy the timestamp for transient POAs.
-  if (!this->persistent ())
-    {
-      ACE_OS::memcpy (&buffer[starting_at],
-                      this->creation_time_.creation_time (),
-                      creation_time_length);
-      starting_at += creation_time_length;
-    }
-#endif /* POA_NO_TIMESTAMP */
-
-  // Check if we need to added the length of the POA name.
-  if (add_poa_name_length)
-    {
-      poa_name_length = ACE_HTONL (poa_name_length);
-      ACE_OS::memcpy (&buffer[starting_at],
-                      &poa_name_length,
-                      sizeof (poa_name_length));
-      starting_at += sizeof (poa_name_length);
-    }
-
-  // Put the POA name into the key (for non-root POAs).
-  if (!this->root ())
-    {
-      ACE_OS::memcpy (&buffer[starting_at],
-                      this->system_name_->get_buffer (),
-                      this->system_name_->length ());
-      starting_at += this->system_name_->length ();
-    }
-}
-
-int
-TAO_POA::is_poa_generated_id (const PortableServer::ObjectId &id)
-{
-
-#if defined (POA_NAME_IN_POA_GENERATED_ID)
-
-  // Grab the buffer
-  const char *id_buffer = (const char *) id.get_buffer ();
-
-  // Check to see if the POA name is the first part of the id
-  return
-    this->name_.length () < id.length () &&
-    ACE_OS::strncmp (id_buffer,
-                     this->name_.c_str (),
-                     this->name_.length ()) == 0;
-
-#else /* POA_NAME_IN_POA_GENERATED_ID */
-
-  ACE_UNUSED_ARG (id);
-  return 1;
-
-#endif /* POA_NAME_IN_POA_GENERATED_ID */
-}
-
-void
-TAO_POA::set_folded_name (void)
-{
-  size_t length = 0;
-  size_t parent_length = 0;
-
-  if (this->parent_ != 0)
-    {
-      parent_length = this->parent_->folded_name ().length ();
-      length += parent_length;
-    }
-
-  length += this->name_.length ();
-  length += TAO_POA::name_separator_length ();
-
-  this->folded_name_.length (ACE_static_cast (CORBA::ULong, length));
-  CORBA::Octet *folded_name_buffer = this->folded_name_.get_buffer ();
-
-  if (this->parent_ != 0)
-    {
-      ACE_OS::memcpy (folded_name_buffer,
-                      this->parent_->folded_name ().get_buffer (),
-                      parent_length);
-    }
-
-  ACE_OS::memcpy (&folded_name_buffer[parent_length],
-                  this->name_.c_str (),
-                  this->name_.length ());
-
-  folded_name_buffer[length - TAO_POA::name_separator_length ()] = TAO_POA::name_separator ();
-}
-
-PortableServer::ObjectId *
-TAO_POA::string_to_ObjectId (const char *string)
-{
-  // Size of string
-  //
-  // We DO NOT include the zero terminator, as this is simply an
-  // artifact of the way strings are stored in C.
-  //
-  CORBA::ULong buffer_size = ACE_static_cast (CORBA::ULong,
-                                              ACE_OS::strlen (string));
-
-  // Create the buffer for the Id
-  CORBA::Octet *buffer = PortableServer::ObjectId::allocbuf (buffer_size);
-
-  // Copy the contents
-  ACE_OS::memcpy (buffer, string, buffer_size);
-
-  // Create and return a new ID
-  PortableServer::ObjectId *id = 0;
-  ACE_NEW_RETURN (id,
-                  PortableServer::ObjectId (buffer_size,
-                                            buffer_size,
-                                            buffer,
-                                            1),
-                  0);
-
-  return id;
-}
-
-PortableServer::ObjectId *
-TAO_POA::string_to_ObjectId (const char *string,
-                             int size)
-{
-  // Create the buffer for the Id
-  CORBA::Octet *buffer = PortableServer::ObjectId::allocbuf (size);
-
-  // Copy the contents
-  ACE_OS::memcpy (buffer, string, size);
-
-  // Create and return a new ID
-  PortableServer::ObjectId *id = 0;
-  ACE_NEW_RETURN (id,
-                  PortableServer::ObjectId (size,
-                                            size,
-                                            buffer,
-                                            1),
-                  0);
-
-  return id;
-}
-
-PortableServer::ObjectId *
-TAO_POA::wstring_to_ObjectId (const CORBA::WChar *string)
-{
-  // Size of Id
-  //
-  // We DO NOT include the zero terminator, as this is simply an
-  // artifact of the way strings are stored in C.
-  //
-  CORBA::ULong string_length = ACE_OS::wslen (string);
-
-  CORBA::ULong buffer_size = string_length * sizeof (CORBA::WChar);
-
-  // Create the buffer for the Id
-  CORBA::Octet *buffer = PortableServer::ObjectId::allocbuf (buffer_size);
-
-  // Copy contents
-  ACE_OS::memcpy (buffer, string, buffer_size);
-
-  // Create a new ID
-  PortableServer::ObjectId *id = 0;
-  ACE_NEW_RETURN (id,
-                  PortableServer::ObjectId (buffer_size,
-                                            buffer_size,
-                                            buffer,
-                                            1),
-                  0);
-
-  return id;
-}
-
-char *
-TAO_POA::ObjectId_to_string (const PortableServer::ObjectId &id)
-{
-  // Create space
-  char * string = CORBA::string_alloc (id.length ());
-
-  // Copy the data
-  ACE_OS::memcpy (string, id.get_buffer (), id.length ());
-
-  // Null terminate the string
-  string[id.length ()] = '\0';
-
-  // Return string
-  return string;
-}
-
-CORBA::WChar *
-TAO_POA::ObjectId_to_wstring (const PortableServer::ObjectId &id)
-{
-  // Compute resulting wide string's length.
-  CORBA::ULong string_length =
-    id.length () / sizeof (CORBA::WChar) + 1;
-
-  // Allocate an extra slot if the id's length is not "aligned" on a
-  // CORBA::WChar.
-  if (id.length () % sizeof (CORBA::WChar))
-    string_length++;
-
-  // Create space.
-  CORBA::WChar* string = CORBA::wstring_alloc (string_length);
-
-  // Copy the data
-  ACE_OS::memcpy (string,
-                  id.get_buffer (),
-                  id.length ());
-
-  // Null terminate the string
-  string[string_length] = '\0';
-
-  // Return string.
-  return string;
-}
-
-int
-TAO_POA::parse_ir_object_key (const TAO::ObjectKey &object_key,
-                              PortableServer::ObjectId &user_id)
-{
-  TAO_Object_Adapter::poa_name poa_system_name;
-  CORBA::Boolean is_root = 0;
-  CORBA::Boolean is_persistent = 0;
-  CORBA::Boolean is_system_id = 0;
-  TAO_Temporary_Creation_Time poa_creation_time;
-
-  return TAO_POA::parse_key (object_key,
-                             poa_system_name,
-                             user_id,
-                             is_root,
-                             is_persistent,
-                             is_system_id,
-                             poa_creation_time);
-}
-
-TAO_Object_Adapter &
-TAO_POA::object_adapter (void)
-{
-  return *this->object_adapter_;
-}
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-TAO_Adapter_Activator::TAO_Adapter_Activator (PortableServer::POAManager_ptr poa_manager)
-  : poa_manager_ (PortableServer::POAManager::_duplicate (poa_manager))
-{
-}
-
-CORBA::Boolean
-TAO_Adapter_Activator::unknown_adapter (PortableServer::POA_ptr parent,
-                                        const char *name
-                                        ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Default policies
-  CORBA::PolicyList default_policies;
-
-  // This assumes that the lock on the parent is recursive
-  PortableServer::POA_var child = parent->create_POA (name,
-                                                      this->poa_manager_.in (),
-                                                      default_policies
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  ACE_TRY
-    {
-      child->the_activator (this ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      child->destroy (1,
-                      1
-                      ACE_ENV_ARG_PARAMETER);
-
-      return 0;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-
-  // Finally everything is fine
-  return 1;
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-CORBA::Object_ptr
-TAO_POA::invoke_key_to_object (ACE_ENV_SINGLE_ARG_DECL)
-{
-  PortableServer::ObjectId_var &system_id =
-    *this->key_to_object_params_.system_id_;
-
-  // Create object key.
-  TAO::ObjectKey_var key =
-    this->create_object_key (system_id.in ());
-
-  return this->key_to_object (key.in (),
-                              this->key_to_object_params_.type_id_,
-                              this->key_to_object_params_.servant_,
-                              this->key_to_object_params_.collocated_,
-                              this->key_to_object_params_.priority_
-                              ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Object_ptr
-TAO_POA::key_to_object (const TAO::ObjectKey &key,
-                        const char *type_id,
-                        TAO_ServantBase *servant,
-                        CORBA::Boolean collocated,
-                        CORBA::Short priority
-                        ACE_ENV_ARG_DECL)
-{
-  // Check if the ORB is still running, otherwise throw an exception.
-  // @@ What if the ORB was destroyed?  In that case we shouldn't even
-  //    get here!
-  this->orb_core_.check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  //
-  // ImplRepo related.
-  //
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-  CORBA::Object_ptr obj = CORBA::Object::_nil ();
-
-  if (this->use_imr_
-      && this->cached_policies_.lifespan () == PortableServer::PERSISTENT)
-    {
-      // Check to see if we alter the IOR.
-      CORBA::Object_var imr =
-        this->orb_core ().implrepo_service ();
-
-      if (CORBA::is_nil (imr.in ())
-          || !imr->_stubobj ()
-          || !imr->_stubobj ()->profile_in_use ())
-        {
-          if (TAO_debug_level > 1)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          "Missing ImR IOR, will not use the ImR\n"));
-            }
-          goto orbkey;
-        }
-
-      CORBA::String_var imr_str =
-        imr->_stubobj ()->profile_in_use ()->to_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (obj);
-
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "IMR IOR = \n%s\n",
-                    ACE_TEXT_CHAR_TO_TCHAR (imr_str.in ())));
-
-      // Search for "corbaloc:" alone, without the protocol.  This code
-      // should be protocol neutral.
-      const char corbaloc[] = "corbaloc:";
-      char *pos = ACE_OS::strstr (imr_str.inout (), corbaloc);
-      pos = ACE_OS::strchr (pos + sizeof (corbaloc), ':');
-
-      pos = ACE_OS::strchr (pos + 1,
-                            imr->_stubobj ()->profile_in_use ()->object_key_delimiter ());
-
-      if (pos)
-        pos[1] = 0;  // Crop the string.
-      else
-        {
-          if (TAO_debug_level > 0)
-            ACE_ERROR ((LM_ERROR,
-                        "Could not parse ImR IOR, skipping ImRification\n"));
-          goto orbkey;
-        }
-
-      ACE_CString ior (imr_str.in ());
-
-      // Add the key.
-
-      CORBA::String_var key_str;
-      TAO::ObjectKey::encode_sequence_to_string (key_str.inout (), key);
-
-      ior += key_str.in ();
-
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    "ImR-ified IOR = \n%s\n",
-                    ACE_TEXT_CHAR_TO_TCHAR (ior.c_str ())));
-
-      obj =
-        this->orb_core_.orb ()->string_to_object (ior.c_str ()
-                                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (obj);
-
-      return obj;
-    }
-
-orbkey:
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-  TAO_Stub *data =
-    this->key_to_stub_i (key, type_id, priority ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-
-  TAO_Stub_Auto_Ptr safe_data (data);
-
-  CORBA::Object_ptr tmp;
-
-  if (this->orb_core_.optimize_collocation_objects ())
-    {
-      ACE_NEW_THROW_EX (tmp, CORBA::Object (data,
-                                            collocated,
-                                            servant),
-                        CORBA::INTERNAL ());
-
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
-    }
-  else
-    {
-      ACE_NEW_THROW_EX (tmp,
-                        CORBA::Object (data,
-                                       collocated),
-                        CORBA::INTERNAL ());
-      ACE_CHECK_RETURN (CORBA::Object::_nil ());
-    }
-
-  data->servant_orb (this->orb_core_.orb ());
-
-  // Transfer ownership to the Object.
-  (void) safe_data.release ();
-
-  return tmp;
-}
-
-TAO_Stub *
-TAO_POA::key_to_stub (const TAO::ObjectKey &key,
-                      const char *type_id,
-                      CORBA::Short priority
-                      ACE_ENV_ARG_DECL)
-{
-  // Check if the ORB is still running, otherwise throw an exception.
-  // @@ What if the ORB was destroyed?  In that case we shouldn't even
-  //    get here!
-  this->orb_core_.check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return this->key_to_stub_i (key, type_id, priority ACE_ENV_ARG_PARAMETER);
-}
-
-TAO_Stub *
-TAO_POA::key_to_stub_i (const TAO::ObjectKey &key,
-                        const char *type_id,
-                        CORBA::Short priority
-                        ACE_ENV_ARG_DECL)
-{
-  CORBA::PolicyList_var client_exposed_policies =
-    this->client_exposed_policies (priority
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  TAO_Default_Acceptor_Filter filter;
-  TAO_Stub *data =
-    this->create_stub_object (
-      key,
-      type_id,
-      client_exposed_policies._retn (),
-      &filter,
-      this->orb_core_.lane_resources ().acceptor_registry ()
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return data;
-}
-
-void
-TAO_POA::establish_components (ACE_ENV_SINGLE_ARG_DECL)
-{
-  TAO_IORInterceptor_Adapter *ior_adapter =
-    this->orb_core_.ior_interceptor_adapter ();
-
-  if (ior_adapter)
-    {
-      ior_adapter->establish_components (this ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-void
-TAO_POA::components_established (PortableInterceptor::IORInfo_ptr info
-                                 ACE_ENV_ARG_DECL)
-{
-  TAO_IORInterceptor_Adapter *ior_adapter =
-    this->orb_core_.ior_interceptor_adapter ();
-
-  if (ior_adapter)
-    {
-      ior_adapter->components_established (info ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-void
-TAO_POA::save_ior_component (const IOP::TaggedComponent &component
-                             ACE_ENV_ARG_DECL_NOT_USED)
-{
-  const CORBA::ULong old_len = this->tagged_component_.length ();
-
-  this->tagged_component_.length (old_len + 1);
-  this->tagged_component_[old_len] = component;
-}
-
-void
-TAO_POA::
-save_ior_component_and_profile_id (const IOP::TaggedComponent &component,
-                                   IOP::ProfileId profile_id
-                                   ACE_ENV_ARG_DECL_NOT_USED)
-{
-  // The length of this->tagged_component_id_ is the same as the
-  // length of the profile_id_array_ since we are trying to make a
-  // one-to-one link between these two arrays. So, whenever
-  // this->tagged_component_id_ is increased, we need to increase the
-  // size of this->profile_id_array_ also.
-
-  const CORBA::ULong old_len = this->tagged_component_id_.length ();
-
-  const CORBA::ULong new_len = old_len + 1;
-
-  this->tagged_component_id_.length (new_len);
-  this->tagged_component_id_[old_len] = component;
-
-  this->profile_id_array_.size (new_len);
-  this->profile_id_array_[old_len] = profile_id;
-}
-
-TAO_Stub *
-TAO_POA::create_stub_object (const TAO::ObjectKey &object_key,
-                             const char *type_id,
-                             CORBA::PolicyList *policy_list,
-                             TAO_Acceptor_Filter *filter,
-                             TAO_Acceptor_Registry &acceptor_registry
-                             ACE_ENV_ARG_DECL)
-{
-  int error = 0;
-
-  // Count the number of endpoints.
-  size_t profile_count =
-    acceptor_registry.endpoint_count ();
-
-  // Create a profile container and have acceptor registries populate
-  // it with profiles as appropriate.
-  TAO_MProfile mprofile (0);
-
-  // Allocate space for storing the profiles.  There can never be more
-  // profiles than there are endpoints.  In some cases, there can be
-  // less profiles than endpoints.
-  int result =
-    mprofile.set (ACE_static_cast (CORBA::ULong, profile_count));
-  if (result == -1)
-    error = 1;
-
-  if (!error)
-    {
-      result =
-        filter->fill_profile (object_key,
-                              mprofile,
-                              acceptor_registry.begin (),
-                              acceptor_registry.end ());
-      if (result == -1)
-        error = 1;
-    }
-
-  if (!error)
-    result = filter->encode_endpoints (mprofile);
-  if (result == -1)
-    error = 1;
-
-  if (error)
-    ACE_THROW_RETURN (CORBA::INTERNAL (
-                        CORBA::SystemException::_tao_minor_code (
-                          TAO_MPROFILE_CREATION_ERROR,
-                          0),
-                        CORBA::COMPLETED_NO),
-                      0);
-
-  // Make sure we have at least one profile.  <mp> may end up being
-  // empty if none of the acceptor endpoints have the right priority
-  // for this object, for example.
-  if (mprofile.profile_count () == 0)
-    ACE_THROW_RETURN (CORBA::BAD_PARAM (
-                        CORBA::SystemException::_tao_minor_code (
-                          TAO_MPROFILE_CREATION_ERROR,
-                          0),
-                        CORBA::COMPLETED_NO),
-                      0);
-
-  TAO_Stub *stub =
-    this->orb_core_.create_stub_object (mprofile,
-                                        type_id,
-                                        policy_list
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // Add the saved tagged components methods to the profiles.
-  CORBA::ULong len = this->tagged_component_.length ();
-  for (CORBA::ULong i = 0; i != len; ++i)
-    {
-      this->add_ior_component (mprofile,
-                               this->tagged_component_[i]
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-      }
-
-  len = this->tagged_component_id_.length ();
-
-  for (CORBA::ULong k = 0; k != len; ++k)
-    {
-      this->add_ior_component_to_profile (mprofile,
-                                          this->tagged_component_id_[k],
-                                          this->profile_id_array_[k]
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-    }
-
-  return stub;
-}
-
-CORBA::PolicyList *
-TAO_POA::client_exposed_policies (CORBA::Short /* object_priority */
-                                  ACE_ENV_ARG_DECL)
-{
-  CORBA::PolicyList *client_exposed_policies = 0;
-  ACE_NEW_THROW_EX (client_exposed_policies,
-                    CORBA::PolicyList (),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (0);
-
-  CORBA::PolicyList_var policies = client_exposed_policies;
-
-  // Add in all of the client exposed policies.
-  this->policies_.add_client_exposed_fixed_policies (client_exposed_policies
-                                                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return policies._retn ();
-}
-
-//
-// ImplRepo related.
-//
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-void
-TAO_POA::imr_notify_startup (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "Notifying ImR of startup\n"));
-
-  CORBA::Object_var imr = this->orb_core ().implrepo_service ();
-
-  if (CORBA::is_nil (imr.in ()))
-      return;
-
-  ImplementationRepository::Administration_var imr_locator;
-  {
-        // A recursive thread lock without using a recursive thread lock.
-        // Non_Servant_Upcall has a magic constructor and destructor.  We
-        // unlock the Object_Adapter lock for the duration of the servant
-        // activator upcalls; reacquiring once the upcalls complete.  Even
-        // though we are releasing the lock, other threads will not be able
-        // to make progress since
-        // <Object_Adapter::non_servant_upcall_in_progress_> has been set.
-        TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
-        ACE_UNUSED_ARG (non_servant_upcall);
-
-        imr_locator = ImplementationRepository::Administration::_narrow (imr.in () ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-  }
-
-  if (CORBA::is_nil(imr_locator.in ()))
-      return;
-
-  TAO_POA *root_poa = this->object_adapter ().root_poa ();
-  ACE_NEW_THROW_EX (this->server_object_,
-                    ServerObject_i (this->orb_core_.orb (),
-                                    root_poa),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK;
-
-  PortableServer::ServantBase_var safe_servant (this->server_object_);
-  ACE_UNUSED_ARG (safe_servant);
-
-  // Since this method is called from the POA constructor, there
-  // shouldn't be any waiting required.  Therefore,
-  // <wait_occurred_restart_call_ignored> can be ignored.
-  int wait_occurred_restart_call_ignored = 0;
-
-  // Activate the servant in the root poa.
-  PortableServer::ObjectId_var id =
-    root_poa->activate_object_i (this->server_object_,
-                                 this->cached_policies_.server_priority (),
-                                 wait_occurred_restart_call_ignored
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::Object_var obj = root_poa->id_to_reference_i (id.in  ()
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ImplementationRepository::ServerObject_var svr
-    = ImplementationRepository::ServerObject::_narrow (obj.in ()
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (!svr->_stubobj () || !svr->_stubobj ()->profile_in_use ())
-    {
-      ACE_ERROR ((LM_ERROR, "Invalid ImR ServerObject, bailing out.\n"));
-      return;
-    }
-
-  CORBA::String_var ior =
-    svr->_stubobj ()->profile_in_use ()->to_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Search for "corbaloc:" alone, without the protocol.  This code
-  // should be protocol neutral.
-  const char corbaloc[] = "corbaloc:";
-  char *pos = ACE_OS::strstr (ior.inout (), corbaloc);
-  pos = ACE_OS::strchr (pos + sizeof (corbaloc), ':');
-
-  pos = ACE_OS::strchr (pos + 1,
-                        svr->_stubobj ()->profile_in_use ()->object_key_delimiter ());
-
-  ACE_CString partial_ior(ior.in (), (pos - ior.in()) + 1);
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                "Informing IMR that we are running at: %s\n",
-                ACE_TEXT_CHAR_TO_TCHAR (partial_ior.c_str())));
-
-  ACE_TRY
-    {
-      // A recursive thread lock without using a recursive thread lock.
-      // Non_Servant_Upcall has a magic constructor and destructor.  We
-      // unlock the Object_Adapter lock for the duration of the servant
-      // activator upcalls; reacquiring once the upcalls complete.  Even
-      // though we are releasing the lock, other threads will not be able
-      // to make progress since
-      // <Object_Adapter::non_servant_upcall_in_progress_> has been set.
-      TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
-
-      imr_locator->server_is_running (this->name().c_str (),
-                                      partial_ior.c_str(),
-                                      svr.in()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_UNUSED_ARG (non_servant_upcall);
-    }
-  ACE_CATCH (CORBA::SystemException, sysex)
-    {
-      // Avoid warnings on platforms with native C++ exceptions
-      ACE_UNUSED_ARG (sysex);
-      ACE_RE_THROW;
-    }
-  ACE_CATCHANY
-    {
-      ACE_TRY_THROW (CORBA::TRANSIENT (
-          CORBA::SystemException::_tao_minor_code (TAO_IMPLREPO_MINOR_CODE, 0),
-          CORBA::COMPLETED_NO));
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "Successfully notified ImR of Startup\n"));
-}
-
-void
-TAO_POA::imr_notify_shutdown (void)
-{
-  // Notify the Implementation Repository about shutting down.
-
-  CORBA::Object_var imr = this->orb_core ().implrepo_service ();
-
-  // Check to see if there was an imr returned.  If none, return
-  // ourselves.
-  if (CORBA::is_nil (imr.in ()))
-    return;
-
-  ACE_TRY_NEW_ENV
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG, "Notifing IMR of Shutdown server:%s\n", this->the_name()));
-
-      // A recursive thread lock without using a recursive thread lock.
-      // Non_Servant_Upcall has a magic constructor and destructor.  We
-      // unlock the Object_Adapter lock for the duration of the servant
-      // activator upcalls; reacquiring once the upcalls complete.  Even
-      // though we are releasing the lock, other threads will not be able
-      // to make progress since
-      // <Object_Adapter::non_servant_upcall_in_progress_> has been set.
-      TAO_Object_Adapter::Non_Servant_Upcall non_servant_upcall (*this);
-      ACE_UNUSED_ARG (non_servant_upcall);
-
-      // Get the IMR's administrative object and call shutting_down on it
-      ImplementationRepository::Administration_var imr_locator =
-        ImplementationRepository::Administration::_narrow (imr.in ()
-                                                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      imr_locator->server_is_shutting_down (this->the_name ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "POA::imr_notify_shutdown()");
-      // Ignore exceptions
-    }
-  ACE_ENDTRY;
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
-TAO::ORT_Adapter_Factory *
-TAO_POA::ORT_adapter_factory (void)
-{
-  return ACE_Dynamic_Service<TAO::ORT_Adapter_Factory>::instance (
-           TAO_POA::ort_adapter_factory_name ());
-}
-
-TAO::ORT_Adapter *
-TAO_POA::ORT_adapter_i (void)
-{
-  if (this->ort_adapter_ != 0)
-    return this->ort_adapter_;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      TAO::ORT_Adapter_Factory * ort_ap_factory =
-        this->ORT_adapter_factory ();
-
-      if (!ort_ap_factory)
-        return 0;
-
-      // Get the full adapter name of this POA, do this before we
-      // create the adapter so that in case this fails, we just
-      // return 0 and not a not activated adapter
-      PortableInterceptor::AdapterName *adapter_name =
-        this->adapter_name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->ort_adapter_ =
-          ort_ap_factory->create (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (!this->ort_adapter_)
-        return 0;
-
-      // @todo We have to look at this, we activate it but hold the POA lock,
-      // in case we are called by ORT_adapter, we shouldn't keep the lock
-      // here, but then the ort_adapter should be guarded against multiple
-      // activations.
-      this->ort_adapter_->activate (this->orb_core_.server_id (),
-                                    this->orb_core_.orbid (),
-                                    adapter_name,
-                                    this
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "(%P|%t) Cannot initialize the "
-                           "object_reference_template_adapter\n");
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-
-  return this->ort_adapter_;
-}
-
-TAO::ORT_Adapter *
-TAO_POA::ORT_adapter (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->ort_adapter_ != 0)
-    return this->ort_adapter_;
-
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (0);
-
-  // DCL ..
-  if (this->ort_adapter_ != 0)
-    return this->ort_adapter_;
-
-  return this->ORT_adapter_i ();
-}
-
-TAO_POA_Guard::TAO_POA_Guard (TAO_POA &poa
-                              ACE_ENV_ARG_DECL,
-                              int check_for_destruction)
-  : guard_ (poa.lock ())
-{
-  if (!this->guard_.locked ())
-    ACE_THROW (
-      CORBA::INTERNAL (
-        CORBA::SystemException::_tao_minor_code (
-          TAO_GUARD_FAILURE,
-          0),
-        CORBA::COMPLETED_NO));
-
-  // Check if a non-servant upcall is in progress.  If a non-servant
-  // upcall is in progress, wait for it to complete.  Unless of
-  // course, the thread making the non-servant upcall is this thread.
-  poa.object_adapter ().wait_for_non_servant_upcalls_to_complete (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (check_for_destruction &&
-      poa.cleanup_in_progress ())
-    ACE_THROW (
-      CORBA::BAD_INV_ORDER (
-        CORBA::SystemException::_tao_minor_code (
-          TAO_POA_BEING_DESTROYED,
-          0),
-        CORBA::COMPLETED_NO));
-}
-
-CORBA::Policy *
-TAO_POA::server_protocol (void)
-{
-  return 0;
-}
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-PortableServer::ObjectId *
-TAO_POA::create_id_for_reference (CORBA::Object_ptr the_ref
-                                  ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableServer::NotAGroupObject
-    ))
-{
-  TAO_POA_PortableGroup_Hooks *hooks = this->orb_core_.portable_group_poa_hooks ();
-  if (hooks == 0)
-    {
-      ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
-    }
-
-  PortableServer::ObjectId *obj_id =
-    hooks->create_id_for_reference (*this, the_ref ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return obj_id;
-}
-
-PortableServer::IDs *
-TAO_POA::reference_to_ids (CORBA::Object_ptr the_ref
-                           ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableServer::NotAGroupObject
-    ))
-{
-  TAO_POA_PortableGroup_Hooks * hooks =
-    this->orb_core_.portable_group_poa_hooks ();
-
-  if (hooks == 0)
-    {
-      ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
-                        0);
-    }
-
-  PortableServer::IDs *id_list =
-    hooks->reference_to_ids (*this, the_ref ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return id_list;
-}
-
-void
-TAO_POA::associate_reference_with_id (CORBA::Object_ptr ref,
-                                      const PortableServer::ObjectId & oid
-                                      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableServer::NotAGroupObject
-    ))
-{
-  TAO_POA_PortableGroup_Hooks *hooks = this->orb_core_.portable_group_poa_hooks ();
-  if (hooks == 0)
-    {
-      ACE_THROW (CORBA::NO_IMPLEMENT ());
-    }
-
-  hooks->associate_reference_with_id (*this, ref, oid ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-TAO_POA::disassociate_reference_with_id (CORBA::Object_ptr ref,
-                                         const PortableServer::ObjectId & oid
-                                         ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableServer::NotAGroupObject
-    ))
-{
-  TAO_POA_PortableGroup_Hooks *hooks = this->orb_core_.portable_group_poa_hooks ();
-  if (hooks == 0)
-    {
-      ACE_THROW (CORBA::NO_IMPLEMENT ());
-    }
-
-  hooks->disassociate_reference_with_id (*this, ref, oid ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-void
-TAO_POA::Key_To_Object_Params::set (PortableServer::ObjectId_var &system_id,
-                                    const char *type_id,
-                                    TAO_ServantBase *servant,
-                                    CORBA::Boolean collocated,
-                                    CORBA::Short priority)
-{
-  this->system_id_ = &system_id;
-  this->type_id_ = type_id;
-  this->servant_ = servant;
-  this->collocated_ = collocated;
-  this->priority_ = priority;
-}
-
-void
-TAO_POA::ort_adapter_factory_name (const char *name)
-{
-  TAO_POA_Static_Resources::instance ()->ort_adapter_factory_name_ =
-    name;
-}
-
-const char *
-TAO_POA::ort_adapter_factory_name (void)
-{
-  return TAO_POA_Static_Resources::instance ()->ort_adapter_factory_name_.c_str();
-}
-
-// Initialize instance_ to 0, since this is what we test for in the call
-// to instance ().  Note that this does not require a constructor call, so
-// it is always initialized by the time that instance () can be called.
-TAO_POA_Static_Resources* TAO_POA_Static_Resources::instance_ = 0;
-
-// Force an instance to be created at module initialization time,
-// since we do not want to worry about double checked locking and
-// the race condition to initialize the lock.
-TAO_POA_Static_Resources* TAO_POA_Static_Resources::initialization_reference_ =
-  TAO_POA_Static_Resources::instance ();
-
-TAO_POA_Static_Resources*
-TAO_POA_Static_Resources::instance (void)
-{
-  if (TAO_POA_Static_Resources::instance_ == 0)
-    {
-      // This new is never freed on purpose.  The data specified by
-      // it needs to be around for the last shared library that references
-      // this class.  This could occur in a destructor in a shared library
-      // that is unloaded after this one.  One solution to avoid this
-      // harmless memory leak would be to use reference counting.
-      ACE_NEW_RETURN (TAO_POA_Static_Resources::instance_,
-                      TAO_POA_Static_Resources (),
-                      0);
-    }
-
-  return TAO_POA_Static_Resources::instance_;
-}
-
-TAO_POA_Static_Resources::TAO_POA_Static_Resources (void)
-  : ort_adapter_factory_name_ ("ORT_Adapter_Factory")
-{
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Array_Base<TAO_Active_Object_Map::Map_Entry *>;
-
-template class ACE_Map_Entry<TAO_Unbounded_Sequence<unsigned char>, TAO_ServantBase *>;
-template class ACE_Hash_Map_Entry<ACE_CString, TAO_POA *>;
-template class ACE_Hash_Map_Manager<ACE_CString, TAO_POA *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator<ACE_CString, TAO_POA *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Ex<ACE_CString, TAO_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator<ACE_CString, TAO_POA *, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
-template class ACE_Write_Guard<ACE_Lock>;
-template class ACE_Read_Guard<ACE_Lock>;
-template class ACE_Array_Base <IOP::ProfileId>;
-
-template class auto_ptr<TAO_Active_Object_Map>;
-
-#  if defined (ACE_LACKS_AUTO_PTR) \
-      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
-           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
-template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map>;
-#  endif  /* ACE_LACKS_AUTO_PTR */
-
-template class ACE_Node<TAO_POA *>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Array_Base<TAO_Active_Object_Map::Map_Entry *>
-
-#pragma instantiate ACE_Map_Entry<TAO_Unbounded_Sequence<unsigned char>, TAO_ServantBase *>
-#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, TAO_POA *>
-#pragma instantiate ACE_Hash_Map_Manager<ACE_CString, TAO_POA *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString, TAO_POA *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, TAO_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString, TAO_POA *, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
-#pragma instantiate ACE_Write_Guard<ACE_Lock>
-#pragma instantiate ACE_Read_Guard<ACE_Lock>
-
-#pragma instantiate auto_ptr<TAO_Active_Object_Map>
-
-#  if defined (ACE_LACKS_AUTO_PTR) \
-      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
-           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
-#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map>
-#  endif  /* ACE_LACKS_AUTO_PTR */
-
-#pragma instantiate ACE_Node<TAO_POA *>
-#pragma instantiate ACE_Array_Base <IOP::ProfileId>
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/PortableServer/POA.i b/TAO/tao/PortableServer/POA.i
deleted file mode 100644
index 9821fa6efb4..00000000000
--- a/TAO/tao/PortableServer/POA.i
+++ /dev/null
@@ -1,734 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// Exception macros
-#include "poa_macros.h"
-#include "tao/Environment.h"
-
-ACE_INLINE CORBA::Boolean
-TAO_POA::cleanup_in_progress (void)
-{
-  return this->cleanup_in_progress_;
-}
-
-ACE_INLINE ACE_Lock &
-TAO_POA::lock (void)
-{
-  return this->lock_;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_Creation_Time::creation_time_length (void)
-{
-  return 2 * sizeof (CORBA::ULong);
-}
-
-ACE_INLINE
-TAO_Creation_Time::TAO_Creation_Time (const ACE_Time_Value &creation_time)
-{
-  this->time_stamp_[TAO_Creation_Time::SEC_FIELD]  = (CORBA::ULong) creation_time.sec ();
-  this->time_stamp_[TAO_Creation_Time::USEC_FIELD] = (CORBA::ULong) creation_time.usec ();
-}
-
-ACE_INLINE
-TAO_Creation_Time::TAO_Creation_Time (void)
-{
-  this->time_stamp_[TAO_Creation_Time::SEC_FIELD]  = 0;
-  this->time_stamp_[TAO_Creation_Time::USEC_FIELD] = 0;
-}
-
-ACE_INLINE void
-TAO_Creation_Time::creation_time (const void *creation_time)
-{
-  ACE_OS::memcpy (&this->time_stamp_,
-                  creation_time,
-                  TAO_Creation_Time::creation_time_length ());
-}
-
-ACE_INLINE const void *
-TAO_Creation_Time::creation_time (void) const
-{
-  return &this->time_stamp_;
-}
-
-ACE_INLINE bool
-TAO_Creation_Time::operator== (const TAO_Creation_Time &rhs) const
-{
-#if (POA_NO_TIMESTAMP == 1)
-  ACE_UNUSED_ARG (rhs);
-  return true;
-#else
-  return ACE_OS::memcmp (&this->time_stamp_,
-                         &rhs.time_stamp_,
-                         TAO_Creation_Time::creation_time_length ()) == 0;
-#endif /* POA_NO_TIMESTAMP */
-}
-
-ACE_INLINE bool
-TAO_Creation_Time::operator!= (const TAO_Creation_Time &rhs) const
-{
-#if (POA_NO_TIMESTAMP == 1)
-  ACE_UNUSED_ARG (rhs);
-  return false;
-#else
-  return ACE_OS::memcmp (&this->time_stamp_,
-                         &rhs.time_stamp_,
-                         TAO_Creation_Time::creation_time_length ()) != 0;
-#endif /* POA_NO_TIMESTAMP */
-}
-
-ACE_INLINE bool
-TAO_Temporary_Creation_Time::operator== (const TAO_Creation_Time &rhs) const
-{
-#if (POA_NO_TIMESTAMP == 1)
-  ACE_UNUSED_ARG (rhs);
-  return true;
-#else
-  return ACE_OS::memcmp (this->time_stamp_,
-                         rhs.creation_time (),
-                         TAO_Creation_Time::creation_time_length ()) == 0;
-#endif /* POA_NO_TIMESTAMP */
-}
-
-ACE_INLINE bool
-TAO_Temporary_Creation_Time::operator!= (const TAO_Creation_Time &rhs) const
-{
-#if (POA_NO_TIMESTAMP == 1)
-  ACE_UNUSED_ARG (rhs);
-  return false;
-#else
-  return ACE_OS::memcmp (this->time_stamp_,
-                         rhs.creation_time (),
-                         TAO_Creation_Time::creation_time_length ()) != 0;
-#endif /* POA_NO_TIMESTAMP */
-}
-
-ACE_INLINE bool
-TAO_Creation_Time::operator== (const TAO_Temporary_Creation_Time &rhs) const
-{
-  return rhs == *this;
-}
-
-ACE_INLINE bool
-TAO_Creation_Time::operator!= (const TAO_Temporary_Creation_Time &rhs) const
-{
-  return rhs != *this;
-}
-
-ACE_INLINE
-TAO_Temporary_Creation_Time::TAO_Temporary_Creation_Time (void)
-  : time_stamp_ (0)
-{
-}
-
-ACE_INLINE void
-TAO_Temporary_Creation_Time::creation_time (const void *creation_time)
-{
-  this->time_stamp_ = (void *) creation_time;
-}
-
-ACE_INLINE PortableServer::POA_ptr
-TAO_POA::create_POA (const char *adapter_name,
-                     PortableServer::POAManager_ptr poa_manager,
-                     const CORBA::PolicyList &policies
-                     ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::AdapterAlreadyExists,
-                   PortableServer::POA::InvalidPolicy))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (0);
-
-  return this->create_POA_i (adapter_name,
-                             poa_manager,
-                             policies
-                             ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE void
-TAO_POA::destroy (CORBA::Boolean etherealize_objects,
-                  CORBA::Boolean wait_for_completion
-                  ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_Guard poa_guard (*this ACE_ENV_ARG_PARAMETER, 0);
-  ACE_CHECK;
-  ACE_UNUSED_ARG (poa_guard);
-
-  this->destroy_i (etherealize_objects,
-                   wait_for_completion
-                   ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE TAO_POA_Policy_Set &
-TAO_POA::policies (void)
-{
-  return this->policies_;
-}
-
-ACE_INLINE TAO_Active_Object_Map &
-TAO_POA::active_object_map (void) const
-{
-  return *this->active_object_map_;
-}
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-ACE_INLINE PortableServer::ServantManager_ptr
-TAO_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (PortableServer::ServantManager::_nil ());
-
-  return this->get_servant_manager_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE void
-TAO_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr
-                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD;
-
-  this->set_servant_manager_i (imgr
-                               ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE PortableServer::Servant
-TAO_POA::get_servant (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::NoServant,
-                   PortableServer::POA::WrongPolicy))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (0);
-
-  return this->get_servant_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE void
-TAO_POA::set_servant (PortableServer::Servant servant
-                      ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD;
-
-  this->set_servant_i (servant
-                       ACE_ENV_ARG_PARAMETER);
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-ACE_INLINE PortableServer::ObjectId *
-TAO_POA::activate_object (PortableServer::Servant servant
-                          ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  while (1)
-    {
-      int wait_occurred_restart_call = 0;
-
-      // Lock access for the duration of this transaction.
-      TAO_POA_GUARD_RETURN (0);
-
-      PortableServer::ObjectId *result =
-        this->activate_object_i (servant,
-                                 this->cached_policies_.server_priority (),
-                                 wait_occurred_restart_call
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      // If we ended up waiting on a condition variable, the POA state
-      // may have changed while we are waiting.  Therefore, we need to
-      // restart this call.
-      if (wait_occurred_restart_call)
-        continue;
-      else
-        return result;
-    }
-}
-
-ACE_INLINE void
-TAO_POA::activate_object_with_id (const PortableServer::ObjectId &id,
-                                  PortableServer::Servant servant
-                                  ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantAlreadyActive,
-                   PortableServer::POA::ObjectAlreadyActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  while (1)
-    {
-      int wait_occurred_restart_call = 0;
-
-      // Lock access for the duration of this transaction.
-      TAO_POA_GUARD;
-
-      this->activate_object_with_id_i (id,
-                                       servant,
-                                       this->cached_policies_.server_priority (),
-                                       wait_occurred_restart_call
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      // If we ended up waiting on a condition variable, the POA state
-      // may have changed while we are waiting.  Therefore, we need to
-      // restart this call.
-      if (wait_occurred_restart_call)
-        continue;
-      else
-        return;
-    }
-}
-
-ACE_INLINE void
-TAO_POA::deactivate_object (const PortableServer::ObjectId &oid
-                            ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD;
-
-  this->deactivate_object_i (oid
-                             ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::Object_ptr
-TAO_POA::create_reference (const char *intf
-                           ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (CORBA::Object::_nil ());
-
-  return this->create_reference_i (intf,
-                                   this->cached_policies_.server_priority ()
-                                   ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::Object_ptr
-TAO_POA::create_reference_with_id (const PortableServer::ObjectId &id,
-                                   const char *intf
-                                   ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (CORBA::Object::_nil ());
-
-  return this->create_reference_with_id_i (id,
-                                           intf,
-                                           this->cached_policies_.server_priority ()
-                                           ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE PortableServer::ObjectId *
-TAO_POA::servant_to_id (PortableServer::Servant servant
-                        ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  // If we had upgradeable locks, this would initially be a read lock
-  //
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (0);
-
-  return this->servant_to_id_i (servant
-                                ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE PortableServer::ObjectId *
-TAO_POA::servant_to_system_id (PortableServer::Servant servant,
-                               CORBA::Short &priority
-                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (0);
-
-  return this->servant_to_system_id_i (servant,
-                                       priority
-                                       ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE PortableServer::Servant
-TAO_POA::reference_to_servant (CORBA::Object_ptr reference
-                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongAdapter,
-                   PortableServer::POA::WrongPolicy))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (0);
-
-  return this->reference_to_servant_i (reference
-                                       ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::Object_ptr
-TAO_POA::servant_to_reference (PortableServer::Servant servant
-                               ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ServantNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  TAO_POA_GUARD_RETURN (CORBA::Object::_nil ());
-
-  return this->servant_to_reference_i (servant
-                                       ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE PortableServer::Servant
-TAO_POA::id_to_servant (const PortableServer::ObjectId &oid
-                        ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (0);
-
-  return this->id_to_servant_i (oid
-                                ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::Object_ptr
-TAO_POA::id_to_reference (const PortableServer::ObjectId &oid
-                          ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (0);
-
-  return this->id_to_reference_i (oid ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE PortableServer::POA_ptr
-TAO_POA::the_parent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->parent_ != 0)
-    return PortableServer::POA::_duplicate (this->parent_);
-  else
-    return PortableServer::POA::_nil ();
-}
-
-ACE_INLINE PortableServer::POAList *
-TAO_POA::the_children (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (0);
-
-  return this->the_children_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE PortableServer::POAManager_ptr
-TAO_POA::the_POAManager (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return PortableServer::POAManager::_duplicate (&this->poa_manager_);
-}
-
-ACE_INLINE PortableInterceptor::AdapterManagerId
-TAO_POA::get_manager_id (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->poa_manager_.get_manager_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE PortableInterceptor::AdapterName *
-TAO_POA::adapter_name (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->adapter_name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE PortableInterceptor::ObjectReferenceTemplate *
-TAO_POA::get_adapter_template (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER))
-    {
-      return this->ort_adapter_->get_adapter_template();
-    }
-
-  return 0;
-}
-
-ACE_INLINE PortableInterceptor::ObjectReferenceTemplate *
-TAO_POA::get_adapter_template_i ()
-{
-  if (this->ORT_adapter_i ())
-    {
-      return this->ort_adapter_->get_adapter_template ();
-    }
-
-  return 0;
-}
-
-ACE_INLINE PortableInterceptor::ObjectReferenceFactory *
-TAO_POA::get_obj_ref_factory (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER))
-    {
-      return this->ort_adapter_->get_obj_ref_factory();
-    }
-
-  return 0;
-}
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-ACE_INLINE PortableServer::AdapterActivator_ptr
-TAO_POA::the_activator (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD_RETURN (PortableServer::AdapterActivator::_nil ());
-
-  return PortableServer::AdapterActivator::_duplicate (this->adapter_activator_.in ());
-}
-
-ACE_INLINE void
-TAO_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator
-                        ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Lock access for the duration of this transaction.
-  TAO_POA_GUARD;
-
-  this->adapter_activator_ = PortableServer::AdapterActivator::_duplicate (adapter_activator);
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-ACE_INLINE const TAO_Creation_Time &
-TAO_POA::creation_time (void)
-{
-  return this->creation_time_;
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_POA::system_id (void)
-{
-  return (this->cached_policies_.id_assignment () == PortableServer::SYSTEM_ID);
-}
-
-
-ACE_INLINE CORBA::Boolean
-TAO_POA::root (void)
-{
-  return this->parent_ == 0;
-}
-
-
-ACE_INLINE CORBA::Boolean
-TAO_POA::persistent (void)
-{
-  return (this->cached_policies_.lifespan () == PortableServer::PERSISTENT);
-}
-
-ACE_INLINE const ACE_CString &
-TAO_POA::name (void) const
-{
-  return this->name_;
-}
-
-ACE_INLINE char *
-TAO_POA::the_name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return CORBA::string_dup (this->name_.c_str ());
-}
-
-ACE_INLINE const TAO_Object_Adapter::poa_name &
-TAO_POA::folded_name (void) const
-{
-  return this->folded_name_;
-}
-
-ACE_INLINE const TAO_Object_Adapter::poa_name &
-TAO_POA::system_name (void) const
-{
-  return this->system_name_.in ();
-}
-
-ACE_INLINE char
-TAO_POA::name_separator (void)
-{
-  return '\0';
-}
-
-ACE_INLINE CORBA::ULong
-TAO_POA::name_separator_length (void)
-{
-  return sizeof (char);
-}
-
-ACE_INLINE char
-TAO_POA::persistent_key_char (void)
-{
-  return 'P';
-}
-
-ACE_INLINE char
-TAO_POA::transient_key_char (void)
-{
-  return 'T';
-}
-
-ACE_INLINE char
-TAO_POA::persistent_key_type (void)
-{
-  if (this->persistent ())
-    return TAO_POA::persistent_key_char ();
-  else
-    return TAO_POA::transient_key_char ();
-}
-
-ACE_INLINE CORBA::ULong
-TAO_POA::persistent_key_type_length (void)
-{
-  return sizeof (char);
-}
-
-ACE_INLINE char
-TAO_POA::system_id_key_char (void)
-{
-  return 'S';
-}
-
-ACE_INLINE char
-TAO_POA::user_id_key_char (void)
-{
-  return 'U';
-}
-
-ACE_INLINE char
-TAO_POA::system_id_key_type (void)
-{
-  if (this->system_id ())
-    return TAO_POA::system_id_key_char ();
-  else
-    return TAO_POA::user_id_key_char ();
-}
-
-ACE_INLINE CORBA::ULong
-TAO_POA::system_id_key_type_length (void)
-{
-  return sizeof (char);
-}
-
-ACE_INLINE char
-TAO_POA::root_key_char (void)
-{
-  return 'R';
-}
-
-ACE_INLINE char
-TAO_POA::non_root_key_char (void)
-{
-  return 'N';
-}
-
-ACE_INLINE char
-TAO_POA::root_key_type (void)
-{
-  if (this->root ())
-    return TAO_POA::root_key_char ();
-  else
-    return TAO_POA::non_root_key_char ();
-}
-
-ACE_INLINE CORBA::ULong
-TAO_POA::root_key_type_length (void)
-{
-  return sizeof (char);
-}
-
-ACE_INLINE CORBA::ULong
-TAO_POA::outstanding_requests (void) const
-{
-  return this->outstanding_requests_;
-}
-
-ACE_INLINE void
-TAO_POA::outstanding_requests (CORBA::ULong new_outstanding_requests)
-{
-  this->outstanding_requests_ = new_outstanding_requests;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_POA::increment_outstanding_requests (void)
-{
-  return ++this->outstanding_requests_;
-}
-
-ACE_INLINE CORBA::ULong
-TAO_POA::decrement_outstanding_requests (void)
-{
-  return --this->outstanding_requests_;
-}
-
-ACE_INLINE CORBA::Boolean
-TAO_POA::waiting_destruction (void) const
-{
-  return this->waiting_destruction_;
-}
-
-ACE_INLINE TAO_SYNCH_RECURSIVE_MUTEX &
-TAO_POA::single_threaded_lock (void) const
-{
-  return *this->single_threaded_lock_;
-}
-
-ACE_INLINE TAO_ORB_Core &
-TAO_POA::orb_core (void) const
-{
-  return this->orb_core_;
-}
-
-ACE_INLINE PortableServer::ThreadPolicyValue
-TAO_POA::thread_policy (void) const
-{
-  return this->cached_policies_.thread ();
-}
-
-ACE_INLINE PortableInterceptor::AdapterState
-TAO_POA::get_adapter_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  return this->adapter_state_;
-}
-
-ACE_INLINE TAO_POA_Cached_Policies &
-TAO_POA::cached_policies (void)
-{
-  return this->cached_policies_;
-}
-
-ACE_INLINE void *
-TAO_POA::thread_pool (void) const
-{
-  return 0;
-}
diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp
index 3c484a85c23..02794454b12 100644
--- a/TAO/tao/PortableServer/POAManager.cpp
+++ b/TAO/tao/PortableServer/POAManager.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "POAManager.h"
-#include "POA.h"
+#include "Root_POA.h"
 #include "poa_macros.h"
 #include "tao/Server_Strategy_Factory.h"
 #include "tao/ORB_Core.h"
@@ -11,6 +11,9 @@
 # include "POAManager.i"
 #endif /* ! __ACE_INLINE__ */
 
+ACE_RCSID (PortableServer,
+           POAManager,
+           "$Id$")
 
 TAO_POA_Manager::TAO_POA_Manager (TAO_Object_Adapter &object_adapter)
   : state_ (PortableServer::POAManager::HOLDING),
@@ -63,9 +66,9 @@ TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects,
                    PortableServer::POAManager::AdapterInactive))
 {
   // Is the <wait_for_completion> semantics for this thread correct?
-  TAO_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (),
-                                                 wait_for_completion
-                                                 ACE_ENV_ARG_PARAMETER);
+  TAO_Root_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (),
+                                                      wait_for_completion
+                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // This operation changes the state of the POA manager to
@@ -113,7 +116,7 @@ TAO_POA_Manager::deactivate_i (CORBA::Boolean etherealize_objects,
        iterator != this->poa_collection_.end ();
        ++iterator)
     {
-      TAO_POA *poa = *iterator;
+      TAO_Root_POA *poa = *iterator;
       poa->deactivate_all_objects_i (etherealize_objects,
                                      wait_for_completion
                                      ACE_ENV_ARG_PARAMETER);
@@ -159,9 +162,9 @@ TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion
                    PortableServer::POAManager::AdapterInactive))
 {
   // Is the <wait_for_completion> semantics for this thread correct?
-  TAO_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (),
-                                                 wait_for_completion
-                                                 ACE_ENV_ARG_PARAMETER);
+  TAO_Root_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (),
+                                                      wait_for_completion
+                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // This operation changes the state of the POA manager to
@@ -200,7 +203,7 @@ TAO_POA_Manager::hold_requests_i (CORBA::Boolean wait_for_completion
            iterator != this->poa_collection_.end ();
            ++iterator)
         {
-          TAO_POA *poa = *iterator;
+          TAO_Root_POA *poa = *iterator;
           poa->wait_for_completions (wait_for_completion
                                      ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
@@ -219,9 +222,9 @@ TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion
                    PortableServer::POAManager::AdapterInactive))
 {
   // Is the <wait_for_completion> semantics for this thread correct?
-  TAO_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (),
-                                                 wait_for_completion
-                                                 ACE_ENV_ARG_PARAMETER);
+  TAO_Root_POA::check_for_valid_wait_for_completions (this->object_adapter_.orb_core (),
+                                                      wait_for_completion
+                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // This operation changes the state of the POA manager to
@@ -262,7 +265,7 @@ TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion
            iterator != this->poa_collection_.end ();
            ++iterator)
         {
-          TAO_POA *poa = *iterator;
+          TAO_Root_POA *poa = *iterator;
           poa->wait_for_completions (wait_for_completion
                                      ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
@@ -276,7 +279,7 @@ TAO_POA_Manager::discard_requests_i (CORBA::Boolean wait_for_completion
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 int
-TAO_POA_Manager::remove_poa (TAO_POA *poa)
+TAO_POA_Manager::remove_poa (TAO_Root_POA *poa)
 {
   int result = this->poa_collection_.remove (poa);
 
@@ -292,19 +295,90 @@ TAO_POA_Manager::remove_poa (TAO_POA *poa)
 }
 
 int
-TAO_POA_Manager::register_poa (TAO_POA *poa)
+TAO_POA_Manager::register_poa (TAO_Root_POA *poa)
 {
   return this->poa_collection_.insert (poa);
 }
 
+void
+TAO_POA_Manager::check_state (ACE_ENV_SINGLE_ARG_DECL)
+{
+  if (state_ == PortableServer::POAManager::ACTIVE)
+    {
+      // When a POA manager is in the active state, the associated
+      // POAs will receive and start processing requests (assuming
+      // that appropriate thread resources are available).
+      return;
+    }
+
+  if (state_ == PortableServer::POAManager::DISCARDING)
+    {
+      // When a POA manager is in the discarding state, the associated
+      // POAs will discard all incoming requests (whose processing has
+      // not yet begun). When a request is discarded, the TRANSIENT
+      // system exception, with standard minor code 1, must be
+      // returned to the client-side to indicate that the request
+      // should be re-issued. (Of course, an ORB may always reject a
+      // request for other reasons and raise some other system
+      // exception.)
+      ACE_THROW (
+        CORBA::TRANSIENT (
+          CORBA::SystemException::_tao_minor_code (
+            TAO_POA_DISCARDING,
+            1),
+          CORBA::COMPLETED_NO));
+    }
+
+  if (state_ == PortableServer::POAManager::HOLDING)
+    {
+      // When a POA manager is in the holding state, the associated
+      // POAs will queue incoming requests. The number of requests
+      // that can be queued is an implementation limit. If this limit
+      // is reached, the POAs may discard requests and return the
+      // TRANSIENT system exception, with standard minor code 1, to
+      // the client to indicate that the client should reissue the
+      // request. (Of course, an ORB may always reject a request for
+      // other reasons and raise some other system exception.)
+
+      // Since there is no queuing in TAO, we immediately raise a
+      // TRANSIENT exception.
+      ACE_THROW (CORBA::TRANSIENT (
+        CORBA::SystemException::_tao_minor_code (
+          TAO_POA_HOLDING,
+          1),
+        CORBA::COMPLETED_NO));
+    }
+
+  if (state_ == PortableServer::POAManager::INACTIVE)
+    {
+      // The inactive state is entered when the associated POAs are to
+      // be shut down. Unlike the discarding state, the inactive state
+      // is not a temporary state. When a POA manager is in the
+      // inactive state, the associated POAs will reject new
+      // requests. The rejection mechanism used is specific to the
+      // vendor. The GIOP location forwarding mechanism and
+      // CloseConnection message are examples of mechanisms that could
+      // be used to indicate the rejection. If the client is
+      // co-resident in the same process, the ORB could raise the
+      // OBJ_ADAPTER system exception, with standard minor code 1, to
+      // indicate that the object implementation is unavailable.
+      ACE_THROW (CORBA::OBJ_ADAPTER (
+        CORBA::SystemException::_tao_minor_code (
+          TAO_POA_INACTIVE,
+          1),
+        CORBA::COMPLETED_NO));
+    }
+}
+
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-template class ACE_Unbounded_Set<TAO_POA *>;
-template class ACE_Unbounded_Set_Iterator<TAO_POA *>;
+template class ACE_Unbounded_Set<TAO_Root_POA *>;
+template class ACE_Unbounded_Set_Iterator<TAO_Root_POA *>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#pragma instantiate ACE_Unbounded_Set<TAO_POA *>
-#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_POA *>
+#pragma instantiate ACE_Unbounded_Set<TAO_Root_POA *>
+#pragma instantiate ACE_Unbounded_Set_Iterator<TAO_Root_POA *>
 
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h
index 93db1c0d551..f3c05ece1f1 100644
--- a/TAO/tao/PortableServer/POAManager.h
+++ b/TAO/tao/PortableServer/POAManager.h
@@ -8,7 +8,6 @@
  *
  *   POAManager
  *
- *
  *  @author  Irfan Pyarali
  */
 //=============================================================================
@@ -17,30 +16,28 @@
 #define TAO_POAMANAGER_H
 #include /**/ "ace/pre.h"
 
-#include "PortableServerC.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "poa_macros.h"
+#include "POAManagerC.h"
 
 // Local Object
 #include "tao/LocalObject.h"
-
-#include "tao/PortableInterceptorC.h"
+#include "tao/PI_ForwardC.h"
 #include "ace/Unbounded_Set.h"
 
 // Forward decl.
-class TAO_POA;
+class TAO_Root_POA;
 class TAO_Object_Adapter;
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -48,7 +45,7 @@ class TAO_PortableServer_Export TAO_POA_Manager :
   public PortableServer::POAManager,
   public TAO_Local_RefCounted_Object
 {
-  friend class TAO_POA;
+  friend class TAO_Root_POA;
   friend class TAO_Object_Adapter;
 
 public:
@@ -86,6 +83,12 @@ public:
 
   PortableInterceptor::AdapterManagerId get_manager_id (ACE_ENV_SINGLE_ARG_DECL);
 
+  /// Check the state of this POA manager
+  void check_state (ACE_ENV_SINGLE_ARG_DECL);
+
+  PortableServer::POAManager::State get_state_i ()
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
 protected:
 
   void activate_i (ACE_ENV_SINGLE_ARG_DECL)
@@ -118,14 +121,11 @@ protected:
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  PortableServer::POAManager::State get_state_i ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
   ACE_Lock &lock (void);
 
-  int remove_poa (TAO_POA *poa);
+  int remove_poa (TAO_Root_POA *poa);
 
-  int register_poa (TAO_POA *poa);
+  int register_poa (TAO_Root_POA *poa);
 
   /**
    * Generate an AdapterManagerId for this POAManager.
@@ -140,7 +140,7 @@ protected:
 
   ACE_Lock &lock_;
 
-  typedef ACE_Unbounded_Set<TAO_POA *> POA_COLLECTION;
+  typedef ACE_Unbounded_Set<TAO_Root_POA *> POA_COLLECTION;
 
   POA_COLLECTION poa_collection_;
 
@@ -150,7 +150,7 @@ protected:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/PortableServer/POAManager.i b/TAO/tao/PortableServer/POAManager.i
index d60d3dd08f7..c38b1bd02ef 100644
--- a/TAO/tao/PortableServer/POAManager.i
+++ b/TAO/tao/PortableServer/POAManager.i
@@ -109,13 +109,13 @@ TAO_POA_Manager::generate_manager_id (void) const
 
   if (sizeof (this) == 4)       // 32 bit address
     id =
-      ACE_static_cast (PortableInterceptor::AdapterManagerId,
-                       ACE_reinterpret_cast (ptrdiff_t, this));
+      static_cast <PortableInterceptor::AdapterManagerId>
+                       (reinterpret_cast <ptrdiff_t> (this));
 
   else if (sizeof (this) == 8)  // 64 bit address -- use lower 32 bits
     id =
-      ACE_static_cast (PortableInterceptor::AdapterManagerId,
-                       ACE_reinterpret_cast (ptrdiff_t, this) & 0xFFFFFFFFu);
+      static_cast <PortableInterceptor::AdapterManagerId>
+                       (reinterpret_cast <ptrdiff_t> (this) & 0xFFFFFFFFu);
 
   // @@ If we ever hit a platform where neither of the above cases are
   //    satisfied, we're up the creek!
diff --git a/TAO/tao/PortableServer/POAManager.pidl b/TAO/tao/PortableServer/POAManager.pidl
new file mode 100644
index 00000000000..ce985a06aeb
--- /dev/null
+++ b/TAO/tao/PortableServer/POAManager.pidl
@@ -0,0 +1,56 @@
+/**
+ * @file POAManager.pidl
+ *
+ * $Id$
+ *
+ * @brief Pre-compiled IDL source for the PortableServer module.
+ *
+ * tao_idl.exe \
+ *     -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT)
+ *          -Wb,export_macro=TAO_PortableServer_Export \
+ *          -Wb,export_include="portableserver_export.h" \
+ *          -Wb,pre_include="ace/pre.h" \
+ *          -Wb,post_include="ace/post.h" \
+ *          POAManager.pidl
+ */
+
+#ifndef _PORTABLESERVER_POA_MANAGER_IDL_
+#define _PORTABLESERVER_POA_MANAGER_IDL_
+
+#pragma prefix "omg.org"
+
+module PortableServer
+{
+# pragma version PortableServer 2.3
+
+  // POAManager interface
+  local interface POAManager
+  {
+    exception AdapterInactive {};
+
+    enum State
+    {
+      HOLDING,
+      ACTIVE,
+      DISCARDING,
+      INACTIVE
+    };
+
+    void activate ()
+      raises(AdapterInactive);
+
+    void hold_requests (in boolean wait_for_completion)
+      raises(AdapterInactive);
+
+    void discard_requests (in boolean wait_for_completion)
+      raises(AdapterInactive);
+
+    void deactivate (in boolean etherealize_objects,
+                     in boolean wait_for_completion)
+      raises(AdapterInactive);
+
+    State get_state ();
+  };
+};
+
+#endif // _PORTABLESERVER_POA_MANAGER_IDL_
diff --git a/TAO/tao/PortableServer/POAManagerA.cpp b/TAO/tao/PortableServer/POAManagerA.cpp
new file mode 100644
index 00000000000..67c7c7f0aa7
--- /dev/null
+++ b/TAO/tao/PortableServer/POAManagerA.cpp
@@ -0,0 +1,341 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+
+#include "POAManagerC.h"
+#include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
+#include "tao/Any_Impl_T.h"
+#include "tao/Any_Dual_Impl_T.h"
+#include "tao/Any_Basic_Impl_T.h"
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_PortableServer_POAManager_State[] =
+{
+  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 (0x4f414d61), 
+  ACE_NTOHL (0x6e616765), 
+  ACE_NTOHL (0x722f5374), 
+  ACE_NTOHL (0x6174653a), 
+  ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/POAManager/State:2.3
+  6,
+  ACE_NTOHL (0x53746174), 
+  ACE_NTOHL (0x65000000),  // name = State
+  4, // member count
+  8,
+  ACE_NTOHL (0x484f4c44), 
+  ACE_NTOHL (0x494e4700),  // name = HOLDING
+  7,
+  ACE_NTOHL (0x41435449), 
+  ACE_NTOHL (0x56450000),  // name = ACTIVE
+  11,
+  ACE_NTOHL (0x44495343), 
+  ACE_NTOHL (0x41524449), 
+  ACE_NTOHL (0x4e470000),  // name = DISCARDING
+  9,
+  ACE_NTOHL (0x494e4143), 
+  ACE_NTOHL (0x54495645), 
+  ACE_NTOHL (0x0),  // name = INACTIVE
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAManager_State (
+    CORBA::tk_enum,
+    sizeof (_oc_PortableServer_POAManager_State),
+    (char *) &_oc_PortableServer_POAManager_State,
+    0,
+    0
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POAManager::_tc_State =
+  &_tc_TAO_tc_PortableServer_POAManager_State;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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 (0x33000000),  // repository ID = IDL:omg.org/PortableServer/POAManager:2.3
+    11,
+  ACE_NTOHL (0x504f414d), 
+  ACE_NTOHL (0x616e6167), 
+  ACE_NTOHL (0x65720000),  // name = POAManager
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAManager (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_POAManager),
+    (char *) &_oc_PortableServer_POAManager,
+    0,
+    0
+  );
+
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_POAManager =
+    &_tc_TAO_tc_PortableServer_POAManager;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+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 false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::POAManager>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::POAManager_ptr _tao_elem
+  )
+{
+  PortableServer::POAManager_ptr _tao_objptr =
+    PortableServer::POAManager::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::POAManager_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::POAManager>::insert (
+      _tao_any,
+      PortableServer::POAManager::_tao_any_destructor,
+      PortableServer::_tc_POAManager,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::POAManager_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::POAManager>::extract (
+        _tao_any,
+        PortableServer::POAManager::_tao_any_destructor,
+        PortableServer::_tc_POAManager,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_exception/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const PortableServer::POAManager::AdapterInactive &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::insert_copy (
+      _tao_any,
+      PortableServer::POAManager::AdapterInactive::_tao_any_destructor,
+      PortableServer::POAManager::_tc_AdapterInactive,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::POAManager::AdapterInactive *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::insert (
+      _tao_any,
+      PortableServer::POAManager::AdapterInactive::_tao_any_destructor,
+      PortableServer::POAManager::_tc_AdapterInactive,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::POAManager::AdapterInactive *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const PortableServer::POAManager::AdapterInactive *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const PortableServer::POAManager::AdapterInactive *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::extract (
+        _tao_any,
+        PortableServer::POAManager::AdapterInactive::_tao_any_destructor,
+        PortableServer::POAManager::_tc_AdapterInactive,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_cs.cpp:52
+
+
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Basic_Impl_T<PortableServer::POAManager::State>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Basic_Impl_T<PortableServer::POAManager::State>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::POAManager::State _tao_elem
+  )
+{
+  TAO::Any_Basic_Impl_T<PortableServer::POAManager::State>::insert (
+      _tao_any,
+      PortableServer::POAManager::_tc_State,
+      _tao_elem
+    );
+}
+
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::POAManager::State &_tao_elem
+  )
+{
+  return
+    TAO::Any_Basic_Impl_T<PortableServer::POAManager::State>::extract (
+        _tao_any,
+        PortableServer::POAManager::_tc_State,
+        _tao_elem 
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::POAManager::AdapterInactive
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        PortableServer::POAManager::State
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        PortableServer::POAManager
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::POAManager::AdapterInactive \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        PortableServer::POAManager::State \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        PortableServer::POAManager \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/POAManagerC.cpp b/TAO/tao/PortableServer/POAManagerC.cpp
new file mode 100644
index 00000000000..19778a4437e
--- /dev/null
+++ b/TAO/tao/PortableServer/POAManagerC.cpp
@@ -0,0 +1,366 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:302
+
+
+#include "POAManagerC.h"
+#include "tao/CDR.h"
+#include "tao/Typecode.h"
+#include "ace/OS_NS_string.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if !defined (__ACE_INLINE__)
+#include "POAManagerC.inl"
+#endif /* !defined INLINE */
+
+// TAO_IDL - Generated from
+// be\be_visitor_arg_traits.cpp:66
+
+// Arg traits specializations.
+namespace TAO
+{
+}
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/interface_cs.cpp:60
+
+// Traits specializations for PortableServer::POAManager.
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+PortableServer::POAManager_ptr
+TAO::Objref_Traits<PortableServer::POAManager>::duplicate (
+    PortableServer::POAManager_ptr p
+  )
+{
+  return PortableServer::POAManager::_duplicate (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+void
+TAO::Objref_Traits<PortableServer::POAManager>::release (
+    PortableServer::POAManager_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+PortableServer::POAManager_ptr
+TAO::Objref_Traits<PortableServer::POAManager>::nil (void)
+{
+  return PortableServer::POAManager::_nil ();
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+CORBA::Boolean
+TAO::Objref_Traits<PortableServer::POAManager>::marshal (
+    PortableServer::POAManager_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return CORBA::Object::marshal (p, cdr);
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_exception/exception_cs.cpp:63
+
+PortableServer::POAManager::AdapterInactive::AdapterInactive (void)
+  : CORBA::UserException (
+        "IDL:omg.org/PortableServer/POAManager/AdapterInactive:2.3",
+        "AdapterInactive"
+      )
+{
+}
+
+PortableServer::POAManager::AdapterInactive::~AdapterInactive (void)
+{
+}
+
+PortableServer::POAManager::AdapterInactive::AdapterInactive (const ::PortableServer::POAManager::AdapterInactive &_tao_excp)
+  : CORBA::UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
+{
+}
+
+PortableServer::POAManager::AdapterInactive&
+PortableServer::POAManager::AdapterInactive::operator= (const ::PortableServer::POAManager::AdapterInactive &_tao_excp)
+{
+  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  return *this;
+}
+
+void PortableServer::POAManager::AdapterInactive::_tao_any_destructor (void *_tao_void_pointer)
+{
+  AdapterInactive *_tao_tmp_pointer =
+    static_cast<AdapterInactive *> (_tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
+
+PortableServer::POAManager::AdapterInactive *
+PortableServer::POAManager::AdapterInactive::_downcast (CORBA::Exception *_tao_excp)
+{
+  return dynamic_cast<AdapterInactive *> (_tao_excp);
+}
+
+const PortableServer::POAManager::AdapterInactive *
+PortableServer::POAManager::AdapterInactive::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const AdapterInactive *> (_tao_excp);
+}
+
+CORBA::Exception *PortableServer::POAManager::AdapterInactive::_alloc (void)
+{
+  CORBA::Exception *retval = 0;
+  ACE_NEW_RETURN (retval, ::PortableServer::POAManager::AdapterInactive, 0);
+  return retval;
+}
+
+CORBA::Exception *
+PortableServer::POAManager::AdapterInactive::_tao_duplicate (void) const
+{
+  CORBA::Exception *result;
+  ACE_NEW_RETURN (
+      result,
+      ::PortableServer::POAManager::AdapterInactive (*this),
+      0
+    );
+  return result;
+}
+
+void PortableServer::POAManager::AdapterInactive::_raise (void) const
+{
+  TAO_RAISE (*this);
+}
+
+void PortableServer::POAManager::AdapterInactive::_tao_encode (
+    TAO_OutputCDR &
+    ACE_ENV_ARG_DECL
+  ) const
+{
+  ACE_THROW (CORBA::MARSHAL ());
+}
+
+void PortableServer::POAManager::AdapterInactive::_tao_decode (
+    TAO_InputCDR &
+    ACE_ENV_ARG_DECL
+  )
+{
+  ACE_THROW (CORBA::MARSHAL ());
+}
+
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::POAManager::AdapterInactive::_type (void) const
+{
+  return ::PortableServer::POAManager::_tc_AdapterInactive;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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 (0x33000000),  // repository ID = IDL:omg.org/PortableServer/POAManager/AdapterInactive:2.3
+    16,
+  ACE_NTOHL (0x41646170), 
+  ACE_NTOHL (0x74657249), 
+  ACE_NTOHL (0x6e616374), 
+  ACE_NTOHL (0x69766500),  // name = AdapterInactive
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAManager_AdapterInactive (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POAManager_AdapterInactive),
+    (char *) &_oc_PortableServer_POAManager_AdapterInactive,
+    0,
+    0
+  );
+
+::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 =
+    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::_unchecked_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 (
+          value,
+          "IDL:omg.org/PortableServer/POAManager:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          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
+// be\be_visitor_root/root.cpp:1629
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Objref_Traits<
+        PortableServer::POAManager
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::POAManager
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::POAManager
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Objref_Traits< \
+        PortableServer::POAManager \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::POAManager
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::POAManager
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/POAManagerC.h b/TAO/tao/PortableServer/POAManagerC.h
new file mode 100644
index 00000000000..565881882bb
--- /dev/null
+++ b/TAO/tao/PortableServer/POAManagerC.h
@@ -0,0 +1,379 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:153
+
+#ifndef _TAO_IDL_ORIG_POAMANAGERC_H_
+#define _TAO_IDL_ORIG_POAMANAGERC_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "portableserver_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
+#include "tao/Environment.h"
+#include "tao/Object.h"
+#include "tao/Objref_VarOut_T.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_PortableServer_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_ch.cpp:62
+
+namespace TAO
+{
+  class Collocation_Proxy_Broker;
+  
+  template<typename T> class Narrow_Utils;
+  template<typename T> class AbstractBase_Narrow_Utils;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_interface.cpp:598
+
+#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;
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_interface/interface_ch.cpp:54
+
+#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;
+    
+    // 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 static_cast<POAManager_ptr> (0);
+    }
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // 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 const AdapterInactive *_downcast (CORBA::Exception const *);
+      
+      static CORBA::Exception *_alloc (void);
+      
+      virtual CORBA::Exception *_tao_duplicate (void) const;
+
+      virtual void _raise (void) const;
+
+      virtual void _tao_encode (
+          TAO_OutputCDR &
+          ACE_ENV_ARG_DECL
+        ) const;
+      
+      virtual void _tao_decode (
+          TAO_InputCDR &
+          ACE_ENV_ARG_DECL
+        );
+      
+      // TAO_IDL - Generated from
+      // be\be_visitor_exception/exception_ch.cpp:127
+      
+      virtual CORBA::TypeCode_ptr _type (void) const;
+    };
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr _tc_AdapterInactive;
+
+#endif /* end #if !defined */
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_enum/enum_ch.cpp:57
+    
+    enum State
+    {
+      HOLDING,
+      ACTIVE,
+      DISCARDING,
+      INACTIVE
+    };
+    
+    typedef State &State_out;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr _tc_State;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void activate (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        ::PortableServer::POAManager::AdapterInactive
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+    virtual void hold_requests (
+        ::CORBA::Boolean wait_for_completion
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        ::PortableServer::POAManager::AdapterInactive
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void discard_requests (
+        ::CORBA::Boolean wait_for_completion
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        ::PortableServer::POAManager::AdapterInactive
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void deactivate (
+        ::CORBA::Boolean etherealize_objects,
+        ::CORBA::Boolean wait_for_completion
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        ::PortableServer::POAManager::AdapterInactive
+      )) = 0;
+    
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+
+    // TAO_IDL - Generated from
+    // 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
+    // be\be_visitor_interface/interface_ch.cpp:208
+    
+    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:
+    // Abstract or local interface only.
+    POAManager (void);
+    
+    virtual ~POAManager (void);
+  
+  private:
+    // Private and unimplemented for concrete interfaces.
+    POAManager (const POAManager &);
+    
+    void operator= (const POAManager &);
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_POAManager;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:66
+
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:59
+
+// Traits specializations.
+namespace TAO
+{
+
+#if !defined (_PORTABLESERVER_POAMANAGER__TRAITS_CH_)
+#define _PORTABLESERVER_POAMANAGER__TRAITS_CH_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::POAManager>
+  {
+    static ::PortableServer::POAManager_ptr duplicate (
+        ::PortableServer::POAManager_ptr
+      );
+    static void release (
+        ::PortableServer::POAManager_ptr
+      );
+    static ::PortableServer::POAManager_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::PortableServer::POAManager_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAManager_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAManager_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POAManager_ptr &);
+
+// TAO_IDL - Generated from
+// be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POAManager::AdapterInactive &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAManager::AdapterInactive*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POAManager::AdapterInactive *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POAManager::AdapterInactive *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_ch.cpp:51
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAManager::State);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POAManager::State &);
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:961
+
+#if defined (__ACE_INLINE__)
+#include "POAManagerC.inl"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/PortableServer/POAManagerC.inl b/TAO/tao/PortableServer/POAManagerC.inl
new file mode 100644
index 00000000000..c944d806c1f
--- /dev/null
+++ b/TAO/tao/PortableServer/POAManagerC.inl
@@ -0,0 +1,27 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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/POA_Cached_Policies.cpp b/TAO/tao/PortableServer/POA_Cached_Policies.cpp
index fd705c3da9e..e5755bb3994 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.cpp
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.cpp
@@ -2,148 +2,161 @@
 
 #include "POA_Cached_Policies.h"
 #include "POA_Policy_Set.h"
+#include "IdAssignmentPolicyC.h"
+#include "IdUniquenessPolicyC.h"
+#include "ImplicitActivationPolicyC.h"
+#include "LifespanPolicyC.h"
+#include "RequestProcessingPolicyC.h"
+#include "ServantRetentionPolicyC.h"
+#include "ThreadPolicyC.h"
 
 #if !defined (__ACE_INLINE__)
 # include "POA_Cached_Policies.i"
 #endif /* ! __ACE_INLINE__ */
 
+ACE_RCSID(PortableServer,
+          POA_Cached_Policies,
+          "$Id$")
 
-ACE_RCSID(tao, POA, "$Id$")
-
-
-TAO_POA_Cached_Policies::TAO_POA_Cached_Policies ()
-  : thread_ (PortableServer::ORB_CTRL_MODEL),
-    lifespan_ (PortableServer::TRANSIENT),
-    id_uniqueness_ (PortableServer::UNIQUE_ID),
-    id_assignment_ (PortableServer::SYSTEM_ID),
-    implicit_activation_ (PortableServer::NO_IMPLICIT_ACTIVATION),
-    servant_retention_ (PortableServer::RETAIN),
-    request_processing_ (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY),
-    priority_model_ (TAO_POA_Cached_Policies::NOT_SPECIFIED),
-    server_priority_ (TAO_INVALID_PRIORITY)
+namespace TAO
 {
-}
-
+  namespace Portable_Server
+  {
+    Cached_Policies::Cached_Policies () :
+        thread_ (PortableServer::ORB_CTRL_MODEL),
+        lifespan_ (PortableServer::TRANSIENT),
+        id_uniqueness_ (PortableServer::UNIQUE_ID),
+        id_assignment_ (PortableServer::SYSTEM_ID),
+        implicit_activation_ (PortableServer::NO_IMPLICIT_ACTIVATION),
+        servant_retention_ (PortableServer::RETAIN),
+        request_processing_ (PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY),
+        priority_model_ (Cached_Policies::NOT_SPECIFIED),
+        server_priority_ (TAO_INVALID_PRIORITY)
+    {
+    }
 
-TAO_POA_Cached_Policies::~TAO_POA_Cached_Policies (void)
-{
-}
 
-void
-TAO_POA_Cached_Policies::update (TAO_POA_Policy_Set &policy_set
-                                 ACE_ENV_ARG_DECL)
-{
-  for (CORBA::ULong i = 0; i < policy_set.num_policies (); i++)
+    Cached_Policies::~Cached_Policies (void)
     {
-      CORBA::Policy_var policy = policy_set.get_policy_by_index (i);
-
-      this->update_policy (policy.in ()
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
     }
-}
 
-void
-TAO_POA_Cached_Policies::update_policy (const CORBA::Policy_ptr policy
-                                        ACE_ENV_ARG_DECL)
-{
+    void
+    Cached_Policies::update (TAO_POA_Policy_Set &policy_set
+                                     ACE_ENV_ARG_DECL)
+    {
+      for (CORBA::ULong i = 0; i < policy_set.num_policies (); i++)
+        {
+          CORBA::Policy_var policy = policy_set.get_policy_by_index (i);
+
+          this->update_policy (policy.in ()
+                               ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+    }
 
-#if (TAO_HAS_MINIMUM_POA == 0)
+    void
+    Cached_Policies::update_policy (const CORBA::Policy_ptr policy
+                                            ACE_ENV_ARG_DECL)
+    {
 
-  PortableServer::ThreadPolicy_var thread
-    = PortableServer::ThreadPolicy::_narrow (policy
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    #if (TAO_HAS_MINIMUM_POA == 0)
 
-  if (!CORBA::is_nil (thread.in ()))
-    {
-      this->thread_ = thread->value (ACE_ENV_SINGLE_ARG_PARAMETER);
+      PortableServer::ThreadPolicy_var thread
+        = PortableServer::ThreadPolicy::_narrow (policy
+                                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      return;
-    }
+      if (!CORBA::is_nil (thread.in ()))
+        {
+          this->thread_ = thread->value (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_CHECK;
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
+          return;
+        }
 
-  PortableServer::LifespanPolicy_var lifespan
-    = PortableServer::LifespanPolicy::_narrow (policy
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-  if (!CORBA::is_nil (lifespan.in ()))
-    {
-      this->lifespan_ = lifespan->value (ACE_ENV_SINGLE_ARG_PARAMETER);
+      PortableServer::LifespanPolicy_var lifespan
+        = PortableServer::LifespanPolicy::_narrow (policy
+                                                   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      return;
-    }
+      if (!CORBA::is_nil (lifespan.in ()))
+        {
+          this->lifespan_ = lifespan->value (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_CHECK;
 
-  PortableServer::IdUniquenessPolicy_var id_uniqueness
-    = PortableServer::IdUniquenessPolicy::_narrow (policy
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+          return;
+        }
 
-  if (!CORBA::is_nil (id_uniqueness.in ()))
-    {
-      this->id_uniqueness_ = id_uniqueness->value (ACE_ENV_SINGLE_ARG_PARAMETER);
+      PortableServer::IdUniquenessPolicy_var id_uniqueness
+        = PortableServer::IdUniquenessPolicy::_narrow (policy
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      return;
-    }
+      if (!CORBA::is_nil (id_uniqueness.in ()))
+        {
+          this->id_uniqueness_ = id_uniqueness->value (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_CHECK;
 
-  PortableServer::IdAssignmentPolicy_var id_assignment
-    = PortableServer::IdAssignmentPolicy::_narrow (policy
-                                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+          return;
+        }
 
-  if (!CORBA::is_nil (id_assignment.in ()))
-    {
-      this->id_assignment_ = id_assignment->value (ACE_ENV_SINGLE_ARG_PARAMETER);
+      PortableServer::IdAssignmentPolicy_var id_assignment
+        = PortableServer::IdAssignmentPolicy::_narrow (policy
+                                                       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      return;
-    }
+      if (!CORBA::is_nil (id_assignment.in ()))
+        {
+          this->id_assignment_ = id_assignment->value (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_CHECK;
 
-#if (TAO_HAS_MINIMUM_POA == 0)
+          return;
+        }
 
-  PortableServer::ImplicitActivationPolicy_var implicit_activation
-    = PortableServer::ImplicitActivationPolicy::_narrow (policy
-                                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+    #if (TAO_HAS_MINIMUM_POA == 0)
 
-  if (!CORBA::is_nil (implicit_activation.in ()))
-    {
-      this->implicit_activation_ = implicit_activation->value (ACE_ENV_SINGLE_ARG_PARAMETER);
+      PortableServer::ImplicitActivationPolicy_var implicit_activation
+        = PortableServer::ImplicitActivationPolicy::_narrow (policy
+                                                             ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      return;
-    }
+      if (!CORBA::is_nil (implicit_activation.in ()))
+        {
+          this->implicit_activation_ = implicit_activation->value (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_CHECK;
 
-  PortableServer::ServantRetentionPolicy_var servant_retention
-    = PortableServer::ServantRetentionPolicy::_narrow (policy
-                                                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+          return;
+        }
 
-  if (!CORBA::is_nil (servant_retention.in ()))
-    {
-      this->servant_retention_ = servant_retention->value (ACE_ENV_SINGLE_ARG_PARAMETER);
+      PortableServer::ServantRetentionPolicy_var servant_retention
+        = PortableServer::ServantRetentionPolicy::_narrow (policy
+                                                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      return;
-    }
+      if (!CORBA::is_nil (servant_retention.in ()))
+        {
+          this->servant_retention_ = servant_retention->value (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_CHECK;
 
-  PortableServer::RequestProcessingPolicy_var request_processing
-    = PortableServer::RequestProcessingPolicy::_narrow (policy
-                                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+          return;
+        }
 
-  if (!CORBA::is_nil (request_processing.in ()))
-    {
-      this->request_processing_ = request_processing->value (ACE_ENV_SINGLE_ARG_PARAMETER);
+      PortableServer::RequestProcessingPolicy_var request_processing
+        = PortableServer::RequestProcessingPolicy::_narrow (policy
+                                                            ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      return;
-    }
+      if (!CORBA::is_nil (request_processing.in ()))
+        {
+          this->request_processing_ = request_processing->value (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_CHECK;
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
+          return;
+        }
+
+    #endif /* TAO_HAS_MINIMUM_POA == 0 */
+    }
+  }
 }
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.h b/TAO/tao/PortableServer/POA_Cached_Policies.h
index 74c5986b947..d0d26a5bb8d 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.h
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.h
@@ -16,86 +16,91 @@
 #define TAO_POA_CACHED_POLICIES_H
 #include /**/ "ace/pre.h"
 
-#include "POA_Policies.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
+#include "ThreadPolicyC.h"
+#include "LifespanPolicyC.h"
+#include "IdUniquenessPolicyC.h"
+#include "IdAssignmentPolicyC.h"
+#include "ImplicitActivationPolicyC.h"
+#include "ServantRetentionPolicyC.h"
+#include "RequestProcessingPolicyC.h"
 
 // Forward references.
 class TAO_POA_Policy_Set;
 
-class TAO_PortableServer_Export TAO_POA_Cached_Policies
+namespace TAO
 {
-public:
-
-  enum PriorityModel
+  namespace Portable_Server
   {
-    CLIENT_PROPAGATED,
-    SERVER_DECLARED,
-    NOT_SPECIFIED
-  };
+    class TAO_PortableServer_Export Cached_Policies
+    {
+    public:
 
-  TAO_POA_Cached_Policies ();
+      enum PriorityModel
+      {
+        CLIENT_PROPAGATED,
+        SERVER_DECLARED,
+        NOT_SPECIFIED
+      };
 
-  ~TAO_POA_Cached_Policies (void);
+      Cached_Policies ();
 
-  /// Update the cached policy values.
-  void update (TAO_POA_Policy_Set &policy_set
-               ACE_ENV_ARG_DECL);
+      ~Cached_Policies (void);
 
-  /// Accessor methods to cached values.
-  PortableServer::ThreadPolicyValue thread (void) const;
-  PortableServer::LifespanPolicyValue lifespan (void) const;
-  PortableServer::IdUniquenessPolicyValue id_uniqueness (void) const;
-  PortableServer::IdAssignmentPolicyValue id_assignment (void) const;
-  PortableServer::ImplicitActivationPolicyValue implicit_activation (void) const;
-  PortableServer::ServantRetentionPolicyValue servant_retention (void) const;
-  PortableServer::RequestProcessingPolicyValue request_processing (void) const;
-  PriorityModel priority_model (void) const;
-  CORBA::Short server_priority (void) const;
+      /// Update the cached policy values.
+      void update (TAO_POA_Policy_Set &policy_set
+                   ACE_ENV_ARG_DECL);
 
-  void priority_model (PriorityModel priority_model);
-  void server_priority (CORBA::Short priority);
-  void implicit_activation (PortableServer::ImplicitActivationPolicyValue value);
+      /**
+       * @name Accessor methods to cached values.
+       */
+      //@{
+      PortableServer::ThreadPolicyValue thread (void) const;
+      PortableServer::LifespanPolicyValue lifespan (void) const;
+      PortableServer::IdUniquenessPolicyValue id_uniqueness (void) const;
+      PortableServer::IdAssignmentPolicyValue id_assignment (void) const;
+      PortableServer::ImplicitActivationPolicyValue implicit_activation (void) const;
+      PortableServer::ServantRetentionPolicyValue servant_retention (void) const;
+      PortableServer::RequestProcessingPolicyValue request_processing (void) const;
+      PriorityModel priority_model (void) const;
+      CORBA::Short server_priority (void) const;
 
-protected:
+      void priority_model (PriorityModel priority_model);
+      void server_priority (CORBA::Short priority);
+      void implicit_activation (PortableServer::ImplicitActivationPolicyValue value);
+      //@}
 
-  /// Helper method to update a particular policy.
-  void update_policy (const CORBA::Policy_ptr policy
-                      ACE_ENV_ARG_DECL);
+    protected:
 
-  PortableServer::ThreadPolicyValue thread_;
+      /// Helper method to update a particular policy.
+      void update_policy (const CORBA::Policy_ptr policy
+                          ACE_ENV_ARG_DECL);
 
-  PortableServer::LifespanPolicyValue lifespan_;
+      PortableServer::ThreadPolicyValue thread_;
 
-  PortableServer::IdUniquenessPolicyValue id_uniqueness_;
+      PortableServer::LifespanPolicyValue lifespan_;
 
-  PortableServer::IdAssignmentPolicyValue id_assignment_;
+      PortableServer::IdUniquenessPolicyValue id_uniqueness_;
 
-  PortableServer::ImplicitActivationPolicyValue implicit_activation_;
+      PortableServer::IdAssignmentPolicyValue id_assignment_;
 
-  PortableServer::ServantRetentionPolicyValue servant_retention_;
+      PortableServer::ImplicitActivationPolicyValue implicit_activation_;
 
-  PortableServer::RequestProcessingPolicyValue request_processing_;
+      PortableServer::ServantRetentionPolicyValue servant_retention_;
 
-  PriorityModel priority_model_;
+      PortableServer::RequestProcessingPolicyValue request_processing_;
 
-  CORBA::Short server_priority_;
-};
+      PriorityModel priority_model_;
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
+      CORBA::Short server_priority_;
+    };
+  }
+}
 
 #if defined (__ACE_INLINE__)
 # include "POA_Cached_Policies.i"
diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.i b/TAO/tao/PortableServer/POA_Cached_Policies.i
index 88993453c0d..279ed235683 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.i
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.i
@@ -1,73 +1,79 @@
 // $Id$
 
-ACE_INLINE PortableServer::ThreadPolicyValue
-TAO_POA_Cached_Policies::thread (void) const
+namespace TAO
 {
-  return this->thread_;
-}
+  namespace Portable_Server
+  {
+    ACE_INLINE PortableServer::ThreadPolicyValue
+    Cached_Policies::thread (void) const
+    {
+      return this->thread_;
+    }
 
-ACE_INLINE PortableServer::LifespanPolicyValue
-TAO_POA_Cached_Policies::lifespan (void) const
-{
-  return this->lifespan_;
-}
+    ACE_INLINE PortableServer::LifespanPolicyValue
+    Cached_Policies::lifespan (void) const
+    {
+      return this->lifespan_;
+    }
 
-ACE_INLINE PortableServer::IdUniquenessPolicyValue
-TAO_POA_Cached_Policies::id_uniqueness (void) const
-{
-  return this->id_uniqueness_;
-}
+    ACE_INLINE PortableServer::IdUniquenessPolicyValue
+    Cached_Policies::id_uniqueness (void) const
+    {
+      return this->id_uniqueness_;
+    }
 
-ACE_INLINE PortableServer::IdAssignmentPolicyValue
-TAO_POA_Cached_Policies::id_assignment (void) const
-{
-  return this->id_assignment_;
-}
+    ACE_INLINE PortableServer::IdAssignmentPolicyValue
+    Cached_Policies::id_assignment (void) const
+    {
+      return this->id_assignment_;
+    }
 
-ACE_INLINE PortableServer::ImplicitActivationPolicyValue
-TAO_POA_Cached_Policies::implicit_activation (void) const
-{
-  return this->implicit_activation_;
-}
+    ACE_INLINE PortableServer::ImplicitActivationPolicyValue
+    Cached_Policies::implicit_activation (void) const
+    {
+      return this->implicit_activation_;
+    }
 
-ACE_INLINE PortableServer::ServantRetentionPolicyValue
-TAO_POA_Cached_Policies::servant_retention (void) const
-{
-  return this->servant_retention_;
-}
+    ACE_INLINE PortableServer::ServantRetentionPolicyValue
+    Cached_Policies::servant_retention (void) const
+    {
+      return this->servant_retention_;
+    }
 
-ACE_INLINE PortableServer::RequestProcessingPolicyValue
-TAO_POA_Cached_Policies::request_processing (void) const
-{
-  return this->request_processing_;
-}
+    ACE_INLINE PortableServer::RequestProcessingPolicyValue
+    Cached_Policies::request_processing (void) const
+    {
+      return this->request_processing_;
+    }
 
-ACE_INLINE TAO_POA_Cached_Policies::PriorityModel
-TAO_POA_Cached_Policies::priority_model (void) const
-{
-  return this->priority_model_;
-}
+    ACE_INLINE Cached_Policies::PriorityModel
+    Cached_Policies::priority_model (void) const
+    {
+      return this->priority_model_;
+    }
 
-ACE_INLINE CORBA::Short
-TAO_POA_Cached_Policies::server_priority (void) const
-{
-  return this->server_priority_;
-}
+    ACE_INLINE CORBA::Short
+    Cached_Policies::server_priority (void) const
+    {
+      return this->server_priority_;
+    }
 
-ACE_INLINE void
-TAO_POA_Cached_Policies::priority_model (PriorityModel priority_model)
-{
-  this->priority_model_ = priority_model;
-}
+    ACE_INLINE void
+    Cached_Policies::priority_model (PriorityModel priority_model)
+    {
+      this->priority_model_ = priority_model;
+    }
 
-ACE_INLINE void
-TAO_POA_Cached_Policies::server_priority (CORBA::Short priority)
-{
-  this->server_priority_ = priority;
-}
+    ACE_INLINE void
+    Cached_Policies::server_priority (CORBA::Short priority)
+    {
+      this->server_priority_ = priority;
+    }
 
-ACE_INLINE void
-TAO_POA_Cached_Policies::implicit_activation (PortableServer::ImplicitActivationPolicyValue value)
-{
-  this->implicit_activation_ = value;
+    ACE_INLINE void
+    Cached_Policies::implicit_activation (PortableServer::ImplicitActivationPolicyValue value)
+    {
+      this->implicit_activation_ = value;
+    }
+  }
 }
diff --git a/TAO/tao/PortableServer/POA_Current.cpp b/TAO/tao/PortableServer/POA_Current.cpp
new file mode 100644
index 00000000000..7e6bc594412
--- /dev/null
+++ b/TAO/tao/PortableServer/POA_Current.cpp
@@ -0,0 +1,83 @@
+// $Id$
+
+// -- PortableServer Include --
+#include "POA_Current.h"
+#include "POA_Current_Impl.h"
+
+// -- TAO Include --
+#include "tao/TSS_Resources.h"
+
+#if !defined (__ACE_INLINE__)
+# include "POA_Current.inl"
+#endif /* __ACE_INLINE__ */
+
+ACE_RCSID (PortableServer,
+           POA_Current,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    PortableServer::POA_ptr
+    POA_Current::get_POA (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       PortableServer::Current::NoContext))
+    {
+      POA_Current_Impl *impl = this->implementation ();
+
+      if (impl == 0)
+        ACE_THROW_RETURN (PortableServer::Current::NoContext (),
+                          0);
+      return impl->get_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
+    }
+
+    PortableServer::ObjectId *
+    POA_Current::get_object_id (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       PortableServer::Current::NoContext))
+    {
+      POA_Current_Impl *impl = this->implementation ();
+
+      if (impl == 0)
+        ACE_THROW_RETURN (PortableServer::Current::NoContext (),
+                          0);
+      return impl->get_object_id (ACE_ENV_SINGLE_ARG_PARAMETER);
+    }
+
+    PortableServer::Servant
+    POA_Current::get_servant (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       PortableServer::Current::NoContext))
+    {
+      POA_Current_Impl *impl = this->implementation ();
+
+      if (impl == 0)
+        ACE_THROW_RETURN (PortableServer::Current::NoContext (),
+                          0);
+      return impl->get_servant (ACE_ENV_SINGLE_ARG_PARAMETER);
+    }
+
+
+    POA_Current_Impl *
+    POA_Current::implementation (void)
+    {
+      return static_cast <POA_Current_Impl *>
+                        (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
+    }
+
+    POA_Current_Impl *
+    POA_Current::implementation (POA_Current_Impl *new_current)
+    {
+      TAO_TSS_Resources *tss =
+        TAO_TSS_RESOURCES::instance ();
+
+      POA_Current_Impl *old =
+        static_cast <POA_Current_Impl *>
+                     (tss->poa_current_impl_);
+      tss->poa_current_impl_ = new_current;
+      return old;
+    }
+  }
+}
+
diff --git a/TAO/tao/PortableServer/POA_Current.h b/TAO/tao/PortableServer/POA_Current.h
new file mode 100644
index 00000000000..24def1e7e31
--- /dev/null
+++ b/TAO/tao/PortableServer/POA_Current.h
@@ -0,0 +1,95 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    POA_Current.h
+ *
+ *  $Id$
+ *
+ *  @author Irfan Pyarali
+ */
+//=============================================================================
+
+#ifndef TAO_POA_CURRENT_H
+#define TAO_POA_CURRENT_H
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+// Local Object
+#include "tao/LocalObject.h"
+
+#include "PS_CurrentC.h"
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class POA_Current_Impl;
+
+    class TAO_PortableServer_Export POA_Current
+      : public PortableServer::Current,
+        public TAO_Local_RefCounted_Object
+    {
+    public:
+      /// Constructor
+      POA_Current (void);
+
+      /**
+       * Returns the POA on which the current request is being invoked.
+       * Can raise the @c NoContext exception if this function is
+       * not invoked in the context of an upcall.
+       */
+      PortableServer::POA_ptr get_POA (ACE_ENV_SINGLE_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::Current::NoContext));
+
+      /**
+       * Returns the object id of the current request being invoked.  Can
+       * raise the @c NoContext exception if this function is not
+       * invoked in the context of an upcall.
+       */
+      PortableServer::ObjectId *get_object_id (ACE_ENV_SINGLE_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::Current::NoContext));
+
+      /**
+       * Returns a reference to the servant that hosts the object in whose
+       * context it is called. If called outside the context of the POA
+       * dispatched operation, a NoContext exception is raised
+       */
+      PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::Current::NoContext));
+
+      /// Returns the class that implements this interface.
+      POA_Current_Impl *implementation (void);
+
+      /// Sets the thread-specific pointer to the new POA Current state,
+      /// returning a pointer to the existing POA Current state.
+      POA_Current_Impl *implementation (POA_Current_Impl *new_current);
+    };
+  }
+}
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__ACE_INLINE__)
+# include "POA_Current.inl"
+#endif /* __ACE_INLINE__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_POA_CURRENT_H */
diff --git a/TAO/tao/PortableServer/POA_Current.inl b/TAO/tao/PortableServer/POA_Current.inl
new file mode 100644
index 00000000000..4c445f2d29c
--- /dev/null
+++ b/TAO/tao/PortableServer/POA_Current.inl
@@ -0,0 +1,16 @@
+// -*- C++ -*-
+//
+// $Id$
+
+#include "tao/SystemException.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    ACE_INLINE
+    POA_Current::POA_Current (void)
+    {
+    }
+  }
+}
diff --git a/TAO/tao/PortableServer/POA_Current_Impl.cpp b/TAO/tao/PortableServer/POA_Current_Impl.cpp
new file mode 100644
index 00000000000..baeb0a6dbf0
--- /dev/null
+++ b/TAO/tao/PortableServer/POA_Current_Impl.cpp
@@ -0,0 +1,134 @@
+// $Id$
+
+// -- PortableServer Include --
+#include "Object_Adapter.h"
+#include "POA_Current_Impl.h"
+#include "Root_POA.h"
+#include "POA_Guard.h"
+#include "ServerRequestInfo.h"
+#include "Default_Servant_Dispatcher.h"
+#include "ServerInterceptorAdapter.h"
+#include "Collocated_Object_Proxy_Broker.h"
+
+// -- ACE Include --
+#include "ace/Auto_Ptr.h"
+
+// -- TAO Include --
+#include "tao/ORB.h"
+#include "tao/ORB_Core.h"
+#include "tao/TSS_Resources.h"
+#include "tao/TAO_Server_Request.h"
+#include "tao/Stub.h"
+#include "tao/Profile.h"
+#include "tao/MProfile.h"
+#include "tao/debug.h"
+#include "tao/PortableInterceptor.h"
+#include "tao/ORBInitializer_Registry.h"
+#include "tao/Thread_Lane_Resources_Manager.h"
+#include "tao/Thread_Lane_Resources.h"
+#include "tao/Protocols_Hooks.h"
+
+#include "Policy_Creator_T.h"
+
+#if !defined (__ACE_INLINE__)
+# include "POA_Current_Impl.inl"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/OS_NS_string.h"
+
+#include "ace/Dynamic_Service.h"
+
+ACE_RCSID (PortableServer,
+           POA_Current_IMpl,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    POA_Current_Impl::POA_Current_Impl (void)
+      : poa_ (0),
+        object_id_ (),
+        object_key_ (0),
+        servant_ (0),
+        priority_ (TAO_INVALID_PRIORITY),
+        previous_current_impl_ (0),
+        setup_done_ (0)
+    {
+    }
+
+    void
+    POA_Current_Impl::setup (TAO_Root_POA *p,
+                             const TAO::ObjectKey &key)
+    {
+      // Remember information about this upcall.
+      this->poa_ = p;
+      this->object_key_ = &key;
+
+      // Set the current context and remember the old one.
+      this->tss_resources_ = TAO_TSS_RESOURCES::instance ();
+
+      this->previous_current_impl_ =
+        static_cast <POA_Current_Impl *>
+                         (this->tss_resources_->poa_current_impl_);
+      this->tss_resources_->poa_current_impl_ = this;
+
+      // Setup is complete.
+      this->setup_done_ = 1;
+    }
+
+    POA_Current_Impl *
+    POA_Current_Impl::previous (void) const
+    {
+      return this->previous_current_impl_;
+    }
+
+    void
+    POA_Current_Impl::teardown (void)
+    {
+      if (this->setup_done_)
+        {
+          // Reset the old context.
+          this->tss_resources_->poa_current_impl_ = this->previous_current_impl_;
+        }
+    }
+
+    PortableServer::POA_ptr
+    POA_Current_Impl::get_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       PortableServer::Current::NoContext))
+    {
+      return PortableServer::POA::_duplicate (this->poa_);
+    }
+
+    PortableServer::ObjectId *
+    POA_Current_Impl::get_object_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       PortableServer::Current::NoContext))
+    {
+      PortableServer::ObjectId *objid = 0;
+
+      // Create a new one and pass it back
+      ACE_NEW_RETURN (objid,
+                      PortableServer::ObjectId (this->object_id_),
+                      0);
+      return objid;
+    }
+
+    PortableServer::Servant
+    POA_Current_Impl::get_servant (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       PortableServer::Current::NoContext))
+    {
+      return this->servant_;
+    }
+
+    TAO_ORB_Core &
+    POA_Current_Impl::orb_core (void) const
+
+    {
+      return this->poa_->orb_core ();
+    }
+  }
+}
+
diff --git a/TAO/tao/PortableServer/POA_Current_Impl.h b/TAO/tao/PortableServer/POA_Current_Impl.h
new file mode 100644
index 00000000000..68bfa05a434
--- /dev/null
+++ b/TAO/tao/PortableServer/POA_Current_Impl.h
@@ -0,0 +1,196 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    POA_Current_Impl.h
+ *
+ *  $Id$
+ *
+ *  @author Irfan Pyarali
+ */
+//=============================================================================
+
+#ifndef TAO_POA_CURRENT_IMPL_H
+#define TAO_POA_CURRENT_IMPL_H
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "PS_CurrentC.h"
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class Non_Servant_Upcall;
+    class Servant_Upcall;
+  }
+}
+
+// ****************************************************************
+
+// Forward declaration
+class TAO_Root_POA;
+class TAO_POA_Manager;
+class TAO_TSS_Resources;
+class TAO_Transport;
+class TAO_Servant_Dispatcher;
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    /**
+     * @class POA_Current_Impl
+     *
+     * @brief Implementation of the PortableServer::Current object.
+     *
+     * Objects of this class hold state information regarding the
+     * current POA invocation.  Savvy readers will notice that this
+     * contains substantially more methods than the POA spec shows;
+     * they exist because the ORB either (a) needs them or (b) finds
+     * them useful for implementing a more efficient ORB.
+     * The intent is that instances of this class are held in
+     * Thread-Specific Storage so that upcalls can get context
+     * information regarding their invocation.  The POA itself must
+     * insure that all <set_*> operations are performed in the
+     * execution thread so that the proper <TAO_POA_Current> pointer
+     * is obtained from TSS.
+     */
+    class TAO_PortableServer_Export POA_Current_Impl
+    {
+    public:
+
+      friend class TAO_Root_POA;
+
+      /// Return pointer to the invoking POA.  Raises the
+      /// <CORBA::NoContext> exception.
+      PortableServer::POA_ptr get_POA (ACE_ENV_SINGLE_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::Current::NoContext));
+
+      /**
+       * Return pointer to the object id through which this was invoked.
+       * This may be necessary in cases where a <Servant> is serving under
+       * the guise of multiple object ids.  This has _out semantics Raises
+       * the <CORBA::NoContext> exception.
+       */
+      PortableServer::ObjectId *get_object_id (ACE_ENV_SINGLE_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::Current::NoContext));
+
+      /**
+       * Returns a reference to the servant that hosts the object in whose
+       * context it is called. If called outside the context of the POA
+       * dispatched operation, a NoContext exception is raised
+       */
+      PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::Current::NoContext));
+
+      /// Set the POA implementation.
+      void poa (TAO_Root_POA *);
+
+      /// Get the POA implemantation
+      TAO_Root_POA *poa (void) const;
+
+      /// ORB Core for this current.
+      TAO_ORB_Core &orb_core (void) const;
+
+      /// Set the object ID.
+      void object_id (const PortableServer::ObjectId &id);
+
+      /// Get the object ID.
+      const PortableServer::ObjectId &object_id (void) const;
+
+      /// Just replace the object id smartly
+      void replace_object_id (const PortableServer::ObjectId &system_id);
+
+      /// Set the object key.
+      void object_key (const TAO::ObjectKey &key);
+
+      /// Get the object key.
+      const TAO::ObjectKey &object_key (void) const;
+
+      /// Set the servant for the current upcall.
+      void servant (PortableServer::Servant servant);
+
+      /// Get the servant for the current upcall.
+      PortableServer::Servant servant (void) const;
+
+      /// Set the priority for the current upcall.
+      void priority (CORBA::Short priority);
+
+      /// Get the priority for the current upcall.
+      CORBA::Short priority (void) const;
+
+      /// Convenience constructor combining construction & initialization.
+      POA_Current_Impl (void);
+
+      /// Return the previous current implementation.
+      POA_Current_Impl *previous (void) const;
+
+      /// Teardown the current for this request.
+      void teardown (void);
+
+      /// Setup the current.
+      void setup (TAO_Root_POA *impl,
+                  const TAO::ObjectKey &key);
+
+    protected:
+      /// The POA implementation invoking an upcall
+      TAO_Root_POA *poa_;
+
+      /**
+       * The object ID of the current context.  This is the user id and
+       * not the id the goes into the IOR.  Note also that unlike the
+       * <object_key>, this field is stored by value.
+       */
+      PortableServer::ObjectId object_id_;
+
+      /// The object key of the current context.
+      const TAO::ObjectKey *object_key_;
+
+      /// The servant for the current upcall.
+      PortableServer::Servant servant_;
+
+      /// The priority for the current upcall.
+      CORBA::Short priority_;
+
+      /// Current previous from <this>.
+      POA_Current_Impl *previous_current_impl_;
+
+      /// Is setup complete?
+      int setup_done_;
+
+      /// Pointer to tss resources.
+      TAO_TSS_Resources *tss_resources_;
+
+      // = Hidden because we don't allow these
+      POA_Current_Impl (const POA_Current_Impl &);
+      void operator= (const POA_Current_Impl &);
+    };
+  }
+}
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__ACE_INLINE__)
+# include "POA_Current_Impl.inl"
+#endif /* __ACE_INLINE__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_POA_CURRENT_IMPL_H */
diff --git a/TAO/tao/PortableServer/POA_Current_Impl.inl b/TAO/tao/PortableServer/POA_Current_Impl.inl
new file mode 100644
index 00000000000..292e8b59b40
--- /dev/null
+++ b/TAO/tao/PortableServer/POA_Current_Impl.inl
@@ -0,0 +1,83 @@
+// -*- C++ -*-
+//
+// $Id$
+
+#include "tao/SystemException.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    ACE_INLINE void
+    POA_Current_Impl::poa (TAO_Root_POA *p)
+    {
+      this->poa_ = p;
+    }
+
+    ACE_INLINE TAO_Root_POA *
+    POA_Current_Impl::poa (void) const
+    {
+      return this->poa_;
+    }
+
+    ACE_INLINE void
+    POA_Current_Impl::object_id (const PortableServer::ObjectId &id)
+    {
+      this->object_id_ = id;
+    }
+
+    ACE_INLINE const PortableServer::ObjectId &
+    POA_Current_Impl::object_id (void) const
+    {
+      return this->object_id_;
+    }
+
+    ACE_INLINE void
+    POA_Current_Impl::replace_object_id (
+      const PortableServer::ObjectId &system_id)
+    {
+      object_id_.replace (system_id.maximum (),
+                          system_id.length (),
+                          const_cast <CORBA::Octet *> (system_id.get_buffer ()),
+                          0);
+    }
+
+    ACE_INLINE void
+    POA_Current_Impl::object_key (const TAO::ObjectKey &key)
+    {
+      this->object_key_ = &key;
+    }
+
+    ACE_INLINE const TAO::ObjectKey &
+    POA_Current_Impl::object_key (void) const
+    {
+      return *this->object_key_;
+    }
+
+    ACE_INLINE void
+    POA_Current_Impl::servant (PortableServer::Servant servant)
+    {
+      this->servant_ = servant;
+    }
+
+    ACE_INLINE PortableServer::Servant
+    POA_Current_Impl::servant (void) const
+    {
+      return this->servant_;
+    }
+
+    ACE_INLINE void
+    POA_Current_Impl::priority (CORBA::Short priority)
+    {
+      this->priority_ = priority;
+    }
+
+    ACE_INLINE CORBA::Short
+    POA_Current_Impl::priority (void) const
+    {
+      return this->priority_;
+    }
+
+  }
+}
+
diff --git a/TAO/tao/PortableServer/POA_Guard.cpp b/TAO/tao/PortableServer/POA_Guard.cpp
new file mode 100644
index 00000000000..d16a0f01c12
--- /dev/null
+++ b/TAO/tao/PortableServer/POA_Guard.cpp
@@ -0,0 +1,45 @@
+// $Id$
+
+#include "POA_Guard.h"
+#include "Root_POA.h"
+#include "tao/ORB_Constants.h"
+
+ACE_RCSID(PortableServer,
+          POA_Guard,
+          "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    POA_Guard::POA_Guard (TAO_Root_POA &poa
+                          ACE_ENV_ARG_DECL,
+                          int check_for_destruction)
+      : guard_ (poa.lock ())
+    {
+      if (!this->guard_.locked ())
+        ACE_THROW (
+          CORBA::INTERNAL (
+            CORBA::SystemException::_tao_minor_code (
+              TAO_GUARD_FAILURE,
+              0),
+            CORBA::COMPLETED_NO));
+
+      // Check if a non-servant upcall is in progress.  If a non-servant
+      // upcall is in progress, wait for it to complete.  Unless of
+      // course, the thread making the non-servant upcall is this thread.
+      poa.object_adapter ().wait_for_non_servant_upcalls_to_complete (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+
+      if (check_for_destruction &&
+          poa.cleanup_in_progress ())
+        ACE_THROW (
+          CORBA::BAD_INV_ORDER (
+            CORBA::SystemException::_tao_minor_code (
+              TAO_POA_BEING_DESTROYED,
+              0),
+            CORBA::COMPLETED_NO));
+    }
+  }
+}
+
diff --git a/TAO/tao/PortableServer/POA_Guard.h b/TAO/tao/PortableServer/POA_Guard.h
new file mode 100644
index 00000000000..57af2de665f
--- /dev/null
+++ b/TAO/tao/PortableServer/POA_Guard.h
@@ -0,0 +1,53 @@
+/* -*- C++ -*- */
+
+//=============================================================================
+/**
+ *  @file    POA_Guard.h
+ *
+ *  $Id$
+ *
+ */
+//=============================================================================
+
+#ifndef TAO_POA_GUARD_H
+#define TAO_POA_GUARD_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Guard_T.h"
+#include "ace/CORBA_macros.h"
+#include "tao/Environment.h"
+
+class TAO_Root_POA;
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    /**
+     * @class POA_Guard
+     *
+     * @brief POA_Guard
+     *
+     * POA_Guard
+     */
+    class TAO_PortableServer_Export POA_Guard
+    {
+    public:
+      POA_Guard (TAO_Root_POA &poa
+                 ACE_ENV_ARG_DECL,
+                 int check_for_destruction = 1);
+
+    private:
+      ACE_Guard<ACE_Lock> guard_;
+    };
+  } /* namespace Portable_Server */
+} /* namespace TAO */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_POA_GUARD_H */
diff --git a/TAO/tao/PortableServer/POA_Policies.cpp b/TAO/tao/PortableServer/POA_Policies.cpp
deleted file mode 100644
index b9517b4d302..00000000000
--- a/TAO/tao/PortableServer/POA_Policies.cpp
+++ /dev/null
@@ -1,517 +0,0 @@
-// @(#) $Id$
-
-#include "POA_Policies.h"
-
-#include "tao/ORB_Constants.h"
-
-ACE_RCSID(PortableServer, POA_Policies, "$Id$")
-
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-TAO_Thread_Policy::TAO_Thread_Policy (PortableServer::ThreadPolicyValue value)
-  : value_ (value)
-{
-}
-
-PortableServer::ThreadPolicyValue
-TAO_Thread_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->value_;
-}
-
-CORBA::Policy_ptr
-TAO_Thread_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_Thread_Policy *thread_policy_copy = 0;
-  ACE_NEW_THROW_EX (thread_policy_copy,
-                    TAO_Thread_Policy (this->value_),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return thread_policy_copy;
-}
-
-void
-TAO_Thread_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-CORBA::PolicyType
-TAO_Thread_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return PortableServer::THREAD_POLICY_ID;
-}
-
-TAO_Cached_Policy_Type
-TAO_Thread_Policy::_tao_cached_type (void) const
-{
-  return TAO_CACHED_POLICY_THREAD;
-}
-
-TAO_Policy_Scope
-TAO_Thread_Policy::_tao_scope (void) const
-{
-  return TAO_POLICY_POA_SCOPE;
-}
-
-CORBA::Policy_ptr
-TAO_Thread_Policy::create (const CORBA::Any &val
-                           ACE_ENV_ARG_DECL)
-{
-  PortableServer::ThreadPolicyValue value;
-  if ((val >>= value) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
-
-  TAO_Thread_Policy *tmp = 0;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_Thread_Policy (value),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return tmp;
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-/////////////////////////////////////////////////////////////////////////////
-
-TAO_Lifespan_Policy::TAO_Lifespan_Policy (PortableServer::LifespanPolicyValue value)
-  : value_ (value)
-{
-}
-
-PortableServer::LifespanPolicyValue
-TAO_Lifespan_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->value_;
-}
-
-CORBA::Policy_ptr
-TAO_Lifespan_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_Lifespan_Policy *lifespan_policy_copy = 0;
-  ACE_NEW_THROW_EX (lifespan_policy_copy,
-                    TAO_Lifespan_Policy (this->value_),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return lifespan_policy_copy;
-}
-
-void
-TAO_Lifespan_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-CORBA::PolicyType
-TAO_Lifespan_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return PortableServer::LIFESPAN_POLICY_ID;
-}
-
-TAO_Cached_Policy_Type
-TAO_Lifespan_Policy::_tao_cached_type (void) const
-{
-  return TAO_CACHED_POLICY_LIFESPAN;
-}
-
-TAO_Policy_Scope
-TAO_Lifespan_Policy::_tao_scope (void) const
-{
-  return TAO_POLICY_POA_SCOPE;
-}
-
-CORBA::Policy_ptr
-TAO_Lifespan_Policy::create (const CORBA::Any &val
-                             ACE_ENV_ARG_DECL)
-{
-  PortableServer::LifespanPolicyValue value;
-  if ((val >>= value) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
-
-  TAO_Lifespan_Policy *tmp = 0;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_Lifespan_Policy (value),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return tmp;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-TAO_Id_Uniqueness_Policy::TAO_Id_Uniqueness_Policy (PortableServer::IdUniquenessPolicyValue value)
-  : value_ (value)
-{
-}
-
-PortableServer::IdUniquenessPolicyValue
-TAO_Id_Uniqueness_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->value_;
-}
-
-CORBA::Policy_ptr
-TAO_Id_Uniqueness_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_Id_Uniqueness_Policy *id_uniqueness_policy_copy = 0;
-  ACE_NEW_THROW_EX (id_uniqueness_policy_copy,
-                    TAO_Id_Uniqueness_Policy (this->value_),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return id_uniqueness_policy_copy;
-}
-
-void
-TAO_Id_Uniqueness_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-CORBA::PolicyType
-TAO_Id_Uniqueness_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return PortableServer::ID_UNIQUENESS_POLICY_ID;
-}
-
-TAO_Cached_Policy_Type
-TAO_Id_Uniqueness_Policy::_tao_cached_type (void) const
-{
-  return TAO_CACHED_POLICY_ID_UNIQUENESS;
-}
-
-TAO_Policy_Scope
-TAO_Id_Uniqueness_Policy::_tao_scope (void) const
-{
-  return TAO_POLICY_POA_SCOPE;
-}
-
-CORBA::Policy_ptr
-TAO_Id_Uniqueness_Policy::create (const CORBA::Any &val
-                                  ACE_ENV_ARG_DECL)
-{
-  PortableServer::IdUniquenessPolicyValue value;
-  if ((val >>= value) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
-
-  TAO_Id_Uniqueness_Policy *tmp = 0;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_Id_Uniqueness_Policy (value),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return tmp;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-TAO_Id_Assignment_Policy::TAO_Id_Assignment_Policy (PortableServer::IdAssignmentPolicyValue value)
-  : value_ (value)
-{
-}
-
-PortableServer::IdAssignmentPolicyValue
-TAO_Id_Assignment_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->value_;
-}
-
-CORBA::Policy_ptr
-TAO_Id_Assignment_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_Id_Assignment_Policy *id_assignment_policy_copy = 0;
-  ACE_NEW_THROW_EX (id_assignment_policy_copy,
-                    TAO_Id_Assignment_Policy (this->value_),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return id_assignment_policy_copy;
-}
-
-void
-TAO_Id_Assignment_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-CORBA::PolicyType
-TAO_Id_Assignment_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return PortableServer::ID_ASSIGNMENT_POLICY_ID;
-}
-
-TAO_Cached_Policy_Type
-TAO_Id_Assignment_Policy::_tao_cached_type (void) const
-{
-  return TAO_CACHED_POLICY_ID_ASSIGNMENT;
-}
-
-TAO_Policy_Scope
-TAO_Id_Assignment_Policy::_tao_scope (void) const
-{
-  return TAO_POLICY_POA_SCOPE;
-}
-
-CORBA::Policy_ptr
-TAO_Id_Assignment_Policy::create (const CORBA::Any &val
-                                  ACE_ENV_ARG_DECL)
-{
-  PortableServer::IdAssignmentPolicyValue value;
-  if ((val >>= value) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
-
-  TAO_Id_Assignment_Policy *tmp = 0;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_Id_Assignment_Policy (value),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return tmp;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-TAO_Implicit_Activation_Policy::TAO_Implicit_Activation_Policy (PortableServer::ImplicitActivationPolicyValue value)
-  : value_ (value)
-{
-}
-
-PortableServer::ImplicitActivationPolicyValue
-TAO_Implicit_Activation_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->value_;
-}
-
-CORBA::Policy_ptr
-TAO_Implicit_Activation_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_Implicit_Activation_Policy *implicit_activation_policy_copy = 0;
-  ACE_NEW_THROW_EX (implicit_activation_policy_copy,
-                    TAO_Implicit_Activation_Policy (this->value_),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return implicit_activation_policy_copy;
-}
-
-void
-TAO_Implicit_Activation_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-CORBA::PolicyType
-TAO_Implicit_Activation_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return PortableServer::IMPLICIT_ACTIVATION_POLICY_ID;
-}
-
-TAO_Cached_Policy_Type
-TAO_Implicit_Activation_Policy::_tao_cached_type (void) const
-{
-  return TAO_CACHED_POLICY_IMPLICIT_ACTIVATION;
-}
-
-TAO_Policy_Scope
-TAO_Implicit_Activation_Policy::_tao_scope (void) const
-{
-  return TAO_POLICY_POA_SCOPE;
-}
-
-CORBA::Policy_ptr
-TAO_Implicit_Activation_Policy::create (const CORBA::Any &val
-                                        ACE_ENV_ARG_DECL)
-{
-  PortableServer::ImplicitActivationPolicyValue value;
-  if ((val >>= value) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
-
-  TAO_Implicit_Activation_Policy *tmp = 0;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_Implicit_Activation_Policy (value),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return tmp;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-TAO_Servant_Retention_Policy::TAO_Servant_Retention_Policy (PortableServer::ServantRetentionPolicyValue value)
-  : value_ (value)
-{
-}
-
-PortableServer::ServantRetentionPolicyValue
-TAO_Servant_Retention_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->value_;
-}
-
-CORBA::Policy_ptr
-TAO_Servant_Retention_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_Servant_Retention_Policy *servant_retention_policy_copy = 0;
-  ACE_NEW_THROW_EX (servant_retention_policy_copy,
-                    TAO_Servant_Retention_Policy (this->value_),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return servant_retention_policy_copy;
-}
-
-void
-TAO_Servant_Retention_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-CORBA::PolicyType
-TAO_Servant_Retention_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return PortableServer::SERVANT_RETENTION_POLICY_ID;
-}
-
-TAO_Cached_Policy_Type
-TAO_Servant_Retention_Policy::_tao_cached_type (void) const
-{
-  return TAO_CACHED_POLICY_SERVANT_RETENTION;
-}
-
-TAO_Policy_Scope
-TAO_Servant_Retention_Policy::_tao_scope (void) const
-{
-  return TAO_POLICY_POA_SCOPE;
-}
-
-CORBA::Policy_ptr
-TAO_Servant_Retention_Policy::create (const CORBA::Any &val
-                                      ACE_ENV_ARG_DECL)
-{
-  PortableServer::ServantRetentionPolicyValue value;
-  if ((val >>= value) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
-
-  TAO_Servant_Retention_Policy *tmp = 0;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_Servant_Retention_Policy (value),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return tmp;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-
-TAO_Request_Processing_Policy::TAO_Request_Processing_Policy (PortableServer::RequestProcessingPolicyValue value)
-  : value_ (value)
-{
-}
-
-PortableServer::RequestProcessingPolicyValue
-TAO_Request_Processing_Policy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return this->value_;
-}
-
-CORBA::Policy_ptr
-TAO_Request_Processing_Policy::copy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_Request_Processing_Policy *request_processing_policy_copy = 0;
-  ACE_NEW_THROW_EX (request_processing_policy_copy,
-                    TAO_Request_Processing_Policy (this->value_),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return request_processing_policy_copy;
-}
-
-void
-TAO_Request_Processing_Policy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-CORBA::PolicyType
-TAO_Request_Processing_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return PortableServer::REQUEST_PROCESSING_POLICY_ID;
-}
-
-TAO_Cached_Policy_Type
-TAO_Request_Processing_Policy::_tao_cached_type (void) const
-{
-  return TAO_CACHED_POLICY_REQUEST_PROCESSING;
-}
-
-TAO_Policy_Scope
-TAO_Request_Processing_Policy::_tao_scope (void) const
-{
-  return TAO_POLICY_POA_SCOPE;
-}
-
-CORBA::Policy_ptr
-TAO_Request_Processing_Policy::create (const CORBA::Any &val
-                                       ACE_ENV_ARG_DECL)
-{
-  PortableServer::RequestProcessingPolicyValue value;
-  if ((val >>= value) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
-
-  TAO_Request_Processing_Policy *tmp = 0;
-  ACE_NEW_THROW_EX (tmp,
-                    TAO_Request_Processing_Policy (value),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
-                                      CORBA::COMPLETED_NO));
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return tmp;
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/PortableServer/POA_Policies.h b/TAO/tao/PortableServer/POA_Policies.h
deleted file mode 100644
index 38d79f8d9bd..00000000000
--- a/TAO/tao/PortableServer/POA_Policies.h
+++ /dev/null
@@ -1,288 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    POA_Policies.h
- *
- *  $Id$
- *
- *   POA
- *
- *
- *  @author  Irfan Pyarali
- */
-//=============================================================================
-
-#ifndef TAO_POA_POLICIES_H
-#define TAO_POA_POLICIES_H
-#include /**/ "ace/pre.h"
-
-#include "PortableServerC.h"
-#include "tao/LocalObject.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-class TAO_PortableServer_Export TAO_Thread_Policy :
-  public PortableServer::ThreadPolicy,
-  public TAO_Local_RefCounted_Object
-{
-public:
-  TAO_Thread_Policy (PortableServer::ThreadPolicyValue value);
-
-  PortableServer::ThreadPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the cached policy type for this policy.
-  TAO_Cached_Policy_Type _tao_cached_type (void) const;
-
-  /// Returns the scope at which this policy can be applied. See orbconf.h.
-  TAO_Policy_Scope _tao_scope (void) const;
-
-  /// Helper method for the implementation of
-  /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any &val
-                                   ACE_ENV_ARG_DECL);
-
-protected:
-  PortableServer::ThreadPolicyValue value_;
-};
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-class TAO_PortableServer_Export TAO_Lifespan_Policy :
-  public PortableServer::LifespanPolicy,
-  public TAO_Local_RefCounted_Object
-{
-public:
-  TAO_Lifespan_Policy (PortableServer::LifespanPolicyValue value);
-
-  PortableServer::LifespanPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the cached policy type for this policy.
-  TAO_Cached_Policy_Type _tao_cached_type (void) const;
-
-  /// Returns the scope at which this policy can be applied. See orbconf.h.
-  TAO_Policy_Scope _tao_scope (void) const;
-
-  /// Helper method for the implementation of
-  /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any &val
-                                   ACE_ENV_ARG_DECL);
-
-protected:
-  PortableServer::LifespanPolicyValue value_;
-};
-
-class TAO_PortableServer_Export TAO_Id_Uniqueness_Policy :
-  public PortableServer::IdUniquenessPolicy,
-  public TAO_Local_RefCounted_Object
-{
-public:
-  TAO_Id_Uniqueness_Policy (PortableServer::IdUniquenessPolicyValue value);
-
-  PortableServer::IdUniquenessPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the cached policy type for this policy.
-  TAO_Cached_Policy_Type _tao_cached_type (void) const;
-
-  /// Returns the scope at which this policy can be applied. See orbconf.h.
-  TAO_Policy_Scope _tao_scope (void) const;
-
-  /// Helper method for the implementation of
-  /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any &val
-                                   ACE_ENV_ARG_DECL);
-
-protected:
-  PortableServer::IdUniquenessPolicyValue value_;
-};
-
-class TAO_PortableServer_Export TAO_Id_Assignment_Policy :
-  public PortableServer::IdAssignmentPolicy,
-  public TAO_Local_RefCounted_Object
-{
-public:
-  TAO_Id_Assignment_Policy (PortableServer::IdAssignmentPolicyValue value);
-
-  PortableServer::IdAssignmentPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the cached policy type for this policy.
-  TAO_Cached_Policy_Type _tao_cached_type (void) const;
-
-  /// Returns the scope at which this policy can be applied. See orbconf.h.
-  TAO_Policy_Scope _tao_scope (void) const;
-
-  /// Helper method for the implementation of
-  /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any &val
-                                   ACE_ENV_ARG_DECL);
-
-protected:
-  PortableServer::IdAssignmentPolicyValue value_;
-};
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-class TAO_PortableServer_Export TAO_Implicit_Activation_Policy :
-  public PortableServer::ImplicitActivationPolicy,
-  public TAO_Local_RefCounted_Object
-{
-public:
-  TAO_Implicit_Activation_Policy (PortableServer::ImplicitActivationPolicyValue value);
-
-  PortableServer::ImplicitActivationPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the cached policy type for this policy.
-  TAO_Cached_Policy_Type _tao_cached_type (void) const;
-
-  /// Returns the scope at which this policy can be applied. See orbconf.h.
-  TAO_Policy_Scope _tao_scope (void) const;
-
-  /// Helper method for the implementation of
-  /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any &val
-                                   ACE_ENV_ARG_DECL);
-
-protected:
-  PortableServer::ImplicitActivationPolicyValue value_;
-};
-
-class TAO_PortableServer_Export TAO_Servant_Retention_Policy :
-  public PortableServer::ServantRetentionPolicy,
-  public TAO_Local_RefCounted_Object
-{
-public:
-  TAO_Servant_Retention_Policy (PortableServer::ServantRetentionPolicyValue value);
-
-  PortableServer::ServantRetentionPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the cached policy type for this policy.
-  TAO_Cached_Policy_Type _tao_cached_type (void) const;
-
-  /// Returns the scope at which this policy can be applied. See orbconf.h.
-  TAO_Policy_Scope _tao_scope (void) const;
-
-  /// Helper method for the implementation of
-  /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any &val
-                                   ACE_ENV_ARG_DECL);
-
-protected:
-  PortableServer::ServantRetentionPolicyValue value_;
-};
-
-class TAO_PortableServer_Export TAO_Request_Processing_Policy :
-  public PortableServer::RequestProcessingPolicy,
-  public TAO_Local_RefCounted_Object
-{
-public:
-  TAO_Request_Processing_Policy (PortableServer::RequestProcessingPolicyValue value);
-
-  PortableServer::RequestProcessingPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Return the cached policy type for this policy.
-  TAO_Cached_Policy_Type _tao_cached_type (void) const;
-
-  /// Returns the scope at which this policy can be applied. See orbconf.h.
-  TAO_Policy_Scope _tao_scope (void) const;
-
-  /// Helper method for the implementation of
-  /// CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any &val
-                                   ACE_ENV_ARG_DECL);
-
-protected:
-  PortableServer::RequestProcessingPolicyValue value_;
-};
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_POA_POLICIES_H */
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.cpp b/TAO/tao/PortableServer/POA_Policy_Set.cpp
index 0c37b9d5535..1857737deaf 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.cpp
+++ b/TAO/tao/PortableServer/POA_Policy_Set.cpp
@@ -2,15 +2,18 @@
 
 #include "POA_Policy_Set.h"
 #include "POA_Cached_Policies.h"
-#include "tao/Policy_Validator.h"
+#include "PortableServer.h"
 
+#include "tao/Policy_Validator.h"
 #include "tao/ORB_Core.h"
 
 #if !defined (__ACE_INLINE__)
 # include "POA_Policy_Set.i"
 #endif /* ! __ACE_INLINE__ */
 
-ACE_RCSID(tao, POA, "$Id$")
+ACE_RCSID (PortableServer,
+           POA_Policy_Set,
+           "$Id$")
 
 TAO_POA_Policy_Set::TAO_POA_Policy_Set ()
   :
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.h b/TAO/tao/PortableServer/POA_Policy_Set.h
index 29bd33efd65..46fc0f4b5b7 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.h
+++ b/TAO/tao/PortableServer/POA_Policy_Set.h
@@ -17,21 +17,13 @@
 #define TAO_POA_POLICY_SET_H
 #include /**/ "ace/pre.h"
 
-#include "POA_Policies.h"
-#include "tao/Policy_Set.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
-#pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
+#include "tao/Policy_Set.h"
 
 class TAO_Policy_Validator;
 
@@ -48,6 +40,8 @@ public:
   /// Returns the policy at the specified index.
   /// CORBA::Policy::_nil () is returned if the policy doesn't exist
   CORBA::Policy *get_policy_by_index (CORBA::ULong index);
+
+  /// Get the number of policies
   CORBA::ULong num_policies (void) const;
 
   /// Obtain a single cached policy.
@@ -70,14 +64,14 @@ public:
 
   TAO_Policy_Set &policies (void);
 
+  /// Obtain a single policy.
+  CORBA::Policy_ptr get_policy (CORBA::PolicyType policy
+                                ACE_ENV_ARG_DECL);
+
 protected:
   TAO_Policy_Set impl_;
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
 #if defined (__ACE_INLINE__)
 # include "POA_Policy_Set.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/PortableServer/POA_Policy_Set.i b/TAO/tao/PortableServer/POA_Policy_Set.i
index e62bf36a1d3..fee42969600 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.i
+++ b/TAO/tao/PortableServer/POA_Policy_Set.i
@@ -39,6 +39,13 @@ TAO_POA_Policy_Set::merge_policy (const CORBA::Policy_ptr policy
   ACE_CHECK;
 }
 
+ACE_INLINE CORBA::Policy_ptr
+TAO_POA_Policy_Set::get_policy (CORBA::PolicyType policy
+                                ACE_ENV_ARG_DECL)
+{
+  return this->impl_.get_policy (policy ACE_ENV_ARG_PARAMETER);
+}
+
 ACE_INLINE TAO_Policy_Set &
 TAO_POA_Policy_Set::policies (void)
 {
diff --git a/TAO/tao/PortableServer/PS_Current.pidl b/TAO/tao/PortableServer/PS_Current.pidl
new file mode 100644
index 00000000000..6fa66b44751
--- /dev/null
+++ b/TAO/tao/PortableServer/PS_Current.pidl
@@ -0,0 +1,50 @@
+/**
+ * @file PS_Current.pidl
+ *
+ * $Id$
+ *
+ * @brief Pre-compiled IDL source for the PortableServer module.
+ *
+ * This file was used to generate the code in
+ * PS_CurrentC.{h,inl,cpp}, using the following command:
+ *
+ * tao_idl.exe \
+ *     -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT)
+ *          -Wb,export_macro=TAO_PortableServer_Export \
+ *          -Wb,export_include="portableserver_export.h" \
+ *          -Wb,pre_include="ace/pre.h" \
+ *          -Wb,post_include="ace/post.h" \
+ *          PS_Current.pidl
+ */
+
+#ifndef _PORTABLESERVER_CURRENT_IDL_
+#define _PORTABLESERVER_CURRENT_IDL_
+
+#include <tao/PortableServer/PS_Forward.pidl>
+#include <tao/Current.pidl>
+
+#pragma prefix "omg.org"
+
+module PortableServer
+{
+# pragma version PortableServer 2.3
+
+  // Current interface.
+  local interface Current : CORBA::Current
+  {
+#   pragma version Current 2.3
+
+    exception NoContext {};
+
+    POA get_POA ()
+      raises (NoContext);
+
+    ObjectId get_object_id ()
+      raises (NoContext);
+
+    Servant get_servant ()
+      raises (NoContext);
+  };
+};
+
+#endif // _PORTABLESERVER_CURRENT_IDL_
diff --git a/TAO/tao/PortableServer/PS_CurrentA.cpp b/TAO/tao/PortableServer/PS_CurrentA.cpp
new file mode 100644
index 00000000000..7093aa448ed
--- /dev/null
+++ b/TAO/tao/PortableServer/PS_CurrentA.cpp
@@ -0,0 +1,236 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+
+#include "PS_CurrentC.h"
+#include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
+#include "tao/Any_Impl_T.h"
+#include "tao/Any_Dual_Impl_T.h"
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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 (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/Current:2.3
+    8,
+  ACE_NTOHL (0x43757272), 
+  ACE_NTOHL (0x656e7400),  // name = Current
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_Current (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_Current),
+    (char *) &_oc_PortableServer_Current,
+    0,
+    0
+  );
+
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_Current =
+    &_tc_TAO_tc_PortableServer_Current;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+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 false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::Current>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::Current_ptr _tao_elem
+  )
+{
+  PortableServer::Current_ptr _tao_objptr =
+    PortableServer::Current::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::Current_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::Current>::insert (
+      _tao_any,
+      PortableServer::Current::_tao_any_destructor,
+      PortableServer::_tc_Current,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::Current_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::Current>::extract (
+        _tao_any,
+        PortableServer::Current::_tao_any_destructor,
+        PortableServer::_tc_Current,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_exception/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<PortableServer::Current::NoContext>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<PortableServer::Current::NoContext>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const PortableServer::Current::NoContext &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<PortableServer::Current::NoContext>::insert_copy (
+      _tao_any,
+      PortableServer::Current::NoContext::_tao_any_destructor,
+      PortableServer::Current::_tc_NoContext,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::Current::NoContext *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<PortableServer::Current::NoContext>::insert (
+      _tao_any,
+      PortableServer::Current::NoContext::_tao_any_destructor,
+      PortableServer::Current::_tc_NoContext,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::Current::NoContext *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const PortableServer::Current::NoContext *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const PortableServer::Current::NoContext *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<PortableServer::Current::NoContext>::extract (
+        _tao_any,
+        PortableServer::Current::NoContext::_tao_any_destructor,
+        PortableServer::Current::_tc_NoContext,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        PortableServer::Current::NoContext
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        PortableServer::Current
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        PortableServer::Current::NoContext \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        PortableServer::Current \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/PS_CurrentC.cpp b/TAO/tao/PortableServer/PS_CurrentC.cpp
new file mode 100644
index 00000000000..7e5d186e784
--- /dev/null
+++ b/TAO/tao/PortableServer/PS_CurrentC.cpp
@@ -0,0 +1,367 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:302
+
+
+#include "PS_CurrentC.h"
+#include "tao/CDR.h"
+#include "tao/Typecode.h"
+#include "ace/OS_NS_string.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if !defined (__ACE_INLINE__)
+#include "PS_CurrentC.inl"
+#endif /* !defined INLINE */
+
+// TAO_IDL - Generated from
+// be\be_visitor_arg_traits.cpp:66
+
+// Arg traits specializations.
+namespace TAO
+{
+}
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/interface_cs.cpp:60
+
+// Traits specializations for PortableServer::Current.
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+PortableServer::Current_ptr
+TAO::Objref_Traits<PortableServer::Current>::duplicate (
+    PortableServer::Current_ptr p
+  )
+{
+  return PortableServer::Current::_duplicate (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+void
+TAO::Objref_Traits<PortableServer::Current>::release (
+    PortableServer::Current_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+PortableServer::Current_ptr
+TAO::Objref_Traits<PortableServer::Current>::nil (void)
+{
+  return PortableServer::Current::_nil ();
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+CORBA::Boolean
+TAO::Objref_Traits<PortableServer::Current>::marshal (
+    PortableServer::Current_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return CORBA::Object::marshal (p, cdr);
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_exception/exception_cs.cpp:63
+
+PortableServer::Current::NoContext::NoContext (void)
+  : CORBA::UserException (
+        "IDL:omg.org/PortableServer/Current/NoContext:2.3",
+        "NoContext"
+      )
+{
+}
+
+PortableServer::Current::NoContext::~NoContext (void)
+{
+}
+
+PortableServer::Current::NoContext::NoContext (const ::PortableServer::Current::NoContext &_tao_excp)
+  : CORBA::UserException (
+        _tao_excp._rep_id (),
+        _tao_excp._name ()
+      )
+{
+}
+
+PortableServer::Current::NoContext&
+PortableServer::Current::NoContext::operator= (const ::PortableServer::Current::NoContext &_tao_excp)
+{
+  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  return *this;
+}
+
+void PortableServer::Current::NoContext::_tao_any_destructor (void *_tao_void_pointer)
+{
+  NoContext *_tao_tmp_pointer =
+    static_cast<NoContext *> (_tao_void_pointer);
+  delete _tao_tmp_pointer;
+}
+
+PortableServer::Current::NoContext *
+PortableServer::Current::NoContext::_downcast (CORBA::Exception *_tao_excp)
+{
+  return dynamic_cast<NoContext *> (_tao_excp);
+}
+
+const PortableServer::Current::NoContext *
+PortableServer::Current::NoContext::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const NoContext *> (_tao_excp);
+}
+
+CORBA::Exception *PortableServer::Current::NoContext::_alloc (void)
+{
+  CORBA::Exception *retval = 0;
+  ACE_NEW_RETURN (retval, ::PortableServer::Current::NoContext, 0);
+  return retval;
+}
+
+CORBA::Exception *
+PortableServer::Current::NoContext::_tao_duplicate (void) const
+{
+  CORBA::Exception *result;
+  ACE_NEW_RETURN (
+      result,
+      ::PortableServer::Current::NoContext (*this),
+      0
+    );
+  return result;
+}
+
+void PortableServer::Current::NoContext::_raise (void) const
+{
+  TAO_RAISE (*this);
+}
+
+void PortableServer::Current::NoContext::_tao_encode (
+    TAO_OutputCDR &
+    ACE_ENV_ARG_DECL
+  ) const
+{
+  ACE_THROW (CORBA::MARSHAL ());
+}
+
+void PortableServer::Current::NoContext::_tao_decode (
+    TAO_InputCDR &
+    ACE_ENV_ARG_DECL
+  )
+{
+  ACE_THROW (CORBA::MARSHAL ());
+}
+
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::Current::NoContext::_type (void) const
+{
+  return ::PortableServer::Current::_tc_NoContext;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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 (0x0),  // repository ID = IDL:omg.org/PortableServer/Current/NoContext:2.3
+    10,
+  ACE_NTOHL (0x4e6f436f), 
+  ACE_NTOHL (0x6e746578), 
+  ACE_NTOHL (0x74000000),  // name = NoContext
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_Current_NoContext (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_Current_NoContext),
+    (char *) &_oc_PortableServer_Current_NoContext,
+    0,
+    0
+  );
+
+::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 =
+    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::_unchecked_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 (
+          value,
+          "IDL:omg.org/CORBA/Current:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/PortableServer/Current:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          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
+// be\be_visitor_root/root.cpp:1629
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Objref_Traits<
+        PortableServer::Current
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::Current
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::Current
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Objref_Traits< \
+        PortableServer::Current \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::Current
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::Current
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/PS_CurrentC.h b/TAO/tao/PortableServer/PS_CurrentC.h
new file mode 100644
index 00000000000..98d62db6d41
--- /dev/null
+++ b/TAO/tao/PortableServer/PS_CurrentC.h
@@ -0,0 +1,329 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:153
+
+#ifndef _TAO_IDL_ORIG_PS_CURRENTC_H_
+#define _TAO_IDL_ORIG_PS_CURRENTC_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "portableserver_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
+#include "tao/Environment.h"
+#include "tao/Object.h"
+#include "tao/Objref_VarOut_T.h"
+
+#include "tao/PortableServer/PS_ForwardC.h"
+#include "tao/CurrentC.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_PortableServer_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_ch.cpp:62
+
+namespace TAO
+{
+  class Collocation_Proxy_Broker;
+  
+  template<typename T> class Narrow_Utils;
+  template<typename T> class AbstractBase_Narrow_Utils;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_interface.cpp:598
+
+#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;
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_interface/interface_ch.cpp:54
+
+#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;
+    
+    // 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 static_cast<Current_ptr> (0);
+    }
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // 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 const NoContext *_downcast (CORBA::Exception const *);
+      
+      static CORBA::Exception *_alloc (void);
+      
+      virtual CORBA::Exception *_tao_duplicate (void) const;
+
+      virtual void _raise (void) const;
+
+      virtual void _tao_encode (
+          TAO_OutputCDR &
+          ACE_ENV_ARG_DECL
+        ) const;
+      
+      virtual void _tao_decode (
+          TAO_InputCDR &
+          ACE_ENV_ARG_DECL
+        );
+      
+      // TAO_IDL - Generated from
+      // be\be_visitor_exception/exception_ch.cpp:127
+      
+      virtual CORBA::TypeCode_ptr _type (void) const;
+    };
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_typecode/typecode_decl.cpp:44
+    
+    static ::CORBA::TypeCode_ptr _tc_NoContext;
+
+#endif /* end #if !defined */
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::PortableServer::POA_ptr get_POA (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        ::PortableServer::Current::NoContext
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::PortableServer::ObjectId * get_object_id (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        ::PortableServer::Current::NoContext
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::PortableServer::Servant get_servant (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        ::PortableServer::Current::NoContext
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_interface/interface_ch.cpp:208
+    
+    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:
+    // Abstract or local interface only.
+    Current (void);
+    
+    virtual ~Current (void);
+  
+  private:
+    // Private and unimplemented for concrete interfaces.
+    Current (const Current &);
+    
+    void operator= (const Current &);
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:66
+
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:59
+
+// Traits specializations.
+namespace TAO
+{
+
+#if !defined (_PORTABLESERVER_CURRENT__TRAITS_CH_)
+#define _PORTABLESERVER_CURRENT__TRAITS_CH_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::Current>
+  {
+    static ::PortableServer::Current_ptr duplicate (
+        ::PortableServer::Current_ptr
+      );
+    static void release (
+        ::PortableServer::Current_ptr
+      );
+    static ::PortableServer::Current_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::PortableServer::Current_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Current_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Current_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::Current_ptr &);
+
+// TAO_IDL - Generated from
+// be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::Current::NoContext &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Current::NoContext*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::Current::NoContext *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::Current::NoContext *&);
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:961
+
+#if defined (__ACE_INLINE__)
+#include "PS_CurrentC.inl"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/PortableServer/PS_CurrentC.inl b/TAO/tao/PortableServer/PS_CurrentC.inl
new file mode 100644
index 00000000000..c944d806c1f
--- /dev/null
+++ b/TAO/tao/PortableServer/PS_CurrentC.inl
@@ -0,0 +1,27 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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/PS_Forward.pidl b/TAO/tao/PortableServer/PS_Forward.pidl
new file mode 100644
index 00000000000..4dd9aa54e6e
--- /dev/null
+++ b/TAO/tao/PortableServer/PS_Forward.pidl
@@ -0,0 +1,42 @@
+/**
+ * @file PS_Forward.pidl
+ *
+ * $Id$
+ *
+ * @brief Pre-compiled IDL source for the PortableServer module.
+ *
+ * This file was used to generate the code in
+ * PS_ForwardC.{h,inl,cpp}, using the following command:
+ *
+ * tao_idl.exe \
+ *     -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT)
+ *          -Wb,export_macro=TAO_PortableServer_Export \
+ *          -Wb,export_include="portableserver_export.h" \
+ *          -Wb,pre_include="ace/pre.h" \
+ *          -Wb,post_include="ace/post.h" \
+ *          PS_Forward.pidl
+ *
+ * Apply patches using the following command:
+ *
+ *   patch < diffs/PS_Forward.diff
+ */
+
+#ifndef _PORTABLESERVER_PS_FORWARD_IDL_
+#define _PORTABLESERVER_PS_FORWARD_IDL_
+
+#include <tao/OctetSeq.pidl>
+
+#pragma prefix "omg.org"
+
+module PortableServer
+{
+# pragma version PortableServer 2.3
+
+  typedef CORBA::OctetSeq ObjectId;
+
+  local interface POA;
+
+  native Servant;
+};
+
+#endif // _PORTABLESERVER_PS_FORWARD_IDL_
diff --git a/TAO/tao/PortableServer/PS_ForwardA.cpp b/TAO/tao/PortableServer/PS_ForwardA.cpp
new file mode 100644
index 00000000000..1e56e21d66a
--- /dev/null
+++ b/TAO/tao/PortableServer/PS_ForwardA.cpp
@@ -0,0 +1,98 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+
+#include "PS_ForwardC.h"
+#include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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 (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,
+
+      0U,
+
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ObjectId (
+    CORBA::tk_alias,
+    sizeof (_oc_PortableServer_ObjectId),
+    (char *) &_oc_PortableServer_ObjectId,
+    0,
+    0
+  );
+
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_ObjectId =
+    &_tc_TAO_tc_PortableServer_ObjectId;
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/PS_ForwardC.cpp b/TAO/tao/PortableServer/PS_ForwardC.cpp
new file mode 100644
index 00000000000..aa47f1adf1c
--- /dev/null
+++ b/TAO/tao/PortableServer/PS_ForwardC.cpp
@@ -0,0 +1,60 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:302
+
+
+#include "PS_ForwardC.h"
+#include "tao/CDR.h"
+#include "tao/ORB_Core.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if !defined (__ACE_INLINE__)
+#include "PS_ForwardC.inl"
+#endif /* !defined INLINE */
+
+// TAO_IDL - Generated from
+// be\be_visitor_arg_traits.cpp:66
+
+// Arg traits specializations.
+namespace TAO
+{
+}
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_root/root.cpp:1629
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/PS_ForwardC.h b/TAO/tao/PortableServer/PS_ForwardC.h
new file mode 100644
index 00000000000..8e891c9fd1f
--- /dev/null
+++ b/TAO/tao/PortableServer/PS_ForwardC.h
@@ -0,0 +1,158 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:153
+
+#ifndef _TAO_IDL_ORIG_PS_FORWARDC_H_
+#define _TAO_IDL_ORIG_PS_FORWARDC_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "portableserver_export.h"
+#include "tao/ORB.h"
+#include "tao/Environment.h"
+#include "tao/Objref_VarOut_T.h"
+
+#include "tao/OctetSeqC.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_PortableServer_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+class TAO_ServantBase;
+class TAO_ServantBase_var;
+class TAO_RefCountServantBase;
+class TAO_Local_ServantBase;
+class TAO_Root_POA;
+class TAO_DynamicImplementation;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
+
+namespace PortableServer
+{
+   typedef TAO_ServantBase ServantBase;
+   typedef TAO_ServantBase_var ServantBase_var;
+   typedef TAO_RefCountServantBase RefCountServantBase;
+   typedef ServantBase *Servant;
+
+   typedef TAO_Local_ServantBase LocalServantBase;
+   typedef TAO_DynamicImplementation DynamicImplementation;
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typedef/typedef_ch.cpp:472
+
+  typedef CORBA::OctetSeq ObjectId;
+  typedef CORBA::OctetSeq_var ObjectId_var;
+  typedef CORBA::OctetSeq_out ObjectId_out;
+
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectId;
+
+  // TAO_IDL - Generated from
+  // be\be_interface.cpp:598
+
+#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;
+
+#endif /* end #if !defined */
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:66
+
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:59
+
+// Traits specializations.
+namespace TAO
+{
+}
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:961
+
+#if defined (__ACE_INLINE__)
+#include "PS_ForwardC.inl"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/PortableServer/PS_ForwardC.inl b/TAO/tao/PortableServer/PS_ForwardC.inl
new file mode 100644
index 00000000000..c944d806c1f
--- /dev/null
+++ b/TAO/tao/PortableServer/PS_ForwardC.inl
@@ -0,0 +1,27 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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.cpp b/TAO/tao/PortableServer/PolicyS.cpp
index 1ea5066806b..b4f434bd14d 100644
--- a/TAO/tao/PortableServer/PolicyS.cpp
+++ b/TAO/tao/PortableServer/PolicyS.cpp
@@ -34,7 +34,8 @@
 
 
 #include "PolicyS.h"
-#include "tao/PortableServer/Object_Adapter.h"
+#include "tao/PortableServer/Servant_Upcall.h"
+#include "tao/PortableServer/ForwardRequestC.h"
 #include "tao/PortableServer/Operation_Table.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/ORB_Core.h"
@@ -67,7 +68,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -106,7 +107,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ace_wrappers\bin\gperf.exe -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  */
+/* Command-line: c:\ace\POArefactor3\ace_wrappers\bin\gperf.exe -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)
 {
@@ -220,7 +221,7 @@ class TAO_ServerRequestInfo_CORBA_Policy_policy_type_get : public TAO_ServerRequ
 public:
   TAO_ServerRequestInfo_CORBA_Policy_policy_type_get (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Policy *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -273,7 +274,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Policy_policy_type_get::TAO_ServerRequestInfo_CORBA_Policy_policy_type_get (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Policy *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -363,7 +364,7 @@ class TAO_ServerRequestInfo_CORBA_Policy_copy : public TAO_ServerRequestInfo
 public:
   TAO_ServerRequestInfo_CORBA_Policy_copy (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Policy *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -416,7 +417,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Policy_copy::TAO_ServerRequestInfo_CORBA_Policy_copy (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Policy *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -506,7 +507,7 @@ class TAO_ServerRequestInfo_CORBA_Policy_destroy : public TAO_ServerRequestInfo
 public:
   TAO_ServerRequestInfo_CORBA_Policy_destroy (
       TAO_ServerRequest &_tao_server_request,
-      TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,
+      TAO::Portable_Server::Servant_Upcall *tao_servant_upcall,
       POA_CORBA::Policy *tao_impl
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     );
@@ -556,7 +557,7 @@ private:
 
 TAO_ServerRequestInfo_CORBA_Policy_destroy::TAO_ServerRequestInfo_CORBA_Policy_destroy (
     TAO_ServerRequest &_tao_server_request,
-    TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
+    TAO::Portable_Server::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA::Policy *tao_impl
     ACE_ENV_ARG_DECL_NOT_USED
   )
@@ -681,7 +682,7 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::dispatch (
   )
   ACE_THROW_SPEC ((CORBA::Exception))
 {
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (
+  TAO::Portable_Server::Servant_Upcall servant_upcall (
       obj->_stubobj ()->servant_orb_var ()->orb_core ()
     );
   
@@ -751,7 +752,7 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::dispatch (
 ///////////////////////////////////////////////////////////////////////
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:652
+// be\be_visitor_interface/interface_ss.cpp:640
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_Policy_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -805,7 +806,7 @@ POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::_get_policy_type (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits< CORBA::PolicyType>::ret_val *) args[0])->arg () =
+  ((TAO::Arg_Traits< ::CORBA::PolicyType>::ret_val *) args[0])->arg () =
     reinterpret_cast<
         POA_CORBA::Policy_ptr> (
         servant->_downcast (
@@ -831,7 +832,7 @@ POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl::copy (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits< ::CORBA::Policy>::ret_val *) args[0])->arg () =
+  ((TAO::Arg_Traits< CORBA::Policy>::ret_val *) args[0])->arg () =
     reinterpret_cast<
         POA_CORBA::Policy_ptr> (
         servant->_downcast (
@@ -893,7 +894,7 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_get_policy_type (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits< CORBA::PolicyType>::ret_val *) args[0])->arg () =
+  ((TAO::Arg_Traits< ::CORBA::PolicyType>::ret_val *) args[0])->arg () =
     reinterpret_cast<
         POA_CORBA::Policy_ptr> (
         servant->_downcast (
@@ -917,7 +918,7 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy (
     CORBA::SystemException
   ))
 {
-  ((TAO::Arg_Traits< ::CORBA::Policy>::ret_val *) args[0])->arg () =
+  ((TAO::Arg_Traits< CORBA::Policy>::ret_val *) args[0])->arg () =
     reinterpret_cast<
         POA_CORBA::Policy_ptr> (
         servant->_downcast (
@@ -992,9 +993,9 @@ void POA_CORBA::Policy::_get_policy_type_skel (
   CORBA::PolicyType _tao_retval = 0;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -1126,9 +1127,9 @@ void POA_CORBA::Policy::copy_skel (
   ::CORBA::Policy_var _tao_retval;
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -1262,9 +1263,9 @@ void POA_CORBA::Policy::destroy_skel (
   
   
 #if (TAO_HAS_INTERCEPTORS == 1)
-  TAO_Object_Adapter::Servant_Upcall *_tao_upcall =
+  TAO::Portable_Server::Servant_Upcall *_tao_upcall =
     static_cast<
-        TAO_Object_Adapter::Servant_Upcall *> (
+        TAO::Portable_Server::Servant_Upcall *> (
         _tao_servant_upcall
       );
     
@@ -1372,7 +1373,7 @@ void POA_CORBA::Policy::_is_a_skel (
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
   
   POA_CORBA::Policy *_tao_impl =
-    (POA_CORBA::Policy *) _tao_servant;
+    static_cast<POA_CORBA::Policy *> (_tao_servant);
   
   CORBA::Boolean _tao_retval = 0;
   CORBA::String_var value;
@@ -1402,7 +1403,7 @@ void POA_CORBA::Policy::_non_existent_skel (
   )
 {
   POA_CORBA::Policy *_tao_impl =
-    (POA_CORBA::Policy *) _tao_servant;
+    static_cast<POA_CORBA::Policy *> (_tao_servant);
   
   CORBA::Boolean _tao_retval =
     _tao_impl->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -1435,7 +1436,7 @@ void POA_CORBA::Policy::_interface_skel (
     }
   
   POA_CORBA::Policy *_tao_impl =
-    (POA_CORBA::Policy *) _tao_servant;
+    static_cast<POA_CORBA::Policy *> (_tao_servant);
   
   CORBA::InterfaceDef_ptr _tao_retval = 
     _tao_impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -1466,7 +1467,7 @@ void POA_CORBA::Policy::_component_skel (
   )
 {
   POA_CORBA::Policy *_tao_impl =
-    (POA_CORBA::Policy *) _tao_object_reference;
+    static_cast<POA_CORBA::Policy *> (_tao_object_reference);
   
   CORBA::Object_var _tao_retval =
     _tao_impl->_get_component (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -1486,23 +1487,17 @@ CORBA::Boolean POA_CORBA::Policy::_is_a (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  if (
+  return
+    (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+    );
 }
 
 void* POA_CORBA::Policy::_downcast (
@@ -1530,7 +1525,7 @@ const char* POA_CORBA::Policy::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:588
+// be\be_visitor_interface/interface_ss.cpp:576
 
 void POA_CORBA::Policy::_dispatch (
     TAO_ServerRequest &req,
@@ -1545,7 +1540,7 @@ void POA_CORBA::Policy::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:530
+// be\be_visitor_interface/interface_ss.cpp:527
 
 CORBA::Policy *
 POA_CORBA::Policy::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -1556,22 +1551,14 @@ POA_CORBA::Policy::_this (ACE_ENV_SINGLE_ARG_DECL)
   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 (
-          tmp,
-          CORBA::Object (stub, 1, this),
-          0
-        );
-    }
-  else
-    {
-      ACE_NEW_RETURN (
-          tmp,
-          CORBA::Object (stub, 0, this),
-          0
-        );
-    }
+  CORBA::Boolean _tao_opt_colloc =
+    stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
+  
+  ACE_NEW_RETURN (
+      tmp,
+      CORBA::Object (stub, _tao_opt_colloc, this),
+      0
+    );
   
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
diff --git a/TAO/tao/PortableServer/PolicyS.h b/TAO/tao/PortableServer/PolicyS.h
index b2c92c4402b..d971a512ff8 100644
--- a/TAO/tao/PortableServer/PolicyS.h
+++ b/TAO/tao/PortableServer/PolicyS.h
@@ -34,6 +34,8 @@
 #include /**/ "ace/pre.h"
 
 #include "tao/UShortSeqS.h"
+#include "tao/CurrentS.h"
+#include "tao/Policy_ForwardS.h"
 #include "tao/PolicyC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -53,6 +55,19 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
+#include "portableserver_export.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_PortableServer_Export
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
@@ -185,14 +200,14 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
   };
-
+  
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration
+  //               Strategized Proxy Broker Declaration 
   //
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/strategized_proxy_broker_sh.cpp:36
-
+  
   class TAO_PortableServer_Export _TAO_Policy_Strategized_Proxy_Broker
     : public virtual TAO::Collocation_Proxy_Broker
   {
@@ -298,7 +313,7 @@ namespace POA_CORBA
   //                    Direct  Impl. Declaration
   //
   
-class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl
+  class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl
   {
   public:
     _TAO_Policy_Direct_Proxy_Impl (void);
diff --git a/TAO/tao/PortableServer/Policy_Creator_T.h b/TAO/tao/PortableServer/Policy_Creator_T.h
new file mode 100644
index 00000000000..3846ef81c88
--- /dev/null
+++ b/TAO/tao/PortableServer/Policy_Creator_T.h
@@ -0,0 +1,49 @@
+// This may look like C, but it's really -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file Policy_Creator_T.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_POLICY_CREATOR_T_H
+#define TAO_PORTABLESERVER_POLICY_CREATOR_T_H
+
+#include /**/ "ace/pre.h"
+
+#include "tao/ORB_Constants.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    template <class POLICYTYPE, class POLICYVALUE>
+    void create_policy (
+        POLICYTYPE *& policy,
+        POLICYVALUE &value,
+        const CORBA::Any& val
+        ACE_ENV_ARG_DECL)
+      {
+        if ((val >>= value) == 0)
+          ACE_THROW (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE));
+
+        ACE_NEW_THROW_EX (policy,
+                          POLICYTYPE (value),
+                          CORBA::NO_MEMORY (TAO::VMCID,
+                                            CORBA::COMPLETED_NO));
+        ACE_CHECK;
+      }
+  }
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_PORTABLESERVER_POLICY_CREATOR_T_H */
diff --git a/TAO/tao/PortableServer/Policy_Strategy.h b/TAO/tao/PortableServer/Policy_Strategy.h
new file mode 100644
index 00000000000..2d8c81c0cdb
--- /dev/null
+++ b/TAO/tao/PortableServer/Policy_Strategy.h
@@ -0,0 +1,47 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file Policy_Strategy.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_POLICY_STRATEGY_H
+#define TAO_POLICY_STRATEGY_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Service_Object.h"
+#include "ace/CORBA_macros.h"
+#include "tao/Environment.h"
+
+class TAO_Root_POA;
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export Policy_Strategy
+      : public virtual ACE_Service_Object
+    {
+    public:
+      virtual void strategy_init(TAO_Root_POA *poa ACE_ENV_ARG_DECL) = 0;
+
+      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL) = 0;
+
+      virtual ~Policy_Strategy (void) {};
+    };
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_POLICY_STRATEGY_H */
diff --git a/TAO/tao/PortableServer/PortableGroup_Hooks.cpp b/TAO/tao/PortableServer/PortableGroup_Hooks.cpp
deleted file mode 100644
index 36834ac4740..00000000000
--- a/TAO/tao/PortableServer/PortableGroup_Hooks.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "PortableGroup_Hooks.h"
-
-ACE_RCSID (TAO_PortableServer,
-           PortableGroup_Hooks,
-           "$Id$")
-
-TAO_POA_PortableGroup_Hooks::~TAO_POA_PortableGroup_Hooks (void)
-{
-}
diff --git a/TAO/tao/PortableServer/PortableGroup_Hooks.h b/TAO/tao/PortableServer/PortableGroup_Hooks.h
deleted file mode 100644
index e6b5fad65bb..00000000000
--- a/TAO/tao/PortableServer/PortableGroup_Hooks.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file   PortableGroup_Hooks.h
- *
- *  $Id$
- *
- *  @author Frank Hunleth <fhunleth@cs.wustl.edu>
- */
-//=============================================================================
-
-#ifndef TAO_PORTABLEGROUP_HOOKS_H
-#define TAO_PORTABLEGROUP_HOOKS_H
-#include /**/ "ace/pre.h"
-
-#include "PortableServerC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "POA.h"
-
-
-/**
- * @class TAO_POA_PortableGroup_Hooks
- *
- * @brief TAO_POA_PortableGroup_Hooks
- *
- * This class is an abstract base class that contains hooks for the
- * PortableGroup library.
- */
-class TAO_PortableServer_Export TAO_POA_PortableGroup_Hooks
-{
-public:
-  /// Destructor.
-  virtual ~TAO_POA_PortableGroup_Hooks (void);
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  virtual PortableServer::ObjectId * create_id_for_reference (
-      TAO_POA &the_poa,
-      CORBA::Object_ptr the_ref
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableServer::NotAGroupObject
-    )) = 0;
-
-  virtual PortableServer::IDs * reference_to_ids (
-      TAO_POA &the_poa,
-      CORBA::Object_ptr the_ref
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableServer::NotAGroupObject
-    )) = 0;
-
-  virtual void associate_reference_with_id (
-      TAO_POA &the_poa,
-      CORBA::Object_ptr ref,
-      const PortableServer::ObjectId & oid
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableServer::NotAGroupObject
-    )) = 0;
-
-  virtual void disassociate_reference_with_id (
-      TAO_POA &the_poa,
-      CORBA::Object_ptr ref,
-      const PortableServer::ObjectId & oid
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableServer::NotAGroupObject
-    )) = 0;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-};
-
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PORTABLEGROUP_HOOKS_H */
diff --git a/TAO/tao/PortableServer/PortableServer.cpp b/TAO/tao/PortableServer/PortableServer.cpp
index 6e5786aea12..5881f56219a 100644
--- a/TAO/tao/PortableServer/PortableServer.cpp
+++ b/TAO/tao/PortableServer/PortableServer.cpp
@@ -1,20 +1,46 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    PortableServer.cpp
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan <coryan@uci.edu>
- */
-//=============================================================================
-
-
+// $Id$
 #include "PortableServer.h"
 #include "Object_Adapter.h"
 #include "Object_Adapter_Factory.h"
 
+#include "ThreadStrategyFactoryImpl.h"
+#include "LifespanStrategyFactoryImpl.h"
+#include "IdAssignmentStrategyFactoryImpl.h"
+#include "IdUniquenessStrategyFactoryImpl.h"
+#include "ImplicitActivationStrategyFactoryImpl.h"
+#include "RequestProcessingStrategyFactoryImpl.h"
+#include "ServantRetentionStrategyFactoryImpl.h"
+
+#include "ThreadStrategyORBControl.h"
+#include "ThreadStrategySingle.h"
+#include "ThreadStrategySingleFactoryImpl.h"
+
+#include "IdAssignmentStrategySystem.h"
+#include "IdAssignmentStrategyUser.h"
+
+#include "IdUniquenessStrategyMultiple.h"
+#include "IdUniquenessStrategyUnique.h"
+
+#include "ImplicitActivationStrategyExplicit.h"
+#include "ImplicitActivationStrategyImplicit.h"
+
+#include "RequestProcessingStrategyAOMOnly.h"
+#include "RequestProcessingStrategyDefaultServant.h"
+#include "RequestProcessingStrategyServantManager.h"
+
+#include "ServantRetentionStrategyNonRetainFactoryImpl.h"
+#include "ServantRetentionStrategyRetainFactoryImpl.h"
+
+#include "RequestProcessingStrategyDefaultServantFactoryImpl.h"
+#include "RequestProcessingStrategyAOMOnlyFactoryImpl.h"
+#include "RequestProcessingStrategyServantActivatorFactoryImpl.h"
+#include "RequestProcessingStrategyServantLocatorFactoryImpl.h"
+
+#include "IdUniquenessStrategyUniqueFactoryImpl.h"
+
+#include "LifespanStrategyPersistentFactoryImpl.h"
+#include "LifespanStrategyTransientFactoryImpl.h"
+
 ACE_RCSID (PortableServer,
            PortableServer,
            "$Id$")
@@ -22,6 +48,120 @@ ACE_RCSID (PortableServer,
 int
 TAO_POA_Initializer::init (void)
 {
+  ACE_Service_Config::process_directive (
+      TAO::Portable_Server::ace_svc_desc_IdAssignmentStrategySystem
+    );
+
+  ACE_Service_Config::process_directive (
+      TAO::Portable_Server::ace_svc_desc_IdAssignmentStrategyUser
+    );
+
+  ACE_Service_Config::process_directive (
+      TAO::Portable_Server::ace_svc_desc_IdUniquenessStrategyMultiple
+    );
+
+  ACE_Service_Config::process_directive (
+      TAO::Portable_Server::ace_svc_desc_IdUniquenessStrategyUnique
+    );
+
+  ACE_Service_Config::process_directive (
+      TAO::Portable_Server::ace_svc_desc_IdUniquenessStrategyUniqueFactoryImpl
+    );
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+  ACE_Service_Config::process_directive (
+      TAO::Portable_Server::ace_svc_desc_ImplicitActivationStrategyExplicit
+    );
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+  ACE_Service_Config::process_directive (
+      TAO::Portable_Server::ace_svc_desc_ImplicitActivationStrategyImplicit
+    );
+
+  // Strategy factories
+
+  ACE_Service_Config::process_directive (
+      TAO::Portable_Server::ace_svc_desc_ThreadStrategyFactoryImpl
+    );
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+  ACE_Service_Config::process_directive (
+      TAO::Portable_Server::ace_svc_desc_ThreadStrategySingleFactoryImpl
+    );
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+  ACE_Service_Config::process_directive (
+      TAO::Portable_Server::ace_svc_desc_LifespanStrategyFactoryImpl
+    );
+
+  ACE_Service_Config::process_directive (
+      TAO::Portable_Server::ace_svc_desc_LifespanStrategyPersistentFactoryImpl
+    );
+
+  ACE_Service_Config::process_directive (
+      TAO::Portable_Server::ace_svc_desc_LifespanStrategyTransientFactoryImpl
+    );
+
+  ACE_Service_Config::process_directive (
+      TAO::Portable_Server::ace_svc_desc_IdAssignmentStrategyFactoryImpl
+    );
+
+  ACE_Service_Config::process_directive (
+      TAO::Portable_Server::ace_svc_desc_IdUniquenessStrategyFactoryImpl
+    );
+
+  ACE_Service_Config::process_directive (
+      TAO::Portable_Server::ace_svc_desc_ImplicitActivationStrategyFactoryImpl
+    );
+
+  ACE_Service_Config::process_directive (
+      TAO::Portable_Server::ace_svc_desc_RequestProcessingStrategyFactoryImpl
+    );
+
+  ACE_Service_Config::process_directive (
+      TAO::Portable_Server::ace_svc_desc_RequestProcessingStrategyAOMOnlyFactoryImpl
+    );
+
+  ACE_Service_Config::process_directive (
+      TAO::Portable_Server::ace_svc_desc_RequestProcessingStrategyDefaultServantFactoryImpl
+    );
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+  ACE_Service_Config::process_directive (
+      TAO::Portable_Server::ace_svc_desc_RequestProcessingStrategyServantActivatorFactoryImpl
+    );
+
+  ACE_Service_Config::process_directive (
+      TAO::Portable_Server::ace_svc_desc_RequestProcessingStrategyServantLocatorFactoryImpl
+    );
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+  ACE_Service_Config::process_directive (
+      TAO::Portable_Server::ace_svc_desc_ServantRetentionStrategyFactoryImpl
+    );
+
+  ACE_Service_Config::process_directive (
+      TAO::Portable_Server::ace_svc_desc_ServantRetentionStrategyRetainFactoryImpl
+    );
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+  ACE_Service_Config::process_directive (
+      TAO::Portable_Server::ace_svc_desc_ServantRetentionStrategyNonRetainFactoryImpl
+    );
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+  // Strategy implementations
+
+  ACE_Service_Config::process_directive (
+      TAO::Portable_Server::ace_svc_desc_ThreadStrategyORBControl
+    );
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+  ACE_Service_Config::process_directive (
+      TAO::Portable_Server::ace_svc_desc_ThreadStrategySingle
+    );
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
   return
     ACE_Service_Config::process_directive (
         ace_svc_desc_TAO_Object_Adapter_Factory
diff --git a/TAO/tao/PortableServer/PortableServer.h b/TAO/tao/PortableServer/PortableServer.h
index c937c8ad706..30d687c5bc6 100644
--- a/TAO/tao/PortableServer/PortableServer.h
+++ b/TAO/tao/PortableServer/PortableServer.h
@@ -1,6 +1,5 @@
 /* -*- C++ -*- */
 
-
 //=============================================================================
 /**
  *  @file PortableServer.h
@@ -46,6 +45,9 @@ TAO_Requires_POA_Initializer = TAO_POA_Initializer::init ();
 #define TAO_PORTABLESERVER_SAFE_INCLUDE
 #include "PortableServerC.h"
 #undef TAO_PORTABLESERVER_SAFE_INCLUDE
+#include "POAManagerC.h"
+#include "PortableServer_Functions.h"
+#include "PortableServer_WFunctions.h"
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/PortableServer.pidl b/TAO/tao/PortableServer/PortableServer.pidl
index 55a2d2d6c2e..86291ec1cf4 100644
--- a/TAO/tao/PortableServer/PortableServer.pidl
+++ b/TAO/tao/PortableServer/PortableServer.pidl
@@ -6,7 +6,7 @@
  * @brief Pre-compiled IDL source for the PortableServer module.
  *
  * This file was used to generate the code in
- * PortableServerC.{h,i,cpp}, using the following command:
+ * PortableServerC.{h,inl,cpp}, using the following command:
  *
  * tao_idl.exe \
  *     -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT)
@@ -41,12 +41,20 @@
  *   done
  */
 
-#ifndef _PORTABLESERVER_IDL_
-#define _PORTABLESERVER_IDL_
+#ifndef _PORTABLE_SERVER_IDL_
+#define _PORTABLE_SERVER_IDL_
 
-#include <orb.idl>
-#include <Current.pidl>
+#include <orb_types.pidl>
+#include <Policy_Forward.pidl>
 #include <OctetSeq.pidl>
+#include <tao/PortableServer/PS_Forward.pidl>
+#include <tao/PortableServer/IdAssignmentPolicy.pidl>
+#include <tao/PortableServer/IdUniquenessPolicy.pidl>
+#include <tao/PortableServer/ImplicitActivationPolicy.pidl>
+#include <tao/PortableServer/LifespanPolicy.pidl>
+#include <tao/PortableServer/RequestProcessingPolicy.pidl>
+#include <tao/PortableServer/ServantRetentionPolicy.pidl>
+#include <tao/PortableServer/ThreadPolicy.pidl>
 
 #pragma prefix "omg.org"
 
@@ -54,25 +62,9 @@ module PortableServer
 {
 # pragma version PortableServer 2.3
 
-  local interface POA;      // forward declaration
   typedef sequence<POA> POAList;
-  native Servant;
-  typedef CORBA::OctetSeq ObjectId;
-
-  exception ForwardRequest
-  {
-    Object forward_reference;
-  };
-
-  // @@ Frank - MIOP specific types
-
-  exception NotAGroupObject {};
-  typedef sequence <ObjectId> IDs;
-
-  // @@ Frank - End MIOP
-
-  // Policy interfaces.
 
+  // Policy IDs
   const CORBA::PolicyType THREAD_POLICY_ID                = 16;
   const CORBA::PolicyType LIFESPAN_POLICY_ID              = 17;
   const CORBA::PolicyType ID_UNIQUENESS_POLICY_ID         = 18;
@@ -81,158 +73,14 @@ module PortableServer
   const CORBA::PolicyType SERVANT_RETENTION_POLICY_ID     = 21;
   const CORBA::PolicyType REQUEST_PROCESSING_POLICY_ID    = 22;
 
-  enum ThreadPolicyValue
-  {
-    ORB_CTRL_MODEL,
-    SINGLE_THREAD_MODEL
-  };
-
-  local interface ThreadPolicy : CORBA::Policy
-  {
-    readonly attribute ThreadPolicyValue value;
-  };
-
-  enum LifespanPolicyValue
-  {
-    TRANSIENT,
-    PERSISTENT
-  };
-
-  local interface LifespanPolicy : CORBA::Policy
-  {
-    readonly attribute LifespanPolicyValue value;
-  };
-
-  enum IdUniquenessPolicyValue
-  {
-    UNIQUE_ID,
-    MULTIPLE_ID
-  };
-
-  local interface IdUniquenessPolicy : CORBA::Policy
-  {
-    readonly attribute IdUniquenessPolicyValue value;
-  };
-
-  enum IdAssignmentPolicyValue
-  {
-    USER_ID,
-    SYSTEM_ID
-  };
-
-  local interface IdAssignmentPolicy : CORBA::Policy
-  {
-    readonly attribute IdAssignmentPolicyValue value;
-  };
-
-  enum ImplicitActivationPolicyValue
-  {
-    IMPLICIT_ACTIVATION,
-    NO_IMPLICIT_ACTIVATION
-  };
-
-  local interface ImplicitActivationPolicy : CORBA::Policy
-  {
-    readonly attribute ImplicitActivationPolicyValue value;
-  };
-
-  enum ServantRetentionPolicyValue
-  {
-    RETAIN,
-    NON_RETAIN
-  };
-
-  local interface ServantRetentionPolicy : CORBA::Policy
-  {
-    readonly attribute ServantRetentionPolicyValue value;
-  };
-
-  enum RequestProcessingPolicyValue
-  {
-    USE_ACTIVE_OBJECT_MAP_ONLY,
-    USE_DEFAULT_SERVANT,
-    USE_SERVANT_MANAGER
-  };
-
-  local interface RequestProcessingPolicy : CORBA::Policy
-  {
-    readonly attribute RequestProcessingPolicyValue value;
-  };
-
-  // POAManager interface
-  local interface POAManager
-  {
-    exception AdapterInactive {};
-
-    enum State
-    {
-      HOLDING,
-      ACTIVE,
-      DISCARDING,
-      INACTIVE
-    };
-
-    void activate ()
-      raises(AdapterInactive);
-
-    void hold_requests (in boolean wait_for_completion)
-      raises(AdapterInactive);
-
-    void discard_requests (in boolean wait_for_completion)
-      raises(AdapterInactive);
-
-    void deactivate (in boolean etherealize_objects,
-                     in boolean wait_for_completion)
-      raises(AdapterInactive);
-
-    State get_state ();
-  };
-
-  // AdapterActivator interface.
-  local interface AdapterActivator
-  {
-#   pragma version AdapterActivator 2.3
-
-    boolean unknown_adapter (in POA parent,
-                             in string name);
-  };
-
-  // ServantManager interface.
-  local interface ServantManager {};
-
-  local interface ServantActivator : ServantManager
-  {
-#   pragma version ServantActivator 2.3
-
-    Servant incarnate (in ObjectId oid,
-                       in POA adapter)
-      raises (ForwardRequest);
-
-    void etherealize (in ObjectId oid,
-                      in POA adapter,
-                      in Servant serv,
-                      in boolean cleanup_in_progress,
-                      in boolean remaining_activations);
-  };
-
-  local interface ServantLocator : ServantManager
-  {
-#   pragma version ServantLocator 2.3
+  // Forward declaration
+  local interface POAManager;
 
-    native Cookie;
+  // Forward declaration AdapterActivator interface.
+  local interface AdapterActivator;
 
-    Servant preinvoke (in ObjectId oid,
-                       in POA adapter,
-                       in CORBA::Identifier operation,
-                       out Cookie the_cookie)
-      raises (ForwardRequest);
-
-    void postinvoke (in ObjectId oid,
-                     in POA adapter,
-                     in CORBA::Identifier operation,
-                     in Cookie  the_cookie,
-                     in Servant the_servant);
-  };
+  // Forward declaration servantManager interface.
+  local interface ServantManager;
 
   local interface POA
   {
@@ -337,8 +185,7 @@ module PortableServer
       raises (WrongPolicy);
 
     Object create_reference_with_id (in ObjectId oid,
-                                     in CORBA::RepositoryId intf)
-      raises (WrongPolicy);
+                                     in CORBA::RepositoryId intf);
 
     // Identity mapping operations:.
     ObjectId servant_to_id (in Servant p_servant)
@@ -365,39 +212,7 @@ module PortableServer
               WrongPolicy);
 
     readonly attribute CORBA::OctetSeq id;
-
-    // @@ Frank - MIOP specific methods
-
-    ObjectId create_id_for_reference(in Object the_ref)
-      raises (NotAGroupObject);
-
-    IDs reference_to_ids(in Object the_ref)
-      raises (NotAGroupObject);
-
-    void associate_reference_with_id (in Object ref,
-                                      in ObjectId oid)
-      raises (NotAGroupObject);
-
-    void disassociate_reference_with_id (in Object ref,
-                                         in ObjectId oid)
-      raises (NotAGroupObject);
-
-    // @@ Frank - End MIOP
-  };
-
-  // Current interface.
-  local interface Current : CORBA::Current
-  {
-#   pragma version Current 2.3
-
-    exception NoContext {};
-
-    POA get_POA ()
-      raises (NoContext);
-
-    ObjectId get_object_id ()
-      raises (NoContext);
   };
 };
 
-#endif // _PORTABLESERVER_IDL_
+#endif // _PORTABLE_SERVER_IDL_
diff --git a/TAO/tao/PortableServer/PortableServerA.cpp b/TAO/tao/PortableServer/PortableServerA.cpp
index 448ef21aa35..fc8410f66eb 100644
--- a/TAO/tao/PortableServer/PortableServerA.cpp
+++ b/TAO/tao/PortableServer/PortableServerA.cpp
@@ -25,52 +25,36 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "PortableServerC.h"
-#include "tao/CDR.h"
+#include "PortableServer.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 #include "tao/Any_Impl_T.h"
 #include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 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
+  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 (0x73743a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/PortableServer/POAList:1.0
     8,
-  ACE_NTOHL (0x504f414c),
+  ACE_NTOHL (0x504f414c), 
   ACE_NTOHL (0x69737400),  // name = POAList
     CORBA::tk_sequence, // typecode kind
-  68, // encapsulation length
+  8, // 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,
 
 };
@@ -80,7 +64,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAList (
     sizeof (_oc_PortableServer_POAList),
     (char *) &_oc_PortableServer_POAList,
     0,
-    sizeof (PortableServer::POAList)
+    0
   );
 
 namespace PortableServer
@@ -89,1690 +73,23 @@ namespace PortableServer
     &_tc_TAO_tc_PortableServer_POAList;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (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,
-
-      0U,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ObjectId (
-    CORBA::tk_alias,
-    sizeof (_oc_PortableServer_ObjectId),
-    (char *) &_oc_PortableServer_ObjectId,
-    0,
-    sizeof (PortableServer::ObjectId)
-  );
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr _tc_ObjectId =
-    &_tc_TAO_tc_PortableServer_ObjectId;
-}
-
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (0x33000000),  // repository ID = IDL:omg.org/PortableServer/ForwardRequest:2.3
-    15,
-  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 (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 (0x0),  // repository ID = IDL:omg.org/CORBA/Object:1.0
-        7,
-    ACE_NTOHL (0x4f626a65),
-    ACE_NTOHL (0x63740000),  // name = Object
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ForwardRequest (
-    CORBA::tk_except,
-    sizeof (_oc_PortableServer_ForwardRequest),
-    (char *) &_oc_PortableServer_ForwardRequest,
-    0,
-    sizeof (PortableServer::ForwardRequest)
-  );
-
-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
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/NotAGroupObject:2.3
-    16,
-  ACE_NTOHL (0x4e6f7441),
-  ACE_NTOHL (0x47726f75),
-  ACE_NTOHL (0x704f626a),
-  ACE_NTOHL (0x65637400),  // name = NotAGroupObject
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_NotAGroupObject (
-    CORBA::tk_except,
-    sizeof (_oc_PortableServer_NotAGroupObject),
-    (char *) &_oc_PortableServer_NotAGroupObject,
-    0,
-    sizeof (PortableServer::NotAGroupObject)
-  );
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr _tc_NotAGroupObject =
-    &_tc_TAO_tc_PortableServer_NotAGroupObject;
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/IDs:2.3
-    4,
-  ACE_NTOHL (0x49447300),  // name = IDs
-    CORBA::tk_sequence, // typecode kind
-  164, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_alias, // typecode kind for typedefs
-    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 (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 (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,
-
-          0U,
-
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_IDs (
-    CORBA::tk_alias,
-    sizeof (_oc_PortableServer_IDs),
-    (char *) &_oc_PortableServer_IDs,
-    0,
-    sizeof (PortableServer::IDs)
-  );
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr _tc_IDs =
-    &_tc_TAO_tc_PortableServer_IDs;
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (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 (0x65000000),  // name = ThreadPolicyValue
-  2, // member count
-  15,
-  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 (0x44454c00),  // name = SINGLE_THREAD_MODEL
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ThreadPolicyValue (
-    CORBA::tk_enum,
-    sizeof (_oc_PortableServer_ThreadPolicyValue),
-    (char *) &_oc_PortableServer_ThreadPolicyValue,
-    0,
-    sizeof (PortableServer::ThreadPolicyValue)
-  );
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr _tc_ThreadPolicyValue =
-    &_tc_TAO_tc_PortableServer_ThreadPolicyValue;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/ThreadPolicy:2.3
-    13,
-  ACE_NTOHL (0x54687265),
-  ACE_NTOHL (0x6164506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x0),  // name = ThreadPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ThreadPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableServer_ThreadPolicy),
-    (char *) &_oc_PortableServer_ThreadPolicy,
-    0,
-    sizeof (PortableServer::ThreadPolicy)
-  );
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr _tc_ThreadPolicy =
-    &_tc_TAO_tc_PortableServer_ThreadPolicy;
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (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 (0x6c756500),  // name = LifespanPolicyValue
-  2, // member count
-  10,
-  ACE_NTOHL (0x5452414e),
-  ACE_NTOHL (0x5349454e),
-  ACE_NTOHL (0x54000000),  // name = TRANSIENT
-  11,
-  ACE_NTOHL (0x50455253),
-  ACE_NTOHL (0x49535445),
-  ACE_NTOHL (0x4e540000),  // name = PERSISTENT
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_LifespanPolicyValue (
-    CORBA::tk_enum,
-    sizeof (_oc_PortableServer_LifespanPolicyValue),
-    (char *) &_oc_PortableServer_LifespanPolicyValue,
-    0,
-    sizeof (PortableServer::LifespanPolicyValue)
-  );
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr _tc_LifespanPolicyValue =
-    &_tc_TAO_tc_PortableServer_LifespanPolicyValue;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (0x33000000),  // repository ID = IDL:omg.org/PortableServer/LifespanPolicy:2.3
-    15,
-  ACE_NTOHL (0x4c696665),
-  ACE_NTOHL (0x7370616e),
-  ACE_NTOHL (0x506f6c69),
-  ACE_NTOHL (0x63790000),  // name = LifespanPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_LifespanPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableServer_LifespanPolicy),
-    (char *) &_oc_PortableServer_LifespanPolicy,
-    0,
-    sizeof (PortableServer::LifespanPolicy)
-  );
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr _tc_LifespanPolicy =
-    &_tc_TAO_tc_PortableServer_LifespanPolicy;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (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 (0x6c756500),  // name = IdUniquenessPolicyValue
-  2, // member count
-  10,
-  ACE_NTOHL (0x554e4951),
-  ACE_NTOHL (0x55455f49),
-  ACE_NTOHL (0x44000000),  // name = UNIQUE_ID
-  12,
-  ACE_NTOHL (0x4d554c54),
-  ACE_NTOHL (0x49504c45),
-  ACE_NTOHL (0x5f494400),  // name = MULTIPLE_ID
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdUniquenessPolicyValue (
-    CORBA::tk_enum,
-    sizeof (_oc_PortableServer_IdUniquenessPolicyValue),
-    (char *) &_oc_PortableServer_IdUniquenessPolicyValue,
-    0,
-    sizeof (PortableServer::IdUniquenessPolicyValue)
-  );
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr _tc_IdUniquenessPolicyValue =
-    &_tc_TAO_tc_PortableServer_IdUniquenessPolicyValue;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (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 (0x63790000),  // name = IdUniquenessPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdUniquenessPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableServer_IdUniquenessPolicy),
-    (char *) &_oc_PortableServer_IdUniquenessPolicy,
-    0,
-    sizeof (PortableServer::IdUniquenessPolicy)
-  );
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr _tc_IdUniquenessPolicy =
-    &_tc_TAO_tc_PortableServer_IdUniquenessPolicy;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (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 (0x6c756500),  // name = IdAssignmentPolicyValue
-  2, // member count
-  8,
-  ACE_NTOHL (0x55534552),
-  ACE_NTOHL (0x5f494400),  // name = USER_ID
-  10,
-  ACE_NTOHL (0x53595354),
-  ACE_NTOHL (0x454d5f49),
-  ACE_NTOHL (0x44000000),  // name = SYSTEM_ID
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdAssignmentPolicyValue (
-    CORBA::tk_enum,
-    sizeof (_oc_PortableServer_IdAssignmentPolicyValue),
-    (char *) &_oc_PortableServer_IdAssignmentPolicyValue,
-    0,
-    sizeof (PortableServer::IdAssignmentPolicyValue)
-  );
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr _tc_IdAssignmentPolicyValue =
-    &_tc_TAO_tc_PortableServer_IdAssignmentPolicyValue;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (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 (0x63790000),  // name = IdAssignmentPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_IdAssignmentPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableServer_IdAssignmentPolicy),
-    (char *) &_oc_PortableServer_IdAssignmentPolicy,
-    0,
-    sizeof (PortableServer::IdAssignmentPolicy)
-  );
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr _tc_IdAssignmentPolicy =
-    &_tc_TAO_tc_PortableServer_IdAssignmentPolicy;
-}
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (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 (0x65000000),  // name = ImplicitActivationPolicyValue
-  2, // member count
-  20,
-  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 (0x4f4e0000),  // name = NO_IMPLICIT_ACTIVATION
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue (
-    CORBA::tk_enum,
-    sizeof (_oc_PortableServer_ImplicitActivationPolicyValue),
-    (char *) &_oc_PortableServer_ImplicitActivationPolicyValue,
-    0,
-    sizeof (PortableServer::ImplicitActivationPolicyValue)
-  );
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr _tc_ImplicitActivationPolicyValue =
-    &_tc_TAO_tc_PortableServer_ImplicitActivationPolicyValue;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (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 (0x0),  // name = ImplicitActivationPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ImplicitActivationPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableServer_ImplicitActivationPolicy),
-    (char *) &_oc_PortableServer_ImplicitActivationPolicy,
-    0,
-    sizeof (PortableServer::ImplicitActivationPolicy)
-  );
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr _tc_ImplicitActivationPolicy =
-    &_tc_TAO_tc_PortableServer_ImplicitActivationPolicy;
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (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 (0x6c756500),  // name = ServantRetentionPolicyValue
-  2, // member count
-  7,
-  ACE_NTOHL (0x52455441),
-  ACE_NTOHL (0x494e0000),  // name = RETAIN
-  11,
-  ACE_NTOHL (0x4e4f4e5f),
-  ACE_NTOHL (0x52455441),
-  ACE_NTOHL (0x494e0000),  // name = NON_RETAIN
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantRetentionPolicyValue (
-    CORBA::tk_enum,
-    sizeof (_oc_PortableServer_ServantRetentionPolicyValue),
-    (char *) &_oc_PortableServer_ServantRetentionPolicyValue,
-    0,
-    sizeof (PortableServer::ServantRetentionPolicyValue)
-  );
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr _tc_ServantRetentionPolicyValue =
-    &_tc_TAO_tc_PortableServer_ServantRetentionPolicyValue;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (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 (0x63790000),  // name = ServantRetentionPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantRetentionPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableServer_ServantRetentionPolicy),
-    (char *) &_oc_PortableServer_ServantRetentionPolicy,
-    0,
-    sizeof (PortableServer::ServantRetentionPolicy)
-  );
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr _tc_ServantRetentionPolicy =
-    &_tc_TAO_tc_PortableServer_ServantRetentionPolicy;
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (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 (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 (0x4c590000),  // name = USE_ACTIVE_OBJECT_MAP_ONLY
-  20,
-  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 (0x47455200),  // name = USE_SERVANT_MANAGER
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicyValue (
-    CORBA::tk_enum,
-    sizeof (_oc_PortableServer_RequestProcessingPolicyValue),
-    (char *) &_oc_PortableServer_RequestProcessingPolicyValue,
-    0,
-    sizeof (PortableServer::RequestProcessingPolicyValue)
-  );
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr _tc_RequestProcessingPolicyValue =
-    &_tc_TAO_tc_PortableServer_RequestProcessingPolicyValue;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (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 (0x69637900),  // name = RequestProcessingPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableServer_RequestProcessingPolicy),
-    (char *) &_oc_PortableServer_RequestProcessingPolicy,
-    0,
-    sizeof (PortableServer::RequestProcessingPolicy)
-  );
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr _tc_RequestProcessingPolicy =
-    &_tc_TAO_tc_PortableServer_RequestProcessingPolicy;
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (0x33000000),  // repository ID = IDL:omg.org/PortableServer/POAManager/AdapterInactive:2.3
-    16,
-  ACE_NTOHL (0x41646170),
-  ACE_NTOHL (0x74657249),
-  ACE_NTOHL (0x6e616374),
-  ACE_NTOHL (0x69766500),  // name = AdapterInactive
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAManager_AdapterInactive (
-    CORBA::tk_except,
-    sizeof (_oc_PortableServer_POAManager_AdapterInactive),
-    (char *) &_oc_PortableServer_POAManager_AdapterInactive,
-    0,
-    sizeof (PortableServer::POAManager::AdapterInactive)
-  );
-
-::CORBA::TypeCode_ptr PortableServer::POAManager::_tc_AdapterInactive =
-  &_tc_TAO_tc_PortableServer_POAManager_AdapterInactive;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_PortableServer_POAManager_State[] =
-{
-  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 (0x4f414d61),
-  ACE_NTOHL (0x6e616765),
-  ACE_NTOHL (0x722f5374),
-  ACE_NTOHL (0x6174653a),
-  ACE_NTOHL (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/POAManager/State:2.3
-  6,
-  ACE_NTOHL (0x53746174),
-  ACE_NTOHL (0x65000000),  // name = State
-  4, // member count
-  8,
-  ACE_NTOHL (0x484f4c44),
-  ACE_NTOHL (0x494e4700),  // name = HOLDING
-  7,
-  ACE_NTOHL (0x41435449),
-  ACE_NTOHL (0x56450000),  // name = ACTIVE
-  11,
-  ACE_NTOHL (0x44495343),
-  ACE_NTOHL (0x41524449),
-  ACE_NTOHL (0x4e470000),  // name = DISCARDING
-  9,
-  ACE_NTOHL (0x494e4143),
-  ACE_NTOHL (0x54495645),
-  ACE_NTOHL (0x0),  // name = INACTIVE
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAManager_State (
-    CORBA::tk_enum,
-    sizeof (_oc_PortableServer_POAManager_State),
-    (char *) &_oc_PortableServer_POAManager_State,
-    0,
-    sizeof (PortableServer::POAManager::State)
-  );
-
-::CORBA::TypeCode_ptr PortableServer::POAManager::_tc_State =
-  &_tc_TAO_tc_PortableServer_POAManager_State;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (0x33000000),  // repository ID = IDL:omg.org/PortableServer/POAManager:2.3
-    11,
-  ACE_NTOHL (0x504f414d),
-  ACE_NTOHL (0x616e6167),
-  ACE_NTOHL (0x65720000),  // name = POAManager
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAManager (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableServer_POAManager),
-    (char *) &_oc_PortableServer_POAManager,
-    0,
-    sizeof (PortableServer::POAManager)
-  );
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr _tc_POAManager =
-    &_tc_TAO_tc_PortableServer_POAManager;
-}
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (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 (0x0),  // name = AdapterActivator
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_AdapterActivator (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableServer_AdapterActivator),
-    (char *) &_oc_PortableServer_AdapterActivator,
-    0,
-    sizeof (PortableServer::AdapterActivator)
-  );
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr _tc_AdapterActivator =
-    &_tc_TAO_tc_PortableServer_AdapterActivator;
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (0x33000000),  // repository ID = IDL:omg.org/PortableServer/ServantManager:2.3
-    15,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x616e744d),
-  ACE_NTOHL (0x616e6167),
-  ACE_NTOHL (0x65720000),  // name = ServantManager
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantManager (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableServer_ServantManager),
-    (char *) &_oc_PortableServer_ServantManager,
-    0,
-    sizeof (PortableServer::ServantManager)
-  );
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr _tc_ServantManager =
-    &_tc_TAO_tc_PortableServer_ServantManager;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (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 (0x0),  // name = ServantActivator
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantActivator (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableServer_ServantActivator),
-    (char *) &_oc_PortableServer_ServantActivator,
-    0,
-    sizeof (PortableServer::ServantActivator)
-  );
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr _tc_ServantActivator =
-    &_tc_TAO_tc_PortableServer_ServantActivator;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (0x33000000),  // repository ID = IDL:omg.org/PortableServer/ServantLocator:2.3
-    15,
-  ACE_NTOHL (0x53657276),
-  ACE_NTOHL (0x616e744c),
-  ACE_NTOHL (0x6f636174),
-  ACE_NTOHL (0x6f720000),  // name = ServantLocator
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantLocator (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableServer_ServantLocator),
-    (char *) &_oc_PortableServer_ServantLocator,
-    0,
-    sizeof (PortableServer::ServantLocator)
-  );
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr _tc_ServantLocator =
-    &_tc_TAO_tc_PortableServer_ServantLocator;
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (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 (0x0),  // name = AdapterAlreadyExists
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterAlreadyExists (
-    CORBA::tk_except,
-    sizeof (_oc_PortableServer_POA_AdapterAlreadyExists),
-    (char *) &_oc_PortableServer_POA_AdapterAlreadyExists,
-    0,
-    sizeof (PortableServer::POA::AdapterAlreadyExists)
-  );
-
-::CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterAlreadyExists =
-  &_tc_TAO_tc_PortableServer_POA_AdapterAlreadyExists;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (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 (0x6e740000),  // name = AdapterNonExistent
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterNonExistent (
-    CORBA::tk_except,
-    sizeof (_oc_PortableServer_POA_AdapterNonExistent),
-    (char *) &_oc_PortableServer_POA_AdapterNonExistent,
-    0,
-    sizeof (PortableServer::POA::AdapterNonExistent)
-  );
-
-::CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterNonExistent =
-  &_tc_TAO_tc_PortableServer_POA_AdapterNonExistent;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (0x0),  // repository ID = IDL:omg.org/PortableServer/POA/InvalidPolicy:2.3
-    14,
-  ACE_NTOHL (0x496e7661),
-  ACE_NTOHL (0x6c696450),
-  ACE_NTOHL (0x6f6c6963),
-  ACE_NTOHL (0x79000000),  // name = InvalidPolicy
-  1, // member count
-    6,
-  ACE_NTOHL (0x696e6465),
-  ACE_NTOHL (0x78000000),  // name = index
-    CORBA::tk_ushort,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_InvalidPolicy (
-    CORBA::tk_except,
-    sizeof (_oc_PortableServer_POA_InvalidPolicy),
-    (char *) &_oc_PortableServer_POA_InvalidPolicy,
-    0,
-    sizeof (PortableServer::POA::InvalidPolicy)
-  );
-
-::CORBA::TypeCode_ptr PortableServer::POA::_tc_InvalidPolicy =
-  &_tc_TAO_tc_PortableServer_POA_InvalidPolicy;
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (0x0),  // repository ID = IDL:omg.org/PortableServer/POA/NoServant:2.3
-    10,
-  ACE_NTOHL (0x4e6f5365),
-  ACE_NTOHL (0x7276616e),
-  ACE_NTOHL (0x74000000),  // name = NoServant
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_NoServant (
-    CORBA::tk_except,
-    sizeof (_oc_PortableServer_POA_NoServant),
-    (char *) &_oc_PortableServer_POA_NoServant,
-    0,
-    sizeof (PortableServer::POA::NoServant)
-  );
-
-::CORBA::TypeCode_ptr PortableServer::POA::_tc_NoServant =
-  &_tc_TAO_tc_PortableServer_POA_NoServant;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (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 (0x69766500),  // name = ObjectAlreadyActive
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ObjectAlreadyActive (
-    CORBA::tk_except,
-    sizeof (_oc_PortableServer_POA_ObjectAlreadyActive),
-    (char *) &_oc_PortableServer_POA_ObjectAlreadyActive,
-    0,
-    sizeof (PortableServer::POA::ObjectAlreadyActive)
-  );
-
-::CORBA::TypeCode_ptr PortableServer::POA::_tc_ObjectAlreadyActive =
-  &_tc_TAO_tc_PortableServer_POA_ObjectAlreadyActive;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA/ObjectNotActive:2.3
-    16,
-  ACE_NTOHL (0x4f626a65),
-  ACE_NTOHL (0x63744e6f),
-  ACE_NTOHL (0x74416374),
-  ACE_NTOHL (0x69766500),  // name = ObjectNotActive
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ObjectNotActive (
-    CORBA::tk_except,
-    sizeof (_oc_PortableServer_POA_ObjectNotActive),
-    (char *) &_oc_PortableServer_POA_ObjectNotActive,
-    0,
-    sizeof (PortableServer::POA::ObjectNotActive)
-  );
-
-::CORBA::TypeCode_ptr PortableServer::POA::_tc_ObjectNotActive =
-  &_tc_TAO_tc_PortableServer_POA_ObjectNotActive;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (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 (0x0),  // name = ServantAlreadyActive
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ServantAlreadyActive (
-    CORBA::tk_except,
-    sizeof (_oc_PortableServer_POA_ServantAlreadyActive),
-    (char *) &_oc_PortableServer_POA_ServantAlreadyActive,
-    0,
-    sizeof (PortableServer::POA::ServantAlreadyActive)
-  );
-
-::CORBA::TypeCode_ptr PortableServer::POA::_tc_ServantAlreadyActive =
-  &_tc_TAO_tc_PortableServer_POA_ServantAlreadyActive;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (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 (0x0),  // name = ServantNotActive
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ServantNotActive (
-    CORBA::tk_except,
-    sizeof (_oc_PortableServer_POA_ServantNotActive),
-    (char *) &_oc_PortableServer_POA_ServantNotActive,
-    0,
-    sizeof (PortableServer::POA::ServantNotActive)
-  );
-
-::CORBA::TypeCode_ptr PortableServer::POA::_tc_ServantNotActive =
-  &_tc_TAO_tc_PortableServer_POA_ServantNotActive;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/POA/WrongAdapter:2.3
-    13,
-  ACE_NTOHL (0x57726f6e),
-  ACE_NTOHL (0x67416461),
-  ACE_NTOHL (0x70746572),
-  ACE_NTOHL (0x0),  // name = WrongAdapter
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_WrongAdapter (
-    CORBA::tk_except,
-    sizeof (_oc_PortableServer_POA_WrongAdapter),
-    (char *) &_oc_PortableServer_POA_WrongAdapter,
-    0,
-    sizeof (PortableServer::POA::WrongAdapter)
-  );
-
-::CORBA::TypeCode_ptr PortableServer::POA::_tc_WrongAdapter =
-  &_tc_TAO_tc_PortableServer_POA_WrongAdapter;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA/WrongPolicy:2.3
-    12,
-  ACE_NTOHL (0x57726f6e),
-  ACE_NTOHL (0x67506f6c),
-  ACE_NTOHL (0x69637900),  // name = WrongPolicy
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_WrongPolicy (
-    CORBA::tk_except,
-    sizeof (_oc_PortableServer_POA_WrongPolicy),
-    (char *) &_oc_PortableServer_POA_WrongPolicy,
-    0,
-    sizeof (PortableServer::POA::WrongPolicy)
-  );
-
-::CORBA::TypeCode_ptr PortableServer::POA::_tc_WrongPolicy =
-  &_tc_TAO_tc_PortableServer_POA_WrongPolicy;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 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
@@ -1783,7 +100,7 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA (
     sizeof (_oc_PortableServer_POA),
     (char *) &_oc_PortableServer_POA,
     0,
-    sizeof (PortableServer::POA)
+    0
   );
 
 namespace PortableServer
@@ -1792,81 +109,7 @@ namespace PortableServer
     &_tc_TAO_tc_PortableServer_POA;
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (0x0),  // repository ID = IDL:omg.org/PortableServer/Current/NoContext:2.3
-    10,
-  ACE_NTOHL (0x4e6f436f),
-  ACE_NTOHL (0x6e746578),
-  ACE_NTOHL (0x74000000),  // name = NoContext
-  0, // member count
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_Current_NoContext (
-    CORBA::tk_except,
-    sizeof (_oc_PortableServer_Current_NoContext),
-    (char *) &_oc_PortableServer_Current_NoContext,
-    0,
-    sizeof (PortableServer::Current::NoContext)
-  );
-
-::CORBA::TypeCode_ptr PortableServer::Current::_tc_NoContext =
-  &_tc_TAO_tc_PortableServer_Current_NoContext;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-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 (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/Current:2.3
-    8,
-  ACE_NTOHL (0x43757272),
-  ACE_NTOHL (0x656e7400),  // name = Current
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_PortableServer_Current (
-    CORBA::tk_objref,
-    sizeof (_oc_PortableServer_Current),
-    (char *) &_oc_PortableServer_Current,
-    0,
-    sizeof (PortableServer::Current)
-  );
-
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr _tc_Current =
-    &_tc_TAO_tc_PortableServer_Current;
-}
-
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -1875,14 +118,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POAList>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POAList>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }// Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
@@ -1917,8 +160,8 @@ CORBA::Boolean operator>>= (
     PortableServer::POAList *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::POAList *&,
+  return _tao_any >>= const_cast<
+      const PortableServer::POAList *&> (
       _tao_elem
     );
 }
@@ -1938,1424 +181,8 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_cs.cpp:50
-
-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;
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableServer::ForwardRequest &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest>::insert_copy (
-      _tao_any,
-      PortableServer::ForwardRequest::_tao_any_destructor,
-      PortableServer::_tc_ForwardRequest,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ForwardRequest *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest>::insert (
-      _tao_any,
-      PortableServer::ForwardRequest::_tao_any_destructor,
-      PortableServer::_tc_ForwardRequest,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::ForwardRequest *&_tao_elem
-  )
-{
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::ForwardRequest *&,
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableServer::ForwardRequest *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableServer::ForwardRequest>::extract (
-        _tao_any,
-        PortableServer::ForwardRequest::_tao_any_destructor,
-        PortableServer::_tc_ForwardRequest,
-        _tao_elem
-      );
-}
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// 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<<= (
-    CORBA::Any &_tao_any,
-    const PortableServer::NotAGroupObject &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::NotAGroupObject>::insert_copy (
-      _tao_any,
-      PortableServer::NotAGroupObject::_tao_any_destructor,
-      PortableServer::_tc_NotAGroupObject,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::NotAGroupObject *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::NotAGroupObject>::insert (
-      _tao_any,
-      PortableServer::NotAGroupObject::_tao_any_destructor,
-      PortableServer::_tc_NotAGroupObject,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::NotAGroupObject *&_tao_elem
-  )
-{
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::NotAGroupObject *&,
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableServer::NotAGroupObject *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableServer::NotAGroupObject>::extract (
-        _tao_any,
-        PortableServer::NotAGroupObject::_tao_any_destructor,
-        PortableServer::_tc_NotAGroupObject,
-        _tao_elem
-      );
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableServer::IDs &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::IDs>::insert_copy (
-      _tao_any,
-      PortableServer::IDs::_tao_any_destructor,
-      PortableServer::_tc_IDs,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::IDs *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::IDs>::insert (
-      _tao_any,
-      PortableServer::IDs::_tao_any_destructor,
-      PortableServer::_tc_IDs,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::IDs *&_tao_elem
-  )
-{
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::IDs *&,
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableServer::IDs *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableServer::IDs>::extract (
-        _tao_any,
-        PortableServer::IDs::_tao_any_destructor,
-        PortableServer::_tc_IDs,
-        _tao_elem
-      );
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ThreadPolicyValue _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<PortableServer::ThreadPolicyValue>::insert (
-      _tao_any,
-      PortableServer::_tc_ThreadPolicyValue,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::ThreadPolicyValue &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<PortableServer::ThreadPolicyValue>::extract (
-        _tao_any,
-        PortableServer::_tc_ThreadPolicyValue,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-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;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ThreadPolicy_ptr _tao_elem
-  )
-{
-  PortableServer::ThreadPolicy_ptr _tao_objptr =
-    PortableServer::ThreadPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ThreadPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::ThreadPolicy>::insert (
-      _tao_any,
-      PortableServer::ThreadPolicy::_tao_any_destructor,
-      PortableServer::_tc_ThreadPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::ThreadPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::ThreadPolicy>::extract (
-        _tao_any,
-        PortableServer::ThreadPolicy::_tao_any_destructor,
-        PortableServer::_tc_ThreadPolicy,
-        _tao_elem
-      );
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::LifespanPolicyValue _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<PortableServer::LifespanPolicyValue>::insert (
-      _tao_any,
-      PortableServer::_tc_LifespanPolicyValue,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::LifespanPolicyValue &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<PortableServer::LifespanPolicyValue>::extract (
-        _tao_any,
-        PortableServer::_tc_LifespanPolicyValue,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-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;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::LifespanPolicy_ptr _tao_elem
-  )
-{
-  PortableServer::LifespanPolicy_ptr _tao_objptr =
-    PortableServer::LifespanPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::LifespanPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::LifespanPolicy>::insert (
-      _tao_any,
-      PortableServer::LifespanPolicy::_tao_any_destructor,
-      PortableServer::_tc_LifespanPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::LifespanPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::LifespanPolicy>::extract (
-        _tao_any,
-        PortableServer::LifespanPolicy::_tao_any_destructor,
-        PortableServer::_tc_LifespanPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::IdUniquenessPolicyValue _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<PortableServer::IdUniquenessPolicyValue>::insert (
-      _tao_any,
-      PortableServer::_tc_IdUniquenessPolicyValue,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::IdUniquenessPolicyValue &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<PortableServer::IdUniquenessPolicyValue>::extract (
-        _tao_any,
-        PortableServer::_tc_IdUniquenessPolicyValue,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-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;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::IdUniquenessPolicy_ptr _tao_elem
-  )
-{
-  PortableServer::IdUniquenessPolicy_ptr _tao_objptr =
-    PortableServer::IdUniquenessPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::IdUniquenessPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>::insert (
-      _tao_any,
-      PortableServer::IdUniquenessPolicy::_tao_any_destructor,
-      PortableServer::_tc_IdUniquenessPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::IdUniquenessPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>::extract (
-        _tao_any,
-        PortableServer::IdUniquenessPolicy::_tao_any_destructor,
-        PortableServer::_tc_IdUniquenessPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::IdAssignmentPolicyValue _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<PortableServer::IdAssignmentPolicyValue>::insert (
-      _tao_any,
-      PortableServer::_tc_IdAssignmentPolicyValue,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::IdAssignmentPolicyValue &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<PortableServer::IdAssignmentPolicyValue>::extract (
-        _tao_any,
-        PortableServer::_tc_IdAssignmentPolicyValue,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-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;
-}
-
-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;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::IdAssignmentPolicy_ptr _tao_elem
-  )
-{
-  PortableServer::IdAssignmentPolicy_ptr _tao_objptr =
-    PortableServer::IdAssignmentPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::IdAssignmentPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::insert (
-      _tao_any,
-      PortableServer::IdAssignmentPolicy::_tao_any_destructor,
-      PortableServer::_tc_IdAssignmentPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::IdAssignmentPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::extract (
-        _tao_any,
-        PortableServer::IdAssignmentPolicy::_tao_any_destructor,
-        PortableServer::_tc_IdAssignmentPolicy,
-        _tao_elem
-      );
-}
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ImplicitActivationPolicyValue _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<PortableServer::ImplicitActivationPolicyValue>::insert (
-      _tao_any,
-      PortableServer::_tc_ImplicitActivationPolicyValue,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::ImplicitActivationPolicyValue &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<PortableServer::ImplicitActivationPolicyValue>::extract (
-        _tao_any,
-        PortableServer::_tc_ImplicitActivationPolicyValue,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-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;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ImplicitActivationPolicy_ptr _tao_elem
-  )
-{
-  PortableServer::ImplicitActivationPolicy_ptr _tao_objptr =
-    PortableServer::ImplicitActivationPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ImplicitActivationPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>::insert (
-      _tao_any,
-      PortableServer::ImplicitActivationPolicy::_tao_any_destructor,
-      PortableServer::_tc_ImplicitActivationPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::ImplicitActivationPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>::extract (
-        _tao_any,
-        PortableServer::ImplicitActivationPolicy::_tao_any_destructor,
-        PortableServer::_tc_ImplicitActivationPolicy,
-        _tao_elem
-      );
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ServantRetentionPolicyValue _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<PortableServer::ServantRetentionPolicyValue>::insert (
-      _tao_any,
-      PortableServer::_tc_ServantRetentionPolicyValue,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::ServantRetentionPolicyValue &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<PortableServer::ServantRetentionPolicyValue>::extract (
-        _tao_any,
-        PortableServer::_tc_ServantRetentionPolicyValue,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-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;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ServantRetentionPolicy_ptr _tao_elem
-  )
-{
-  PortableServer::ServantRetentionPolicy_ptr _tao_objptr =
-    PortableServer::ServantRetentionPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ServantRetentionPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>::insert (
-      _tao_any,
-      PortableServer::ServantRetentionPolicy::_tao_any_destructor,
-      PortableServer::_tc_ServantRetentionPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::ServantRetentionPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>::extract (
-        _tao_any,
-        PortableServer::ServantRetentionPolicy::_tao_any_destructor,
-        PortableServer::_tc_ServantRetentionPolicy,
-        _tao_elem
-      );
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::RequestProcessingPolicyValue _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<PortableServer::RequestProcessingPolicyValue>::insert (
-      _tao_any,
-      PortableServer::_tc_RequestProcessingPolicyValue,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::RequestProcessingPolicyValue &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<PortableServer::RequestProcessingPolicyValue>::extract (
-        _tao_any,
-        PortableServer::_tc_RequestProcessingPolicyValue,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-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;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::RequestProcessingPolicy_ptr _tao_elem
-  )
-{
-  PortableServer::RequestProcessingPolicy_ptr _tao_objptr =
-    PortableServer::RequestProcessingPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::RequestProcessingPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::insert (
-      _tao_any,
-      PortableServer::RequestProcessingPolicy::_tao_any_destructor,
-      PortableServer::_tc_RequestProcessingPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::RequestProcessingPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::extract (
-        _tao_any,
-        PortableServer::RequestProcessingPolicy::_tao_any_destructor,
-        PortableServer::_tc_RequestProcessingPolicy,
-        _tao_elem
-      );
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-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;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::POAManager_ptr _tao_elem
-  )
-{
-  PortableServer::POAManager_ptr _tao_objptr =
-    PortableServer::POAManager::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::POAManager_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::POAManager>::insert (
-      _tao_any,
-      PortableServer::POAManager::_tao_any_destructor,
-      PortableServer::_tc_POAManager,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::POAManager_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::POAManager>::extract (
-        _tao_any,
-        PortableServer::POAManager::_tao_any_destructor,
-        PortableServer::_tc_POAManager,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableServer::POAManager::AdapterInactive &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::insert_copy (
-      _tao_any,
-      PortableServer::POAManager::AdapterInactive::_tao_any_destructor,
-      PortableServer::POAManager::_tc_AdapterInactive,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::POAManager::AdapterInactive *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::insert (
-      _tao_any,
-      PortableServer::POAManager::AdapterInactive::_tao_any_destructor,
-      PortableServer::POAManager::_tc_AdapterInactive,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::POAManager::AdapterInactive *&_tao_elem
-  )
-{
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::POAManager::AdapterInactive *&,
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableServer::POAManager::AdapterInactive *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::extract (
-        _tao_any,
-        PortableServer::POAManager::AdapterInactive::_tao_any_destructor,
-        PortableServer::POAManager::_tc_AdapterInactive,
-        _tao_elem
-      );
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_cs.cpp:52
-
-
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Basic_Impl_T<PortableServer::POAManager::State>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Basic_Impl_T<PortableServer::POAManager::State>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::POAManager::State _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<PortableServer::POAManager::State>::insert (
-      _tao_any,
-      PortableServer::POAManager::_tc_State,
-      _tao_elem
-    );
-}
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::POAManager::State &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<PortableServer::POAManager::State>::extract (
-        _tao_any,
-        PortableServer::POAManager::_tc_State,
-        _tao_elem
-      );
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-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;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::AdapterActivator_ptr _tao_elem
-  )
-{
-  PortableServer::AdapterActivator_ptr _tao_objptr =
-    PortableServer::AdapterActivator::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::AdapterActivator_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::AdapterActivator>::insert (
-      _tao_any,
-      PortableServer::AdapterActivator::_tao_any_destructor,
-      PortableServer::_tc_AdapterActivator,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::AdapterActivator_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::AdapterActivator>::extract (
-        _tao_any,
-        PortableServer::AdapterActivator::_tao_any_destructor,
-        PortableServer::_tc_AdapterActivator,
-        _tao_elem
-      );
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-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;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ServantManager_ptr _tao_elem
-  )
-{
-  PortableServer::ServantManager_ptr _tao_objptr =
-    PortableServer::ServantManager::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ServantManager_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::ServantManager>::insert (
-      _tao_any,
-      PortableServer::ServantManager::_tao_any_destructor,
-      PortableServer::_tc_ServantManager,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::ServantManager_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::ServantManager>::extract (
-        _tao_any,
-        PortableServer::ServantManager::_tao_any_destructor,
-        PortableServer::_tc_ServantManager,
-        _tao_elem
-      );
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-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;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ServantActivator_ptr _tao_elem
-  )
-{
-  PortableServer::ServantActivator_ptr _tao_objptr =
-    PortableServer::ServantActivator::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ServantActivator_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::ServantActivator>::insert (
-      _tao_any,
-      PortableServer::ServantActivator::_tao_any_destructor,
-      PortableServer::_tc_ServantActivator,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::ServantActivator_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::ServantActivator>::extract (
-        _tao_any,
-        PortableServer::ServantActivator::_tao_any_destructor,
-        PortableServer::_tc_ServantActivator,
-        _tao_elem
-      );
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-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;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ServantLocator_ptr _tao_elem
-  )
-{
-  PortableServer::ServantLocator_ptr _tao_objptr =
-    PortableServer::ServantLocator::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ServantLocator_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::ServantLocator>::insert (
-      _tao_any,
-      PortableServer::ServantLocator::_tao_any_destructor,
-      PortableServer::_tc_ServantLocator,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::ServantLocator_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::ServantLocator>::extract (
-        _tao_any,
-        PortableServer::ServantLocator::_tao_any_destructor,
-        PortableServer::_tc_ServantLocator,
-        _tao_elem
-      );
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_cs.cpp:50
 
@@ -3373,14 +200,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<PortableServer::POA>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<PortableServer::POA>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -3425,21 +252,21 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::AdapterAlreadyExists>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::AdapterAlreadyExists>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -3476,8 +303,8 @@ CORBA::Boolean operator>>= (
     PortableServer::POA::AdapterAlreadyExists *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::POA::AdapterAlreadyExists *&,
+  return _tao_any >>= const_cast<
+      const PortableServer::POA::AdapterAlreadyExists *&> (
       _tao_elem
     );
 }
@@ -3497,25 +324,23 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::AdapterNonExistent>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::AdapterNonExistent>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
-#if (TAO_HAS_MINIMUM_POA == 0)
-
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
@@ -3550,8 +375,8 @@ CORBA::Boolean operator>>= (
     PortableServer::POA::AdapterNonExistent *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::POA::AdapterNonExistent *&,
+  return _tao_any >>= const_cast<
+      const PortableServer::POA::AdapterNonExistent *&> (
       _tao_elem
     );
 }
@@ -3571,27 +396,23 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::InvalidPolicy>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::InvalidPolicy>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
-#if (TAO_HAS_MINIMUM_POA == 0)
-
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
@@ -3626,8 +447,8 @@ CORBA::Boolean operator>>= (
     PortableServer::POA::InvalidPolicy *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::POA::InvalidPolicy *&,
+  return _tao_any >>= const_cast<
+      const PortableServer::POA::InvalidPolicy *&> (
       _tao_elem
     );
 }
@@ -3647,25 +468,23 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
+// TAO_IDL - Generated from 
+// be\be_visitor_exception/any_op_cs.cpp:50
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_cs.cpp:50
-
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::NoServant>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::NoServant>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -3702,8 +521,8 @@ CORBA::Boolean operator>>= (
     PortableServer::POA::NoServant *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::POA::NoServant *&,
+  return _tao_any >>= const_cast<
+      const PortableServer::POA::NoServant *&> (
       _tao_elem
     );
 }
@@ -3723,27 +542,25 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::ObjectAlreadyActive>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::ObjectAlreadyActive>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
-#if (TAO_HAS_MINIMUM_POA == 0)
-
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
@@ -3778,8 +595,8 @@ CORBA::Boolean operator>>= (
     PortableServer::POA::ObjectAlreadyActive *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::POA::ObjectAlreadyActive *&,
+  return _tao_any >>= const_cast<
+      const PortableServer::POA::ObjectAlreadyActive *&> (
       _tao_elem
     );
 }
@@ -3799,27 +616,23 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::ObjectNotActive>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::ObjectNotActive>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
-#if (TAO_HAS_MINIMUM_POA == 0)
-
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
@@ -3854,8 +667,8 @@ CORBA::Boolean operator>>= (
     PortableServer::POA::ObjectNotActive *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::POA::ObjectNotActive *&,
+  return _tao_any >>= const_cast<
+      const PortableServer::POA::ObjectNotActive *&> (
       _tao_elem
     );
 }
@@ -3875,27 +688,23 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::ServantAlreadyActive>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::ServantAlreadyActive>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
-#if (TAO_HAS_MINIMUM_POA == 0)
-
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
@@ -3930,8 +739,8 @@ CORBA::Boolean operator>>= (
     PortableServer::POA::ServantAlreadyActive *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::POA::ServantAlreadyActive *&,
+  return _tao_any >>= const_cast<
+      const PortableServer::POA::ServantAlreadyActive *&> (
       _tao_elem
     );
 }
@@ -3951,27 +760,23 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::ServantNotActive>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::ServantNotActive>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
-#if (TAO_HAS_MINIMUM_POA == 0)
-
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
@@ -4006,8 +811,8 @@ CORBA::Boolean operator>>= (
     PortableServer::POA::ServantNotActive *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::POA::ServantNotActive *&,
+  return _tao_any >>= const_cast<
+      const PortableServer::POA::ServantNotActive *&> (
       _tao_elem
     );
 }
@@ -4027,27 +832,23 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::WrongAdapter>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::WrongAdapter>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
-#if (TAO_HAS_MINIMUM_POA == 0)
-
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
@@ -4082,8 +883,8 @@ CORBA::Boolean operator>>= (
     PortableServer::POA::WrongAdapter *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::POA::WrongAdapter *&,
+  return _tao_any >>= const_cast<
+      const PortableServer::POA::WrongAdapter *&> (
       _tao_elem
     );
 }
@@ -4103,27 +904,23 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::WrongPolicy>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<PortableServer::POA::WrongPolicy>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
-#if (TAO_HAS_MINIMUM_POA == 0)
-
 // Copying insertion.
 void operator<<= (
     CORBA::Any &_tao_any,
@@ -4158,8 +955,8 @@ CORBA::Boolean operator>>= (
     PortableServer::POA::WrongPolicy *&_tao_elem
   )
 {
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::POA::WrongPolicy *&,
+  return _tao_any >>= const_cast<
+      const PortableServer::POA::WrongPolicy *&> (
       _tao_elem
     );
 }
@@ -4179,153 +976,6 @@ CORBA::Boolean operator>>= (
       );
 }
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-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;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::Current_ptr _tao_elem
-  )
-{
-  PortableServer::Current_ptr _tao_objptr =
-    PortableServer::Current::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::Current_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::Current>::insert (
-      _tao_any,
-      PortableServer::Current::_tao_any_destructor,
-      PortableServer::_tc_Current,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::Current_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::Current>::extract (
-        _tao_any,
-        PortableServer::Current::_tao_any_destructor,
-        PortableServer::_tc_Current,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableServer::Current::NoContext>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<PortableServer::Current::NoContext>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableServer::Current::NoContext &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::Current::NoContext>::insert_copy (
-      _tao_any,
-      PortableServer::Current::NoContext::_tao_any_destructor,
-      PortableServer::Current::_tc_NoContext,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::Current::NoContext *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::Current::NoContext>::insert (
-      _tao_any,
-      PortableServer::Current::NoContext::_tao_any_destructor,
-      PortableServer::Current::_tc_NoContext,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::Current::NoContext *&_tao_elem
-  )
-{
-  return _tao_any >>= ACE_const_cast (
-      const PortableServer::Current::NoContext *&,
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableServer::Current::NoContext *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableServer::Current::NoContext>::extract (
-        _tao_any,
-        PortableServer::Current::NoContext::_tao_any_destructor,
-        PortableServer::Current::_tc_NoContext,
-        _tao_elem
-      );
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   template class
@@ -4350,7 +1000,7 @@ CORBA::Boolean operator>>= (
         PortableServer::POA::NoServant
       >;
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
   template class
     TAO::Any_Dual_Impl_T<
@@ -4392,180 +1042,6 @@ CORBA::Boolean operator>>= (
         PortableServer::POAList
       >;
 
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        PortableServer::ForwardRequest
-      >;
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        PortableServer::NotAGroupObject
-      >;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        PortableServer::IDs
-      >;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  template class
-    TAO::Any_Basic_Impl_T<
-        PortableServer::ThreadPolicyValue
-      >;
-
-  template class
-    TAO::Any_Impl_T<
-        PortableServer::ThreadPolicy
-      >;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  template class
-    TAO::Any_Basic_Impl_T<
-        PortableServer::LifespanPolicyValue
-      >;
-
-  template class
-    TAO::Any_Impl_T<
-        PortableServer::LifespanPolicy
-      >;
-
-  template class
-    TAO::Any_Basic_Impl_T<
-        PortableServer::IdUniquenessPolicyValue
-      >;
-
-  template class
-    TAO::Any_Impl_T<
-        PortableServer::IdUniquenessPolicy
-      >;
-
-  template class
-    TAO::Any_Basic_Impl_T<
-        PortableServer::IdAssignmentPolicyValue
-      >;
-
-  template class
-    TAO::Any_Impl_T<
-        PortableServer::IdAssignmentPolicy
-      >;
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  template class
-    TAO::Any_Basic_Impl_T<
-        PortableServer::ImplicitActivationPolicyValue
-      >;
-
-  template class
-    TAO::Any_Impl_T<
-        PortableServer::ImplicitActivationPolicy
-      >;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  template class
-    TAO::Any_Basic_Impl_T<
-        PortableServer::ServantRetentionPolicyValue
-      >;
-
-  template class
-    TAO::Any_Impl_T<
-        PortableServer::ServantRetentionPolicy
-      >;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  template class
-    TAO::Any_Basic_Impl_T<
-        PortableServer::RequestProcessingPolicyValue
-      >;
-
-  template class
-    TAO::Any_Impl_T<
-        PortableServer::RequestProcessingPolicy
-      >;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        PortableServer::POAManager::AdapterInactive
-      >;
-
-  template class
-    TAO::Any_Basic_Impl_T<
-        PortableServer::POAManager::State
-      >;
-
-  template class
-    TAO::Any_Impl_T<
-        PortableServer::POAManager
-      >;
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  template class
-    TAO::Any_Impl_T<
-        PortableServer::AdapterActivator
-      >;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  template class
-    TAO::Any_Impl_T<
-        PortableServer::ServantManager
-      >;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  template class
-    TAO::Any_Impl_T<
-        PortableServer::ServantActivator
-      >;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  template class
-    TAO::Any_Impl_T<
-        PortableServer::ServantLocator
-      >;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        PortableServer::Current::NoContext
-      >;
-
-  template class
-    TAO::Any_Impl_T<
-        PortableServer::Current
-      >;
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 # pragma instantiate \
@@ -4590,7 +1066,7 @@ CORBA::Boolean operator>>= (
         PortableServer::POA::NoServant \
       >
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 # pragma instantiate \
     TAO::Any_Dual_Impl_T< \
@@ -4632,178 +1108,4 @@ CORBA::Boolean operator>>= (
         PortableServer::POAList \
       >
 
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        PortableServer::ForwardRequest \
-      >
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        PortableServer::NotAGroupObject \
-      >
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        PortableServer::IDs \
-      >
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-# pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        PortableServer::ThreadPolicyValue \
-      >
-
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        PortableServer::ThreadPolicy \
-      >
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-# pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        PortableServer::LifespanPolicyValue \
-      >
-
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        PortableServer::LifespanPolicy \
-      >
-
-# pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        PortableServer::IdUniquenessPolicyValue \
-      >
-
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        PortableServer::IdUniquenessPolicy \
-      >
-
-# pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        PortableServer::IdAssignmentPolicyValue \
-      >
-
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        PortableServer::IdAssignmentPolicy \
-      >
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-# pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        PortableServer::ImplicitActivationPolicyValue \
-      >
-
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        PortableServer::ImplicitActivationPolicy \
-      >
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-# pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        PortableServer::ServantRetentionPolicyValue \
-      >
-
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        PortableServer::ServantRetentionPolicy \
-      >
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-# pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        PortableServer::RequestProcessingPolicyValue \
-      >
-
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        PortableServer::RequestProcessingPolicy \
-      >
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        PortableServer::POAManager::AdapterInactive \
-      >
-
-# pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        PortableServer::POAManager::State \
-      >
-
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        PortableServer::POAManager \
-      >
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        PortableServer::AdapterActivator \
-      >
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        PortableServer::ServantManager \
-      >
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        PortableServer::ServantActivator \
-      >
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        PortableServer::ServantLocator \
-      >
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        PortableServer::Current::NoContext \
-      >
-
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        PortableServer::Current \
-      >
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp
index f9e777c153b..7abbd382fa2 100644
--- a/TAO/tao/PortableServer/PortableServerC.cpp
+++ b/TAO/tao/PortableServer/PortableServerC.cpp
@@ -26,17 +26,16 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
-#include "PortableServerC.h"
+#include "PortableServer.h"
 #include "tao/CDR.h"
+#include "tao/ORB_Core.h"
 #include "tao/Typecode.h"
 #include "tao/Object_Argument_T.h"
 #include "ace/OS_NS_string.h"
 
-#include "tao/PortableServer/POA.h"
-
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
@@ -46,14 +45,11 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
-
-#if (TAO_HAS_MINIMUM_POA == 0)
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
 {
-
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_
 
@@ -72,34 +68,6 @@ namespace TAO
 #endif /* end #if !defined */
 }
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// Hand crafted.
-
-char *
-PortableServer::ObjectId_to_string (const PortableServer::ObjectId &id)
-{
-  return TAO_POA::ObjectId_to_string (id);
-}
-
-CORBA::WChar *
-PortableServer::ObjectId_to_wstring (const PortableServer::ObjectId &id)
-{
-  return TAO_POA::ObjectId_to_wstring (id);
-}
-
-PortableServer::ObjectId *
-PortableServer::string_to_ObjectId (const char *id)
-{
-  return TAO_POA::string_to_ObjectId (id);
-}
-
-PortableServer::ObjectId *
-PortableServer::wstring_to_ObjectId (const CORBA::WChar *id)
-{
-  return TAO_POA::wstring_to_ObjectId (id);
-}
-
 // TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -150,2210 +118,12 @@ void PortableServer::POAList::_tao_any_destructor (
   )
 {
   POAList * _tao_tmp_pointer =
-    ACE_static_cast (POAList *, _tao_void_pointer);
+    static_cast<POAList *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 #endif /* end #if !defined */
 
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-// TAO_IDL - Generated from
-// 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)
-{
-}
-
-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;
-}
-
-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;
-}
-
-CORBA::Exception *
-PortableServer::ForwardRequest::_tao_duplicate (void) const
-{
-  CORBA::Exception *result;
-  ACE_NEW_RETURN (
-      result,
-      ::PortableServer::ForwardRequest (*this),
-      0
-    );
-  return result;
-}
-
-void PortableServer::ForwardRequest::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-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
-// 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);
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::ForwardRequest::_type (void) const
-{
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
-  return ::PortableServer::_tc_ForwardRequest;
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/exception_cs.cpp:63
-
-PortableServer::NotAGroupObject::NotAGroupObject (void)
-  : CORBA::UserException (
-        "IDL:omg.org/PortableServer/NotAGroupObject:2.3",
-        "NotAGroupObject"
-      )
-{
-}
-
-PortableServer::NotAGroupObject::~NotAGroupObject (void)
-{
-}
-
-PortableServer::NotAGroupObject::NotAGroupObject (const ::PortableServer::NotAGroupObject &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-PortableServer::NotAGroupObject&
-PortableServer::NotAGroupObject::operator= (const ::PortableServer::NotAGroupObject &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableServer::NotAGroupObject::_tao_any_destructor (void *_tao_void_pointer)
-{
-  NotAGroupObject *_tao_tmp_pointer =
-    ACE_static_cast (NotAGroupObject*, _tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-PortableServer::NotAGroupObject *
-PortableServer::NotAGroupObject::_downcast (CORBA::Exception *_tao_excp)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/NotAGroupObject:2.3", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (NotAGroupObject *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-CORBA::Exception *PortableServer::NotAGroupObject::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::PortableServer::NotAGroupObject, 0);
-  return retval;
-}
-
-CORBA::Exception *
-PortableServer::NotAGroupObject::_tao_duplicate (void) const
-{
-  CORBA::Exception *result;
-  ACE_NEW_RETURN (
-      result,
-      ::PortableServer::NotAGroupObject (*this),
-      0
-    );
-  return result;
-}
-
-void PortableServer::NotAGroupObject::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void PortableServer::NotAGroupObject::_tao_encode (
-    TAO_OutputCDR &cdr
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  if (cdr << *this)
-    {
-      return;
-    }
-
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void PortableServer::NotAGroupObject::_tao_decode (
-    TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (cdr >> *this)
-    {
-      return;
-    }
-
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::NotAGroupObject::_type (void) const
-{
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
-  return ::PortableServer::_tc_NotAGroupObject;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_PORTABLESERVER_IDS_CS_)
-#define _PORTABLESERVER_IDS_CS_
-
-PortableServer::IDs::IDs (void)
-{}
-
-PortableServer::IDs::IDs (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        PortableServer::ObjectId
-      >
-    (max)
-{}
-
-PortableServer::IDs::IDs (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    PortableServer::ObjectId * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        PortableServer::ObjectId
-      >
-    (max, length, buffer, release)
-{}
-
-PortableServer::IDs::IDs (
-    const IDs &seq
-  )
-  : TAO_Unbounded_Sequence<
-        PortableServer::ObjectId
-      >
-    (seq)
-{}
-
-PortableServer::IDs::~IDs (void)
-{}
-
-void PortableServer::IDs::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  IDs * _tao_tmp_pointer =
-    ACE_static_cast (IDs *, _tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableServer::ThreadPolicy.
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-PortableServer::ThreadPolicy_ptr
-TAO::Objref_Traits<PortableServer::ThreadPolicy>::duplicate (
-    PortableServer::ThreadPolicy_ptr p
-  )
-{
-  return PortableServer::ThreadPolicy::_duplicate (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-void
-TAO::Objref_Traits<PortableServer::ThreadPolicy>::release (
-    PortableServer::ThreadPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-PortableServer::ThreadPolicy_ptr
-TAO::Objref_Traits<PortableServer::ThreadPolicy>::nil (void)
-{
-  return PortableServer::ThreadPolicy::_nil ();
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-CORBA::Boolean
-TAO::Objref_Traits<PortableServer::ThreadPolicy>::marshal (
-    PortableServer::ThreadPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, 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)
-{}
-
-PortableServer::ThreadPolicy::~ThreadPolicy (void)
-{}
-
-void
-PortableServer::ThreadPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  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 _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ThreadPolicy::_nil ();
-    }
-
-  ThreadPolicy_ptr proxy =
-    dynamic_cast<ThreadPolicy_ptr> (_tao_objref);
-
-  return ThreadPolicy::_duplicate (proxy);
-}
-
-PortableServer::ThreadPolicy_ptr
-PortableServer::ThreadPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ThreadPolicy::_nil ();
-    }
-
-  ThreadPolicy_ptr proxy =
-    dynamic_cast<ThreadPolicy_ptr> (_tao_objref);
-
-  return ThreadPolicy::_duplicate (proxy);
-}
-
-PortableServer::ThreadPolicy_ptr
-PortableServer::ThreadPolicy::_duplicate (ThreadPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-CORBA::Boolean
-PortableServer::ThreadPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  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"
-        )
-     )
-    {
-      return 1; // success using local knowledge
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-const char* PortableServer::ThreadPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ThreadPolicy:2.3";
-}
-
-CORBA::Boolean
-PortableServer::ThreadPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableServer::LifespanPolicy.
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-PortableServer::LifespanPolicy_ptr
-TAO::Objref_Traits<PortableServer::LifespanPolicy>::duplicate (
-    PortableServer::LifespanPolicy_ptr p
-  )
-{
-  return PortableServer::LifespanPolicy::_duplicate (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-void
-TAO::Objref_Traits<PortableServer::LifespanPolicy>::release (
-    PortableServer::LifespanPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-PortableServer::LifespanPolicy_ptr
-TAO::Objref_Traits<PortableServer::LifespanPolicy>::nil (void)
-{
-  return PortableServer::LifespanPolicy::_nil ();
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-CORBA::Boolean
-TAO::Objref_Traits<PortableServer::LifespanPolicy>::marshal (
-    PortableServer::LifespanPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, 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)
-{}
-
-PortableServer::LifespanPolicy::~LifespanPolicy (void)
-{}
-
-void
-PortableServer::LifespanPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  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 _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return LifespanPolicy::_nil ();
-    }
-
-  LifespanPolicy_ptr proxy =
-    dynamic_cast<LifespanPolicy_ptr> (_tao_objref);
-
-  return LifespanPolicy::_duplicate (proxy);
-}
-
-PortableServer::LifespanPolicy_ptr
-PortableServer::LifespanPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return LifespanPolicy::_nil ();
-    }
-
-  LifespanPolicy_ptr proxy =
-    dynamic_cast<LifespanPolicy_ptr> (_tao_objref);
-
-  return LifespanPolicy::_duplicate (proxy);
-}
-
-PortableServer::LifespanPolicy_ptr
-PortableServer::LifespanPolicy::_duplicate (LifespanPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-CORBA::Boolean
-PortableServer::LifespanPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  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"
-        )
-     )
-    {
-      return 1; // success using local knowledge
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-const char* PortableServer::LifespanPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/LifespanPolicy:2.3";
-}
-
-CORBA::Boolean
-PortableServer::LifespanPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableServer::IdUniquenessPolicy.
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-PortableServer::IdUniquenessPolicy_ptr
-TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::duplicate (
-    PortableServer::IdUniquenessPolicy_ptr p
-  )
-{
-  return PortableServer::IdUniquenessPolicy::_duplicate (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-void
-TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::release (
-    PortableServer::IdUniquenessPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-PortableServer::IdUniquenessPolicy_ptr
-TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::nil (void)
-{
-  return PortableServer::IdUniquenessPolicy::_nil ();
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-CORBA::Boolean
-TAO::Objref_Traits<PortableServer::IdUniquenessPolicy>::marshal (
-    PortableServer::IdUniquenessPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, 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)
-{}
-
-PortableServer::IdUniquenessPolicy::~IdUniquenessPolicy (void)
-{}
-
-void
-PortableServer::IdUniquenessPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  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 _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return IdUniquenessPolicy::_nil ();
-    }
-
-  IdUniquenessPolicy_ptr proxy =
-    dynamic_cast<IdUniquenessPolicy_ptr> (_tao_objref);
-
-  return IdUniquenessPolicy::_duplicate (proxy);
-}
-
-PortableServer::IdUniquenessPolicy_ptr
-PortableServer::IdUniquenessPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return IdUniquenessPolicy::_nil ();
-    }
-
-  IdUniquenessPolicy_ptr proxy =
-    dynamic_cast<IdUniquenessPolicy_ptr> (_tao_objref);
-
-  return IdUniquenessPolicy::_duplicate (proxy);
-}
-
-PortableServer::IdUniquenessPolicy_ptr
-PortableServer::IdUniquenessPolicy::_duplicate (IdUniquenessPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-CORBA::Boolean
-PortableServer::IdUniquenessPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  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"
-        )
-     )
-    {
-      return 1; // success using local knowledge
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-const char* PortableServer::IdUniquenessPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/IdUniquenessPolicy:2.3";
-}
-
-CORBA::Boolean
-PortableServer::IdUniquenessPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableServer::IdAssignmentPolicy.
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-PortableServer::IdAssignmentPolicy_ptr
-TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::duplicate (
-    PortableServer::IdAssignmentPolicy_ptr p
-  )
-{
-  return PortableServer::IdAssignmentPolicy::_duplicate (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-void
-TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::release (
-    PortableServer::IdAssignmentPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-PortableServer::IdAssignmentPolicy_ptr
-TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::nil (void)
-{
-  return PortableServer::IdAssignmentPolicy::_nil ();
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-CORBA::Boolean
-TAO::Objref_Traits<PortableServer::IdAssignmentPolicy>::marshal (
-    PortableServer::IdAssignmentPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, 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)
-{}
-
-PortableServer::IdAssignmentPolicy::~IdAssignmentPolicy (void)
-{}
-
-void
-PortableServer::IdAssignmentPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  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 _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return IdAssignmentPolicy::_nil ();
-    }
-
-  IdAssignmentPolicy_ptr proxy =
-    dynamic_cast<IdAssignmentPolicy_ptr> (_tao_objref);
-
-  return IdAssignmentPolicy::_duplicate (proxy);
-}
-
-PortableServer::IdAssignmentPolicy_ptr
-PortableServer::IdAssignmentPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return IdAssignmentPolicy::_nil ();
-    }
-
-  IdAssignmentPolicy_ptr proxy =
-    dynamic_cast<IdAssignmentPolicy_ptr> (_tao_objref);
-
-  return IdAssignmentPolicy::_duplicate (proxy);
-}
-
-PortableServer::IdAssignmentPolicy_ptr
-PortableServer::IdAssignmentPolicy::_duplicate (IdAssignmentPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-CORBA::Boolean
-PortableServer::IdAssignmentPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  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"
-        )
-     )
-    {
-      return 1; // success using local knowledge
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-const char* PortableServer::IdAssignmentPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/IdAssignmentPolicy:2.3";
-}
-
-CORBA::Boolean
-PortableServer::IdAssignmentPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableServer::ImplicitActivationPolicy.
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-PortableServer::ImplicitActivationPolicy_ptr
-TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::duplicate (
-    PortableServer::ImplicitActivationPolicy_ptr p
-  )
-{
-  return PortableServer::ImplicitActivationPolicy::_duplicate (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-void
-TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::release (
-    PortableServer::ImplicitActivationPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-PortableServer::ImplicitActivationPolicy_ptr
-TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::nil (void)
-{
-  return PortableServer::ImplicitActivationPolicy::_nil ();
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-CORBA::Boolean
-TAO::Objref_Traits<PortableServer::ImplicitActivationPolicy>::marshal (
-    PortableServer::ImplicitActivationPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, 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)
-{}
-
-PortableServer::ImplicitActivationPolicy::~ImplicitActivationPolicy (void)
-{}
-
-void
-PortableServer::ImplicitActivationPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  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 _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ImplicitActivationPolicy::_nil ();
-    }
-
-  ImplicitActivationPolicy_ptr proxy =
-    dynamic_cast<ImplicitActivationPolicy_ptr> (_tao_objref);
-
-  return ImplicitActivationPolicy::_duplicate (proxy);
-}
-
-PortableServer::ImplicitActivationPolicy_ptr
-PortableServer::ImplicitActivationPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ImplicitActivationPolicy::_nil ();
-    }
-
-  ImplicitActivationPolicy_ptr proxy =
-    dynamic_cast<ImplicitActivationPolicy_ptr> (_tao_objref);
-
-  return ImplicitActivationPolicy::_duplicate (proxy);
-}
-
-PortableServer::ImplicitActivationPolicy_ptr
-PortableServer::ImplicitActivationPolicy::_duplicate (ImplicitActivationPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-CORBA::Boolean
-PortableServer::ImplicitActivationPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  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"
-        )
-     )
-    {
-      return 1; // success using local knowledge
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-const char* PortableServer::ImplicitActivationPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ImplicitActivationPolicy:2.3";
-}
-
-CORBA::Boolean
-PortableServer::ImplicitActivationPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableServer::ServantRetentionPolicy.
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-PortableServer::ServantRetentionPolicy_ptr
-TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::duplicate (
-    PortableServer::ServantRetentionPolicy_ptr p
-  )
-{
-  return PortableServer::ServantRetentionPolicy::_duplicate (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-void
-TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::release (
-    PortableServer::ServantRetentionPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-PortableServer::ServantRetentionPolicy_ptr
-TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::nil (void)
-{
-  return PortableServer::ServantRetentionPolicy::_nil ();
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-CORBA::Boolean
-TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::marshal (
-    PortableServer::ServantRetentionPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, 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)
-{}
-
-PortableServer::ServantRetentionPolicy::~ServantRetentionPolicy (void)
-{}
-
-void
-PortableServer::ServantRetentionPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  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 _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ServantRetentionPolicy::_nil ();
-    }
-
-  ServantRetentionPolicy_ptr proxy =
-    dynamic_cast<ServantRetentionPolicy_ptr> (_tao_objref);
-
-  return ServantRetentionPolicy::_duplicate (proxy);
-}
-
-PortableServer::ServantRetentionPolicy_ptr
-PortableServer::ServantRetentionPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ServantRetentionPolicy::_nil ();
-    }
-
-  ServantRetentionPolicy_ptr proxy =
-    dynamic_cast<ServantRetentionPolicy_ptr> (_tao_objref);
-
-  return ServantRetentionPolicy::_duplicate (proxy);
-}
-
-PortableServer::ServantRetentionPolicy_ptr
-PortableServer::ServantRetentionPolicy::_duplicate (ServantRetentionPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-CORBA::Boolean
-PortableServer::ServantRetentionPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  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"
-        )
-     )
-    {
-      return 1; // success using local knowledge
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-const char* PortableServer::ServantRetentionPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ServantRetentionPolicy:2.3";
-}
-
-CORBA::Boolean
-PortableServer::ServantRetentionPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableServer::RequestProcessingPolicy.
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-PortableServer::RequestProcessingPolicy_ptr
-TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::duplicate (
-    PortableServer::RequestProcessingPolicy_ptr p
-  )
-{
-  return PortableServer::RequestProcessingPolicy::_duplicate (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-void
-TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::release (
-    PortableServer::RequestProcessingPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-PortableServer::RequestProcessingPolicy_ptr
-TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::nil (void)
-{
-  return PortableServer::RequestProcessingPolicy::_nil ();
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-CORBA::Boolean
-TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::marshal (
-    PortableServer::RequestProcessingPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, 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)
-{}
-
-PortableServer::RequestProcessingPolicy::~RequestProcessingPolicy (void)
-{}
-
-void
-PortableServer::RequestProcessingPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  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 _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return RequestProcessingPolicy::_nil ();
-    }
-
-  RequestProcessingPolicy_ptr proxy =
-    dynamic_cast<RequestProcessingPolicy_ptr> (_tao_objref);
-
-  return RequestProcessingPolicy::_duplicate (proxy);
-}
-
-PortableServer::RequestProcessingPolicy_ptr
-PortableServer::RequestProcessingPolicy::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return RequestProcessingPolicy::_nil ();
-    }
-
-  RequestProcessingPolicy_ptr proxy =
-    dynamic_cast<RequestProcessingPolicy_ptr> (_tao_objref);
-
-  return RequestProcessingPolicy::_duplicate (proxy);
-}
-
-PortableServer::RequestProcessingPolicy_ptr
-PortableServer::RequestProcessingPolicy::_duplicate (RequestProcessingPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-CORBA::Boolean
-PortableServer::RequestProcessingPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  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"
-        )
-     )
-    {
-      return 1; // success using local knowledge
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-const char* PortableServer::RequestProcessingPolicy::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/RequestProcessingPolicy:2.3";
-}
-
-CORBA::Boolean
-PortableServer::RequestProcessingPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableServer::POAManager.
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-PortableServer::POAManager_ptr
-TAO::Objref_Traits<PortableServer::POAManager>::duplicate (
-    PortableServer::POAManager_ptr p
-  )
-{
-  return PortableServer::POAManager::_duplicate (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-void
-TAO::Objref_Traits<PortableServer::POAManager>::release (
-    PortableServer::POAManager_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-PortableServer::POAManager_ptr
-TAO::Objref_Traits<PortableServer::POAManager>::nil (void)
-{
-  return PortableServer::POAManager::_nil ();
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-CORBA::Boolean
-TAO::Objref_Traits<PortableServer::POAManager>::marshal (
-    PortableServer::POAManager_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// 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
-// be\be_visitor_exception/exception_cs.cpp:63
-
-PortableServer::POAManager::AdapterInactive::AdapterInactive (void)
-  : CORBA::UserException (
-        "IDL:omg.org/PortableServer/POAManager/AdapterInactive:2.3",
-        "AdapterInactive"
-      )
-{
-}
-
-PortableServer::POAManager::AdapterInactive::~AdapterInactive (void)
-{
-}
-
-PortableServer::POAManager::AdapterInactive::AdapterInactive (const ::PortableServer::POAManager::AdapterInactive &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-PortableServer::POAManager::AdapterInactive&
-PortableServer::POAManager::AdapterInactive::operator= (const ::PortableServer::POAManager::AdapterInactive &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableServer::POAManager::AdapterInactive::_tao_any_destructor (void *_tao_void_pointer)
-{
-  AdapterInactive *_tao_tmp_pointer =
-    ACE_static_cast (AdapterInactive*, _tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-PortableServer::POAManager::AdapterInactive *
-PortableServer::POAManager::AdapterInactive::_downcast (CORBA::Exception *_tao_excp)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POAManager/AdapterInactive:2.3", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (AdapterInactive *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-CORBA::Exception *PortableServer::POAManager::AdapterInactive::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::PortableServer::POAManager::AdapterInactive, 0);
-  return retval;
-}
-
-CORBA::Exception *
-PortableServer::POAManager::AdapterInactive::_tao_duplicate (void) const
-{
-  CORBA::Exception *result;
-  ACE_NEW_RETURN (
-      result,
-      ::PortableServer::POAManager::AdapterInactive (*this),
-      0
-    );
-  return result;
-}
-
-void PortableServer::POAManager::AdapterInactive::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void PortableServer::POAManager::AdapterInactive::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void PortableServer::POAManager::AdapterInactive::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::POAManager::AdapterInactive::_type (void) const
-{
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
-  return ::PortableServer::POAManager::_tc_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::_unchecked_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;
-}
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableServer::AdapterActivator.
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-PortableServer::AdapterActivator_ptr
-TAO::Objref_Traits<PortableServer::AdapterActivator>::duplicate (
-    PortableServer::AdapterActivator_ptr p
-  )
-{
-  return PortableServer::AdapterActivator::_duplicate (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-void
-TAO::Objref_Traits<PortableServer::AdapterActivator>::release (
-    PortableServer::AdapterActivator_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-PortableServer::AdapterActivator_ptr
-TAO::Objref_Traits<PortableServer::AdapterActivator>::nil (void)
-{
-  return PortableServer::AdapterActivator::_nil ();
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-CORBA::Boolean
-TAO::Objref_Traits<PortableServer::AdapterActivator>::marshal (
-    PortableServer::AdapterActivator_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, 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)
-{}
-
-PortableServer::AdapterActivator::~AdapterActivator (void)
-{}
-
-void
-PortableServer::AdapterActivator::_tao_any_destructor (void *_tao_void_pointer)
-{
-  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 _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return AdapterActivator::_nil ();
-    }
-
-  AdapterActivator_ptr proxy =
-    dynamic_cast<AdapterActivator_ptr> (_tao_objref);
-
-  return AdapterActivator::_duplicate (proxy);
-}
-
-PortableServer::AdapterActivator_ptr
-PortableServer::AdapterActivator::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return AdapterActivator::_nil ();
-    }
-
-  AdapterActivator_ptr proxy =
-    dynamic_cast<AdapterActivator_ptr> (_tao_objref);
-
-  return AdapterActivator::_duplicate (proxy);
-}
-
-PortableServer::AdapterActivator_ptr
-PortableServer::AdapterActivator::_duplicate (AdapterActivator_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-CORBA::Boolean
-PortableServer::AdapterActivator::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  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"
-        )
-     )
-    {
-      return 1; // success using local knowledge
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-const char* PortableServer::AdapterActivator::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/AdapterActivator:2.3";
-}
-
-CORBA::Boolean
-PortableServer::AdapterActivator::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableServer::ServantManager.
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-PortableServer::ServantManager_ptr
-TAO::Objref_Traits<PortableServer::ServantManager>::duplicate (
-    PortableServer::ServantManager_ptr p
-  )
-{
-  return PortableServer::ServantManager::_duplicate (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-void
-TAO::Objref_Traits<PortableServer::ServantManager>::release (
-    PortableServer::ServantManager_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-PortableServer::ServantManager_ptr
-TAO::Objref_Traits<PortableServer::ServantManager>::nil (void)
-{
-  return PortableServer::ServantManager::_nil ();
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-CORBA::Boolean
-TAO::Objref_Traits<PortableServer::ServantManager>::marshal (
-    PortableServer::ServantManager_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, 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)
-{}
-
-PortableServer::ServantManager::~ServantManager (void)
-{}
-
-void
-PortableServer::ServantManager::_tao_any_destructor (void *_tao_void_pointer)
-{
-  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 _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ServantManager::_nil ();
-    }
-
-  ServantManager_ptr proxy =
-    dynamic_cast<ServantManager_ptr> (_tao_objref);
-
-  return ServantManager::_duplicate (proxy);
-}
-
-PortableServer::ServantManager_ptr
-PortableServer::ServantManager::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ServantManager::_nil ();
-    }
-
-  ServantManager_ptr proxy =
-    dynamic_cast<ServantManager_ptr> (_tao_objref);
-
-  return ServantManager::_duplicate (proxy);
-}
-
-PortableServer::ServantManager_ptr
-PortableServer::ServantManager::_duplicate (ServantManager_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-CORBA::Boolean
-PortableServer::ServantManager::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  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"
-        )
-     )
-    {
-      return 1; // success using local knowledge
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-const char* PortableServer::ServantManager::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ServantManager:2.3";
-}
-
-CORBA::Boolean
-PortableServer::ServantManager::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableServer::ServantActivator.
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-PortableServer::ServantActivator_ptr
-TAO::Objref_Traits<PortableServer::ServantActivator>::duplicate (
-    PortableServer::ServantActivator_ptr p
-  )
-{
-  return PortableServer::ServantActivator::_duplicate (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-void
-TAO::Objref_Traits<PortableServer::ServantActivator>::release (
-    PortableServer::ServantActivator_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-PortableServer::ServantActivator_ptr
-TAO::Objref_Traits<PortableServer::ServantActivator>::nil (void)
-{
-  return PortableServer::ServantActivator::_nil ();
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-CORBA::Boolean
-TAO::Objref_Traits<PortableServer::ServantActivator>::marshal (
-    PortableServer::ServantActivator_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, 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)
-{}
-
-PortableServer::ServantActivator::~ServantActivator (void)
-{}
-
-void
-PortableServer::ServantActivator::_tao_any_destructor (void *_tao_void_pointer)
-{
-  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 _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ServantActivator::_nil ();
-    }
-
-  ServantActivator_ptr proxy =
-    dynamic_cast<ServantActivator_ptr> (_tao_objref);
-
-  return ServantActivator::_duplicate (proxy);
-}
-
-PortableServer::ServantActivator_ptr
-PortableServer::ServantActivator::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ServantActivator::_nil ();
-    }
-
-  ServantActivator_ptr proxy =
-    dynamic_cast<ServantActivator_ptr> (_tao_objref);
-
-  return ServantActivator::_duplicate (proxy);
-}
-
-PortableServer::ServantActivator_ptr
-PortableServer::ServantActivator::_duplicate (ServantActivator_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-CORBA::Boolean
-PortableServer::ServantActivator::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  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"
-        )
-     )
-    {
-      return 1; // success using local knowledge
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-const char* PortableServer::ServantActivator::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ServantActivator:2.3";
-}
-
-CORBA::Boolean
-PortableServer::ServantActivator::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableServer::ServantLocator.
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-PortableServer::ServantLocator_ptr
-TAO::Objref_Traits<PortableServer::ServantLocator>::duplicate (
-    PortableServer::ServantLocator_ptr p
-  )
-{
-  return PortableServer::ServantLocator::_duplicate (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-void
-TAO::Objref_Traits<PortableServer::ServantLocator>::release (
-    PortableServer::ServantLocator_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-PortableServer::ServantLocator_ptr
-TAO::Objref_Traits<PortableServer::ServantLocator>::nil (void)
-{
-  return PortableServer::ServantLocator::_nil ();
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-CORBA::Boolean
-TAO::Objref_Traits<PortableServer::ServantLocator>::marshal (
-    PortableServer::ServantLocator_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, 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)
-{}
-
-PortableServer::ServantLocator::~ServantLocator (void)
-{}
-
-void
-PortableServer::ServantLocator::_tao_any_destructor (void *_tao_void_pointer)
-{
-  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 _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ServantLocator::_nil ();
-    }
-
-  ServantLocator_ptr proxy =
-    dynamic_cast<ServantLocator_ptr> (_tao_objref);
-
-  return ServantLocator::_duplicate (proxy);
-}
-
-PortableServer::ServantLocator_ptr
-PortableServer::ServantLocator::_unchecked_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return ServantLocator::_nil ();
-    }
-
-  ServantLocator_ptr proxy =
-    dynamic_cast<ServantLocator_ptr> (_tao_objref);
-
-  return ServantLocator::_duplicate (proxy);
-}
-
-PortableServer::ServantLocator_ptr
-PortableServer::ServantLocator::_duplicate (ServantLocator_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-
-  return obj;
-}
-
-CORBA::Boolean
-PortableServer::ServantLocator::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  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"
-        )
-     )
-    {
-      return 1; // success using local knowledge
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-const char* PortableServer::ServantLocator::_interface_repository_id (void) const
-{
-  return "IDL:omg.org/PortableServer/ServantLocator:2.3";
-}
-
-CORBA::Boolean
-PortableServer::ServantLocator::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
 // TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
@@ -2394,12 +164,6 @@ TAO::Objref_Traits<PortableServer::POA>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// 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
 // be\be_visitor_exception/exception_cs.cpp:63
 
@@ -2433,21 +197,20 @@ PortableServer::POA::AdapterAlreadyExists::operator= (const ::PortableServer::PO
 void PortableServer::POA::AdapterAlreadyExists::_tao_any_destructor (void *_tao_void_pointer)
 {
   AdapterAlreadyExists *_tao_tmp_pointer =
-    ACE_static_cast (AdapterAlreadyExists*, _tao_void_pointer);
+    static_cast<AdapterAlreadyExists *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 PortableServer::POA::AdapterAlreadyExists *
 PortableServer::POA::AdapterAlreadyExists::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterAlreadyExists:2.3", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (AdapterAlreadyExists *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<AdapterAlreadyExists *> (_tao_excp);
+}
+
+const PortableServer::POA::AdapterAlreadyExists *
+PortableServer::POA::AdapterAlreadyExists::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const AdapterAlreadyExists *> (_tao_excp);
 }
 
 CORBA::Exception *PortableServer::POA::AdapterAlreadyExists::_alloc (void)
@@ -2493,15 +256,52 @@ void PortableServer::POA::AdapterAlreadyExists::_tao_decode (
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr PortableServer::POA::AdapterAlreadyExists::_type (void) const
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
   return ::PortableServer::POA::_tc_AdapterAlreadyExists;
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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 (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 (0x0),  // name = AdapterAlreadyExists
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterAlreadyExists (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_AdapterAlreadyExists),
+    (char *) &_oc_PortableServer_POA_AdapterAlreadyExists,
+    0,
+    0
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterAlreadyExists =
+  &_tc_TAO_tc_PortableServer_POA_AdapterAlreadyExists;
+
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::AdapterNonExistent::AdapterNonExistent (void)
@@ -2534,21 +334,20 @@ PortableServer::POA::AdapterNonExistent::operator= (const ::PortableServer::POA:
 void PortableServer::POA::AdapterNonExistent::_tao_any_destructor (void *_tao_void_pointer)
 {
   AdapterNonExistent *_tao_tmp_pointer =
-    ACE_static_cast (AdapterNonExistent*, _tao_void_pointer);
+    static_cast<AdapterNonExistent *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 PortableServer::POA::AdapterNonExistent *
 PortableServer::POA::AdapterNonExistent::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterNonExistent:2.3", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (AdapterNonExistent *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<AdapterNonExistent *> (_tao_excp);
+}
+
+const PortableServer::POA::AdapterNonExistent *
+PortableServer::POA::AdapterNonExistent::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const AdapterNonExistent *> (_tao_excp);
 }
 
 CORBA::Exception *PortableServer::POA::AdapterNonExistent::_alloc (void)
@@ -2594,15 +393,51 @@ void PortableServer::POA::AdapterNonExistent::_tao_decode (
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr PortableServer::POA::AdapterNonExistent::_type (void) const
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
   return ::PortableServer::POA::_tc_AdapterNonExistent;
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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 (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 (0x6e740000),  // name = AdapterNonExistent
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_AdapterNonExistent (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_AdapterNonExistent),
+    (char *) &_oc_PortableServer_POA_AdapterNonExistent,
+    0,
+    0
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_AdapterNonExistent =
+  &_tc_TAO_tc_PortableServer_POA_AdapterNonExistent;
+
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::InvalidPolicy::InvalidPolicy (void)
@@ -2637,21 +472,20 @@ PortableServer::POA::InvalidPolicy::operator= (const ::PortableServer::POA::Inva
 void PortableServer::POA::InvalidPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   InvalidPolicy *_tao_tmp_pointer =
-    ACE_static_cast (InvalidPolicy*, _tao_void_pointer);
+    static_cast<InvalidPolicy *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 PortableServer::POA::InvalidPolicy *
 PortableServer::POA::InvalidPolicy::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/InvalidPolicy:2.3", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (InvalidPolicy *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<InvalidPolicy *> (_tao_excp);
+}
+
+const PortableServer::POA::InvalidPolicy *
+PortableServer::POA::InvalidPolicy::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const InvalidPolicy *> (_tao_excp);
 }
 
 CORBA::Exception *PortableServer::POA::InvalidPolicy::_alloc (void)
@@ -2713,19 +547,58 @@ PortableServer::POA::InvalidPolicy::InvalidPolicy (
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr PortableServer::POA::InvalidPolicy::_type (void) const
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
   return ::PortableServer::POA::_tc_InvalidPolicy;
 }
 
-#if (TAO_HAS_MINIMUM_POA == 0)
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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 (0x0),  // repository ID = IDL:omg.org/PortableServer/POA/InvalidPolicy:2.3
+    14,
+  ACE_NTOHL (0x496e7661),
+  ACE_NTOHL (0x6c696450),
+  ACE_NTOHL (0x6f6c6963),
+  ACE_NTOHL (0x79000000),  // name = InvalidPolicy
+  1, // member count
+    6,
+  ACE_NTOHL (0x696e6465),
+  ACE_NTOHL (0x78000000),  // name = index
+    CORBA::tk_ushort,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_InvalidPolicy (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_InvalidPolicy),
+    (char *) &_oc_PortableServer_POA_InvalidPolicy,
+    0,
+    0
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_InvalidPolicy =
+  &_tc_TAO_tc_PortableServer_POA_InvalidPolicy;
 
 // TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 PortableServer::POA::NoServant::NoServant (void)
   : CORBA::UserException (
         "IDL:omg.org/PortableServer/POA/NoServant:2.3",
@@ -2756,21 +629,20 @@ PortableServer::POA::NoServant::operator= (const ::PortableServer::POA::NoServan
 void PortableServer::POA::NoServant::_tao_any_destructor (void *_tao_void_pointer)
 {
   NoServant *_tao_tmp_pointer =
-    ACE_static_cast (NoServant*, _tao_void_pointer);
+    static_cast<NoServant *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 PortableServer::POA::NoServant *
 PortableServer::POA::NoServant::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/NoServant:2.3", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (NoServant *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<NoServant *> (_tao_excp);
+}
+
+const PortableServer::POA::NoServant *
+PortableServer::POA::NoServant::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const NoServant *> (_tao_excp);
 }
 
 CORBA::Exception *PortableServer::POA::NoServant::_alloc (void)
@@ -2816,15 +688,47 @@ void PortableServer::POA::NoServant::_tao_decode (
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr PortableServer::POA::NoServant::_type (void) const
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
   return ::PortableServer::POA::_tc_NoServant;
 }
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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 (0x0),  // repository ID = IDL:omg.org/PortableServer/POA/NoServant:2.3
+    10,
+  ACE_NTOHL (0x4e6f5365),
+  ACE_NTOHL (0x7276616e),
+  ACE_NTOHL (0x74000000),  // name = NoServant
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_NoServant (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_NoServant),
+    (char *) &_oc_PortableServer_POA_NoServant,
+    0,
+    0
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_NoServant =
+  &_tc_TAO_tc_PortableServer_POA_NoServant;
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
@@ -2859,21 +763,20 @@ PortableServer::POA::ObjectAlreadyActive::operator= (const ::PortableServer::POA
 void PortableServer::POA::ObjectAlreadyActive::_tao_any_destructor (void *_tao_void_pointer)
 {
   ObjectAlreadyActive *_tao_tmp_pointer =
-    ACE_static_cast (ObjectAlreadyActive*, _tao_void_pointer);
+    static_cast<ObjectAlreadyActive *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 PortableServer::POA::ObjectAlreadyActive *
 PortableServer::POA::ObjectAlreadyActive::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:2.3", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (ObjectAlreadyActive *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<ObjectAlreadyActive *> (_tao_excp);
+}
+
+const PortableServer::POA::ObjectAlreadyActive *
+PortableServer::POA::ObjectAlreadyActive::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const ObjectAlreadyActive *> (_tao_excp);
 }
 
 CORBA::Exception *PortableServer::POA::ObjectAlreadyActive::_alloc (void)
@@ -2919,15 +822,51 @@ void PortableServer::POA::ObjectAlreadyActive::_tao_decode (
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr PortableServer::POA::ObjectAlreadyActive::_type (void) const
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
   return ::PortableServer::POA::_tc_ObjectAlreadyActive;
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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 (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 (0x69766500),  // name = ObjectAlreadyActive
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ObjectAlreadyActive (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_ObjectAlreadyActive),
+    (char *) &_oc_PortableServer_POA_ObjectAlreadyActive,
+    0,
+    0
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_ObjectAlreadyActive =
+  &_tc_TAO_tc_PortableServer_POA_ObjectAlreadyActive;
+
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::ObjectNotActive::ObjectNotActive (void)
@@ -2960,21 +899,20 @@ PortableServer::POA::ObjectNotActive::operator= (const ::PortableServer::POA::Ob
 void PortableServer::POA::ObjectNotActive::_tao_any_destructor (void *_tao_void_pointer)
 {
   ObjectNotActive *_tao_tmp_pointer =
-    ACE_static_cast (ObjectNotActive*, _tao_void_pointer);
+    static_cast<ObjectNotActive *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 PortableServer::POA::ObjectNotActive *
 PortableServer::POA::ObjectNotActive::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ObjectNotActive:2.3", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (ObjectNotActive *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<ObjectNotActive *> (_tao_excp);
+}
+
+const PortableServer::POA::ObjectNotActive *
+PortableServer::POA::ObjectNotActive::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const ObjectNotActive *> (_tao_excp);
 }
 
 CORBA::Exception *PortableServer::POA::ObjectNotActive::_alloc (void)
@@ -3020,15 +958,49 @@ void PortableServer::POA::ObjectNotActive::_tao_decode (
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr PortableServer::POA::ObjectNotActive::_type (void) const
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
   return ::PortableServer::POA::_tc_ObjectNotActive;
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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 (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA/ObjectNotActive:2.3
+    16,
+  ACE_NTOHL (0x4f626a65),
+  ACE_NTOHL (0x63744e6f),
+  ACE_NTOHL (0x74416374),
+  ACE_NTOHL (0x69766500),  // name = ObjectNotActive
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ObjectNotActive (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_ObjectNotActive),
+    (char *) &_oc_PortableServer_POA_ObjectNotActive,
+    0,
+    0
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_ObjectNotActive =
+  &_tc_TAO_tc_PortableServer_POA_ObjectNotActive;
+
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (void)
@@ -3061,21 +1033,20 @@ PortableServer::POA::ServantAlreadyActive::operator= (const ::PortableServer::PO
 void PortableServer::POA::ServantAlreadyActive::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServantAlreadyActive *_tao_tmp_pointer =
-    ACE_static_cast (ServantAlreadyActive*, _tao_void_pointer);
+    static_cast<ServantAlreadyActive *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 PortableServer::POA::ServantAlreadyActive *
 PortableServer::POA::ServantAlreadyActive::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ServantAlreadyActive:2.3", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (ServantAlreadyActive *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<ServantAlreadyActive *> (_tao_excp);
+}
+
+const PortableServer::POA::ServantAlreadyActive *
+PortableServer::POA::ServantAlreadyActive::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const ServantAlreadyActive *> (_tao_excp);
 }
 
 CORBA::Exception *PortableServer::POA::ServantAlreadyActive::_alloc (void)
@@ -3121,15 +1092,52 @@ void PortableServer::POA::ServantAlreadyActive::_tao_decode (
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr PortableServer::POA::ServantAlreadyActive::_type (void) const
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
   return ::PortableServer::POA::_tc_ServantAlreadyActive;
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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 (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 (0x0),  // name = ServantAlreadyActive
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ServantAlreadyActive (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_ServantAlreadyActive),
+    (char *) &_oc_PortableServer_POA_ServantAlreadyActive,
+    0,
+    0
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_ServantAlreadyActive =
+  &_tc_TAO_tc_PortableServer_POA_ServantAlreadyActive;
+
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::ServantNotActive::ServantNotActive (void)
@@ -3162,21 +1170,20 @@ PortableServer::POA::ServantNotActive::operator= (const ::PortableServer::POA::S
 void PortableServer::POA::ServantNotActive::_tao_any_destructor (void *_tao_void_pointer)
 {
   ServantNotActive *_tao_tmp_pointer =
-    ACE_static_cast (ServantNotActive*, _tao_void_pointer);
+    static_cast<ServantNotActive *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 PortableServer::POA::ServantNotActive *
 PortableServer::POA::ServantNotActive::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ServantNotActive:2.3", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (ServantNotActive *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<ServantNotActive *> (_tao_excp);
+}
+
+const PortableServer::POA::ServantNotActive *
+PortableServer::POA::ServantNotActive::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const ServantNotActive *> (_tao_excp);
 }
 
 CORBA::Exception *PortableServer::POA::ServantNotActive::_alloc (void)
@@ -3222,15 +1229,50 @@ void PortableServer::POA::ServantNotActive::_tao_decode (
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr PortableServer::POA::ServantNotActive::_type (void) const
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
   return ::PortableServer::POA::_tc_ServantNotActive;
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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 (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 (0x0),  // name = ServantNotActive
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_ServantNotActive (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_ServantNotActive),
+    (char *) &_oc_PortableServer_POA_ServantNotActive,
+    0,
+    0
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_ServantNotActive =
+  &_tc_TAO_tc_PortableServer_POA_ServantNotActive;
+
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::WrongAdapter::WrongAdapter (void)
@@ -3263,21 +1305,20 @@ PortableServer::POA::WrongAdapter::operator= (const ::PortableServer::POA::Wrong
 void PortableServer::POA::WrongAdapter::_tao_any_destructor (void *_tao_void_pointer)
 {
   WrongAdapter *_tao_tmp_pointer =
-    ACE_static_cast (WrongAdapter*, _tao_void_pointer);
+    static_cast<WrongAdapter *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 PortableServer::POA::WrongAdapter *
 PortableServer::POA::WrongAdapter::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/WrongAdapter:2.3", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (WrongAdapter *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<WrongAdapter *> (_tao_excp);
+}
+
+const PortableServer::POA::WrongAdapter *
+PortableServer::POA::WrongAdapter::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const WrongAdapter *> (_tao_excp);
 }
 
 CORBA::Exception *PortableServer::POA::WrongAdapter::_alloc (void)
@@ -3323,15 +1364,48 @@ void PortableServer::POA::WrongAdapter::_tao_decode (
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr PortableServer::POA::WrongAdapter::_type (void) const
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
   return ::PortableServer::POA::_tc_WrongAdapter;
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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 (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/POA/WrongAdapter:2.3
+    13,
+  ACE_NTOHL (0x57726f6e),
+  ACE_NTOHL (0x67416461),
+  ACE_NTOHL (0x70746572),
+  ACE_NTOHL (0x0),  // name = WrongAdapter
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_WrongAdapter (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_WrongAdapter),
+    (char *) &_oc_PortableServer_POA_WrongAdapter,
+    0,
+    0
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_WrongAdapter =
+  &_tc_TAO_tc_PortableServer_POA_WrongAdapter;
+
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::WrongPolicy::WrongPolicy (void)
@@ -3364,21 +1438,20 @@ PortableServer::POA::WrongPolicy::operator= (const ::PortableServer::POA::WrongP
 void PortableServer::POA::WrongPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   WrongPolicy *_tao_tmp_pointer =
-    ACE_static_cast (WrongPolicy*, _tao_void_pointer);
+    static_cast<WrongPolicy *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 PortableServer::POA::WrongPolicy *
 PortableServer::POA::WrongPolicy::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/WrongPolicy:2.3", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (WrongPolicy *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<WrongPolicy *> (_tao_excp);
+}
+
+const PortableServer::POA::WrongPolicy *
+PortableServer::POA::WrongPolicy::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const WrongPolicy *> (_tao_excp);
 }
 
 CORBA::Exception *PortableServer::POA::WrongPolicy::_alloc (void)
@@ -3424,14 +1497,46 @@ void PortableServer::POA::WrongPolicy::_tao_decode (
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr PortableServer::POA::WrongPolicy::_type (void) const
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
   return ::PortableServer::POA::_tc_WrongPolicy;
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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 (0x2e330000),  // repository ID = IDL:omg.org/PortableServer/POA/WrongPolicy:2.3
+    12,
+  ACE_NTOHL (0x57726f6e),
+  ACE_NTOHL (0x67506f6c),
+  ACE_NTOHL (0x69637900),  // name = WrongPolicy
+  0, // member count
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_POA_WrongPolicy (
+    CORBA::tk_except,
+    sizeof (_oc_PortableServer_POA_WrongPolicy),
+    (char *) &_oc_PortableServer_POA_WrongPolicy,
+    0,
+    0
+  );
+
+::CORBA::TypeCode_ptr PortableServer::POA::_tc_WrongPolicy =
+  &_tc_TAO_tc_PortableServer_POA_WrongPolicy;
+
 PortableServer::POA::POA (void)
 {}
 
@@ -3442,7 +1547,7 @@ void
 PortableServer::POA::_tao_any_destructor (void *_tao_void_pointer)
 {
   POA *_tao_tmp_pointer =
-    ACE_static_cast (POA *, _tao_void_pointer);
+    static_cast<POA *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -3499,18 +1604,18 @@ PortableServer::POA::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/PortableServer/POA:2.3"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -3532,569 +1637,7 @@ PortableServer::POA::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableServer::Current.
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-PortableServer::Current_ptr
-TAO::Objref_Traits<PortableServer::Current>::duplicate (
-    PortableServer::Current_ptr p
-  )
-{
-  return PortableServer::Current::_duplicate (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-void
-TAO::Objref_Traits<PortableServer::Current>::release (
-    PortableServer::Current_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-PortableServer::Current_ptr
-TAO::Objref_Traits<PortableServer::Current>::nil (void)
-{
-  return PortableServer::Current::_nil ();
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-CORBA::Boolean
-TAO::Objref_Traits<PortableServer::Current>::marshal (
-    PortableServer::Current_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return CORBA::Object::marshal (p, cdr);
-}
-
-// 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
-// be\be_visitor_exception/exception_cs.cpp:63
-
-PortableServer::Current::NoContext::NoContext (void)
-  : CORBA::UserException (
-        "IDL:omg.org/PortableServer/Current/NoContext:2.3",
-        "NoContext"
-      )
-{
-}
-
-PortableServer::Current::NoContext::~NoContext (void)
-{
-}
-
-PortableServer::Current::NoContext::NoContext (const ::PortableServer::Current::NoContext &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-PortableServer::Current::NoContext&
-PortableServer::Current::NoContext::operator= (const ::PortableServer::Current::NoContext &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void PortableServer::Current::NoContext::_tao_any_destructor (void *_tao_void_pointer)
-{
-  NoContext *_tao_tmp_pointer =
-    ACE_static_cast (NoContext*, _tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-PortableServer::Current::NoContext *
-PortableServer::Current::NoContext::_downcast (CORBA::Exception *_tao_excp)
-{
-  if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/Current/NoContext:2.3", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (NoContext *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-CORBA::Exception *PortableServer::Current::NoContext::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::PortableServer::Current::NoContext, 0);
-  return retval;
-}
-
-CORBA::Exception *
-PortableServer::Current::NoContext::_tao_duplicate (void) const
-{
-  CORBA::Exception *result;
-  ACE_NEW_RETURN (
-      result,
-      ::PortableServer::Current::NoContext (*this),
-      0
-    );
-  return result;
-}
-
-void PortableServer::Current::NoContext::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void PortableServer::Current::NoContext::_tao_encode (
-    TAO_OutputCDR &
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void PortableServer::Current::NoContext::_tao_decode (
-    TAO_InputCDR &
-    ACE_ENV_ARG_DECL
-  )
-{
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::Current::NoContext::_type (void) const
-{
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
-  return ::PortableServer::Current::_tc_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::_unchecked_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;
-}
-
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const PortableServer::ForwardRequest &_tao_aggregate
-  )
-{
-  // First marshal the repository ID.
-  if (strm << _tao_aggregate._rep_id ())
-    {
-      // Now marshal the members (if any).
-      if (
-        (strm << _tao_aggregate.forward_reference.in ())
-       )
-        {
-          return 1;
-        }
-      else
-        {
-          return 0;
-        }
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    PortableServer::ForwardRequest &_tao_aggregate
-  )
-{
-  // Demarshal the members.
-  if (
-    (strm >> _tao_aggregate.forward_reference.out ())
-  )
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const PortableServer::NotAGroupObject &_tao_aggregate
-  )
-{
-  // First marshal the repository ID.
-  if (strm << _tao_aggregate._rep_id ())
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    PortableServer::NotAGroupObject&
-  )
-{
-  return 1;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_PortableServer_IDs_CPP_
-#define _TAO_CDR_OP_PortableServer_IDs_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const PortableServer::IDs &_tao_sequence
-  )
-{
-  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;
-}
-
-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 _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_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_cs.cpp:51
-
-CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ThreadPolicyValue &_tao_enumval)
-{
-  CORBA::ULong _tao_temp = _tao_enumval;
-  return strm << _tao_temp;
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ThreadPolicyValue &_tao_enumval)
-{
-  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;
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_cs.cpp:51
-
-CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::LifespanPolicyValue &_tao_enumval)
-{
-  CORBA::ULong _tao_temp = _tao_enumval;
-  return strm << _tao_temp;
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::LifespanPolicyValue &_tao_enumval)
-{
-  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;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_cs.cpp:51
-
-CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::IdUniquenessPolicyValue &_tao_enumval)
-{
-  CORBA::ULong _tao_temp = _tao_enumval;
-  return strm << _tao_temp;
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdUniquenessPolicyValue &_tao_enumval)
-{
-  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;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_cs.cpp:51
-
-CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::IdAssignmentPolicyValue &_tao_enumval)
-{
-  CORBA::ULong _tao_temp = _tao_enumval;
-  return strm << _tao_temp;
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::IdAssignmentPolicyValue &_tao_enumval)
-{
-  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;
-}
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_cs.cpp:51
-
-CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ImplicitActivationPolicyValue &_tao_enumval)
-{
-  CORBA::ULong _tao_temp = _tao_enumval;
-  return strm << _tao_temp;
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ImplicitActivationPolicyValue &_tao_enumval)
-{
-  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;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_cs.cpp:51
-
-CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ServantRetentionPolicyValue &_tao_enumval)
-{
-  CORBA::ULong _tao_temp = _tao_enumval;
-  return strm << _tao_temp;
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ServantRetentionPolicyValue &_tao_enumval)
-{
-  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;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_cs.cpp:51
-
-CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::RequestProcessingPolicyValue &_tao_enumval)
-{
-  CORBA::ULong _tao_temp = _tao_enumval;
-  return strm << _tao_temp;
-}
-
-CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::RequestProcessingPolicyValue &_tao_enumval)
-{
-  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;
-}
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -4158,177 +1701,6 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::RequestProcessing
 
 #endif /* end #if !defined */
 
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  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 (_CORBA_SEQUENCE__EXPLICIT_CS_)
-#define _CORBA_SEQUENCE__EXPLICIT_CS_
-
-  template class
-    TAO_Unbounded_Sequence<
-        PortableServer::ObjectId
-      >;
-
-#endif /* end #if !defined */
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  template class
-    TAO::Objref_Traits<
-        PortableServer::ThreadPolicy
-      >;
-
-  template class
-    TAO_Objref_Var_T<
-        PortableServer::ThreadPolicy
-      >;
-
-  template class
-    TAO_Objref_Out_T<
-        PortableServer::ThreadPolicy
-      >;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  template class
-    TAO::Objref_Traits<
-        PortableServer::LifespanPolicy
-      >;
-
-  template class
-    TAO_Objref_Var_T<
-        PortableServer::LifespanPolicy
-      >;
-
-  template class
-    TAO_Objref_Out_T<
-        PortableServer::LifespanPolicy
-      >;
-
-  template class
-    TAO::Objref_Traits<
-        PortableServer::IdUniquenessPolicy
-      >;
-
-  template class
-    TAO_Objref_Var_T<
-        PortableServer::IdUniquenessPolicy
-      >;
-
-  template class
-    TAO_Objref_Out_T<
-        PortableServer::IdUniquenessPolicy
-      >;
-
-  template class
-    TAO::Objref_Traits<
-        PortableServer::IdAssignmentPolicy
-      >;
-
-  template class
-    TAO_Objref_Var_T<
-        PortableServer::IdAssignmentPolicy
-      >;
-
-  template class
-    TAO_Objref_Out_T<
-        PortableServer::IdAssignmentPolicy
-      >;
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  template class
-    TAO::Objref_Traits<
-        PortableServer::ImplicitActivationPolicy
-      >;
-
-  template class
-    TAO_Objref_Var_T<
-        PortableServer::ImplicitActivationPolicy
-      >;
-
-  template class
-    TAO_Objref_Out_T<
-        PortableServer::ImplicitActivationPolicy
-      >;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  template class
-    TAO::Objref_Traits<
-        PortableServer::ServantRetentionPolicy
-      >;
-
-  template class
-    TAO_Objref_Var_T<
-        PortableServer::ServantRetentionPolicy
-      >;
-
-  template class
-    TAO_Objref_Out_T<
-        PortableServer::ServantRetentionPolicy
-      >;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  template class
-    TAO::Objref_Traits<
-        PortableServer::RequestProcessingPolicy
-      >;
-
-  template class
-    TAO_Objref_Var_T<
-        PortableServer::RequestProcessingPolicy
-      >;
-
-  template class
-    TAO_Objref_Out_T<
-        PortableServer::RequestProcessingPolicy
-      >;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  template class
-    TAO::Objref_Traits<
-        PortableServer::POAManager
-      >;
-
-  template class
-    TAO_Objref_Var_T<
-        PortableServer::POAManager
-      >;
-
-  template class
-    TAO_Objref_Out_T<
-        PortableServer::POAManager
-      >;
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_TMPLINST_CS_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_TMPLINST_CS_
 
@@ -4347,95 +1719,6 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::RequestProcessing
 
 #endif /* end #if !defined */
 
-  template class
-    TAO::Objref_Traits<
-        PortableServer::AdapterActivator
-      >;
-
-  template class
-    TAO_Objref_Var_T<
-        PortableServer::AdapterActivator
-      >;
-
-  template class
-    TAO_Objref_Out_T<
-        PortableServer::AdapterActivator
-      >;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  template class
-    TAO::Objref_Traits<
-        PortableServer::ServantManager
-      >;
-
-  template class
-    TAO_Objref_Var_T<
-        PortableServer::ServantManager
-      >;
-
-  template class
-    TAO_Objref_Out_T<
-        PortableServer::ServantManager
-      >;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  template class
-    TAO::Objref_Traits<
-        PortableServer::ServantActivator
-      >;
-
-  template class
-    TAO_Objref_Var_T<
-        PortableServer::ServantActivator
-      >;
-
-  template class
-    TAO_Objref_Out_T<
-        PortableServer::ServantActivator
-      >;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  template class
-    TAO::Objref_Traits<
-        PortableServer::ServantLocator
-      >;
-
-  template class
-    TAO_Objref_Var_T<
-        PortableServer::ServantLocator
-      >;
-
-  template class
-    TAO_Objref_Out_T<
-        PortableServer::ServantLocator
-      >;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-  template class
-    TAO::Objref_Traits<
-        PortableServer::Current
-      >;
-
-  template class
-    TAO_Objref_Var_T<
-        PortableServer::Current
-      >;
-
-  template class
-    TAO_Objref_Out_T<
-        PortableServer::Current
-      >;
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 # pragma instantiate \
@@ -4492,173 +1775,6 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::RequestProcessing
 
 #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 (_CORBA_SEQUENCE__EXPLICIT_CS_)
-#define _CORBA_SEQUENCE__EXPLICIT_CS_
-
-# pragma instantiate \
-    TAO_Unbounded_Sequence< \
-        PortableServer::ObjectId \
-      >
-
-#endif /* end #if !defined */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-# pragma instantiate \
-    TAO::Objref_Traits< \
-        PortableServer::ThreadPolicy \
-      >
-
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableServer::ThreadPolicy
-      >
-
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableServer::ThreadPolicy
-      >
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-# pragma instantiate \
-    TAO::Objref_Traits< \
-        PortableServer::LifespanPolicy \
-      >
-
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableServer::LifespanPolicy
-      >
-
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableServer::LifespanPolicy
-      >
-
-# pragma instantiate \
-    TAO::Objref_Traits< \
-        PortableServer::IdUniquenessPolicy \
-      >
-
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableServer::IdUniquenessPolicy
-      >
-
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableServer::IdUniquenessPolicy
-      >
-
-# pragma instantiate \
-    TAO::Objref_Traits< \
-        PortableServer::IdAssignmentPolicy \
-      >
-
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableServer::IdAssignmentPolicy
-      >
-
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableServer::IdAssignmentPolicy
-      >
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-# pragma instantiate \
-    TAO::Objref_Traits< \
-        PortableServer::ImplicitActivationPolicy \
-      >
-
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableServer::ImplicitActivationPolicy
-      >
-
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableServer::ImplicitActivationPolicy
-      >
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-# pragma instantiate \
-    TAO::Objref_Traits< \
-        PortableServer::ServantRetentionPolicy \
-      >
-
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableServer::ServantRetentionPolicy
-      >
-
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableServer::ServantRetentionPolicy
-      >
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-# pragma instantiate \
-    TAO::Objref_Traits< \
-        PortableServer::RequestProcessingPolicy \
-      >
-
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableServer::RequestProcessingPolicy
-      >
-
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableServer::RequestProcessingPolicy
-      >
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-# pragma instantiate \
-    TAO::Objref_Traits< \
-        PortableServer::POAManager \
-      >
-
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableServer::POAManager
-      >
-
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableServer::POAManager
-      >
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_TMPLINST_CS_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_TMPLINST_CS_
 
@@ -4677,93 +1793,4 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::RequestProcessing
 
 #endif /* end #if !defined */
 
-# pragma instantiate \
-    TAO::Objref_Traits< \
-        PortableServer::AdapterActivator \
-      >
-
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableServer::AdapterActivator
-      >
-
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableServer::AdapterActivator
-      >
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-# pragma instantiate \
-    TAO::Objref_Traits< \
-        PortableServer::ServantManager \
-      >
-
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableServer::ServantManager
-      >
-
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableServer::ServantManager
-      >
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-# pragma instantiate \
-    TAO::Objref_Traits< \
-        PortableServer::ServantActivator \
-      >
-
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableServer::ServantActivator
-      >
-
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableServer::ServantActivator
-      >
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-# pragma instantiate \
-    TAO::Objref_Traits< \
-        PortableServer::ServantLocator \
-      >
-
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableServer::ServantLocator
-      >
-
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableServer::ServantLocator
-      >
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-# pragma instantiate \
-    TAO::Objref_Traits< \
-        PortableServer::Current \
-      >
-
-# pragma instantiate \
-    TAO_Objref_Var_T< \
-        PortableServer::Current
-      >
-
-# pragma instantiate \
-    TAO_Objref_Out_T< \
-        PortableServer::Current
-      >
-
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h
index 4d3f66bc31b..899bf4cf465 100644
--- a/TAO/tao/PortableServer/PortableServerC.h
+++ b/TAO/tao/PortableServer/PortableServerC.h
@@ -26,20 +26,27 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_PORTABLESERVERC_H_
 #define _TAO_IDL_ORIG_PORTABLESERVERC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+
+#include "ace/config-all.h"
+
+#ifndef TAO_PORTABLESERVER_SAFE_INCLUDE
+#error "You should not include PortableServerC.h directly, use PortableServer.h"
+#endif /* !TAO_PORTABLESERVER_SAFE_INCLUDE */
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "portableserver_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Sequence_T.h"
@@ -47,11 +54,16 @@
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 
+#include "tao/Policy_ForwardC.h"
 #include "tao/OctetSeqC.h"
-#include "tao/StringSeqC.h"
-#include "tao/PolicyC.h"
-#include "tao/CurrentC.h"
-#include "tao/OctetSeqC.h"
+#include "tao/PortableServer/PS_ForwardC.h"
+#include "tao/PortableServer/IdAssignmentPolicyC.h"
+#include "tao/PortableServer/IdUniquenessPolicyC.h"
+#include "tao/PortableServer/ImplicitActivationPolicyC.h"
+#include "tao/PortableServer/LifespanPolicyC.h"
+#include "tao/PortableServer/RequestProcessingPolicyC.h"
+#include "tao/PortableServer/ServantRetentionPolicyC.h"
+#include "tao/PortableServer/ThreadPolicyC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -66,9 +78,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -76,15 +86,8 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-class TAO_ServantBase;
-class TAO_ServantBase_var;
-class TAO_RefCountServantBase;
-class TAO_Local_ServantBase;
-class TAO_DynamicImplementation;
-class TAO_POA;
-
 // TAO_IDL - Generated from
-// be\be_visitor_root/root_ch.cpp:63
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -99,36 +102,6 @@ namespace TAO
 
 namespace PortableServer
 {
-  typedef TAO_ServantBase ServantBase;
-  typedef TAO_ServantBase_var ServantBase_var;
-  typedef TAO_RefCountServantBase RefCountServantBase;
-  typedef ServantBase *Servant;
-
-  typedef TAO_Local_ServantBase LocalServantBase;
-  typedef TAO_DynamicImplementation DynamicImplementation;
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
-
-#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;
-
-#endif /* end #if !defined */
 
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
@@ -191,187 +164,6 @@ namespace PortableServer
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_POAList;
 
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:435
-
-  typedef CORBA::OctetSeq ObjectId;
-  typedef CORBA::OctetSeq_var ObjectId_var;
-  typedef CORBA::OctetSeq_out ObjectId_out;
-
-  // TAO_IDL - Generated from
-  // 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
-  // be\be_visitor_exception/exception_ch.cpp:51
-
-#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);
-
-    virtual CORBA::Exception *_tao_duplicate (void) const;
-
-    virtual void _raise (void) const;
-
-    virtual void _tao_encode (
-        TAO_OutputCDR &
-        ACE_ENV_ARG_DECL
-      ) const;
-
-    virtual void _tao_decode (
-        TAO_InputCDR &
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ctor.cpp:66
-
-    ForwardRequest (
-        const CORBA::Object_ptr  _tao_forward_reference
-      );
-
-    // TAO_IDL - Generated from
-    // 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
-
-  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)
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:51
-
-#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);
-
-    virtual CORBA::Exception *_tao_duplicate (void) const;
-
-    virtual void _raise (void) const;
-
-    virtual void _tao_encode (
-        TAO_OutputCDR &
-        ACE_ENV_ARG_DECL
-      ) const;
-
-    virtual void _tao_decode (
-        TAO_InputCDR &
-        ACE_ENV_ARG_DECL
-      );
-
-    // TAO_IDL - Generated from
-    // 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
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NotAGroupObject;
-
-#endif /* end #if !defined */
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  // TAO_IDL - Generated from
-  // 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,
-        ObjectId
-      >
-    IDs_var;
-
-  typedef
-    TAO_Seq_Out_T<
-        IDs,
-        IDs_var,
-        ObjectId
-      >
-    IDs_out;
-
-  class TAO_PortableServer_Export IDs
-    : public
-        TAO_Unbounded_Sequence<
-            ObjectId
-          >
-  {
-  public:
-    IDs (void);
-    IDs (CORBA::ULong max);
-    IDs (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        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
-  // 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
   // be\be_visitor_constant/constant_ch.cpp:52
 
   const CORBA::PolicyType THREAD_POLICY_ID = 16U;
@@ -407,955 +199,7 @@ namespace PortableServer
   const CORBA::PolicyType REQUEST_PROCESSING_POLICY_ID = 22U;
 
   // TAO_IDL - Generated from
-  // 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
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadPolicyValue;
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
-
-#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;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#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;
-
-    // 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
-    // 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
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:208
-
-    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:
-    // Abstract or local interface only.
-    ThreadPolicy (void);
-
-    virtual ~ThreadPolicy (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ThreadPolicy (const ThreadPolicy &);
-
-    void operator= (const ThreadPolicy &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // 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
-  // be\be_visitor_enum/enum_ch.cpp:57
-
-  enum LifespanPolicyValue
-  {
-    TRANSIENT,
-    PERSISTENT
-  };
-
-  typedef LifespanPolicyValue &LifespanPolicyValue_out;
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_LifespanPolicyValue;
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
-
-#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;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#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;
-
-    // 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
-    // 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
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:208
-
-    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:
-    // Abstract or local interface only.
-    LifespanPolicy (void);
-
-    virtual ~LifespanPolicy (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    LifespanPolicy (const LifespanPolicy &);
-
-    void operator= (const LifespanPolicy &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_LifespanPolicy;
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_enum/enum_ch.cpp:57
-
-  enum IdUniquenessPolicyValue
-  {
-    UNIQUE_ID,
-    MULTIPLE_ID
-  };
-
-  typedef IdUniquenessPolicyValue &IdUniquenessPolicyValue_out;
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IdUniquenessPolicyValue;
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
-
-#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;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#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;
-
-    // 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
-    // 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
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:208
-
-    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:
-    // Abstract or local interface only.
-    IdUniquenessPolicy (void);
-
-    virtual ~IdUniquenessPolicy (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    IdUniquenessPolicy (const IdUniquenessPolicy &);
-
-    void operator= (const IdUniquenessPolicy &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IdUniquenessPolicy;
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_enum/enum_ch.cpp:57
-
-  enum IdAssignmentPolicyValue
-  {
-    USER_ID,
-    SYSTEM_ID
-  };
-
-  typedef IdAssignmentPolicyValue &IdAssignmentPolicyValue_out;
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IdAssignmentPolicyValue;
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
-
-#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;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#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;
-
-    // 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
-    // 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
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:208
-
-    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:
-    // Abstract or local interface only.
-    IdAssignmentPolicy (void);
-
-    virtual ~IdAssignmentPolicy (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    IdAssignmentPolicy (const IdAssignmentPolicy &);
-
-    void operator= (const IdAssignmentPolicy &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IdAssignmentPolicy;
-
-  // TAO_IDL - Generated from
-  // 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
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ImplicitActivationPolicyValue;
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
-
-#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;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#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;
-
-    // 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
-    // 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
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:208
-
-    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:
-    // Abstract or local interface only.
-    ImplicitActivationPolicy (void);
-
-    virtual ~ImplicitActivationPolicy (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ImplicitActivationPolicy (const ImplicitActivationPolicy &);
-
-    void operator= (const ImplicitActivationPolicy &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // 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
-  // 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
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServantRetentionPolicyValue;
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
-
-#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;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#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;
-
-    // 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
-    // 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
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:208
-
-    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:
-    // Abstract or local interface only.
-    ServantRetentionPolicy (void);
-
-    virtual ~ServantRetentionPolicy (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ServantRetentionPolicy (const ServantRetentionPolicy &);
-
-    void operator= (const ServantRetentionPolicy &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // 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
-  // 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
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestProcessingPolicyValue;
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
-
-#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;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#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;
-
-    // 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
-    // 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
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::CORBA::Policy_ptr copy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void destroy (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:208
-
-    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:
-    // Abstract or local interface only.
-    RequestProcessingPolicy (void);
-
-    virtual ~RequestProcessingPolicy (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    RequestProcessingPolicy (const RequestProcessingPolicy &);
-
-    void operator= (const RequestProcessingPolicy &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // 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
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_PORTABLESERVER_POAMANAGER__VAR_OUT_CH_)
 #define _PORTABLESERVER_POAMANAGER__VAR_OUT_CH_
@@ -1378,201 +222,7 @@ namespace PortableServer
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#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;
-
-    // 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
-    // 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);
-
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-
-      // TAO_IDL - Generated from
-      // 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
-
-    static ::CORBA::TypeCode_ptr _tc_AdapterInactive;
-
-#endif /* end #if !defined */
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_enum/enum_ch.cpp:57
-
-    enum State
-    {
-      HOLDING,
-      ACTIVE,
-      DISCARDING,
-      INACTIVE
-    };
-
-    typedef State &State_out;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-
-    static ::CORBA::TypeCode_ptr _tc_State;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void activate (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::POAManager::AdapterInactive
-      )) = 0;
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void hold_requests (
-        CORBA::Boolean wait_for_completion
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::POAManager::AdapterInactive
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void discard_requests (
-        CORBA::Boolean wait_for_completion
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::POAManager::AdapterInactive
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void deactivate (
-        CORBA::Boolean etherealize_objects,
-        CORBA::Boolean wait_for_completion
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::POAManager::AdapterInactive
-      )) = 0;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-    // TAO_IDL - Generated from
-    // 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
-    // be\be_visitor_interface/interface_ch.cpp:208
-
-    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:
-    // Abstract or local interface only.
-    POAManager (void);
-
-    virtual ~POAManager (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    POAManager (const POAManager &);
-
-    void operator= (const POAManager &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // 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
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__VAR_OUT_CH_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR__VAR_OUT_CH_
@@ -1595,87 +245,7 @@ namespace PortableServer
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#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;
-
-    // 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
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual CORBA::Boolean unknown_adapter (
-        PortableServer::POA_ptr parent,
-        const char * name
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:208
-
-    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:
-    // Abstract or local interface only.
-    AdapterActivator (void);
-
-    virtual ~AdapterActivator (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    AdapterActivator (const AdapterActivator &);
-
-    void operator= (const AdapterActivator &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_AdapterActivator;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_PORTABLESERVER_SERVANTMANAGER__VAR_OUT_CH_)
 #define _PORTABLESERVER_SERVANTMANAGER__VAR_OUT_CH_
@@ -1698,326 +268,29 @@ namespace PortableServer
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#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;
-
-    // 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
-    // be\be_visitor_interface/interface_ch.cpp:208
+  // be\be_interface.cpp:598
 
-    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:
-    // Abstract or local interface only.
-    ServantManager (void);
-
-    virtual ~ServantManager (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ServantManager (const ServantManager &);
-
-    void operator= (const ServantManager &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServantManager;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
-
-#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;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#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;
-
-    // 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
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::PortableServer::Servant incarnate (
-        const PortableServer::ObjectId & oid,
-        PortableServer::POA_ptr adapter
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::ForwardRequest
-      )) = 0;
-#else
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void etherealize (
-        const PortableServer::ObjectId & oid,
-        PortableServer::POA_ptr adapter,
-        PortableServer::Servant serv,
-        CORBA::Boolean cleanup_in_progress,
-        CORBA::Boolean remaining_activations
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:208
-
-    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:
-    // Abstract or local interface only.
-    ServantActivator (void);
-
-    virtual ~ServantActivator (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ServantActivator (const ServantActivator &);
-
-    void operator= (const ServantActivator &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServantActivator;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
-
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR__VAR_OUT_CH_)
-#define _PORTABLESERVER_SERVANTLOCATOR__VAR_OUT_CH_
+#if !defined (_PORTABLESERVER_POA__VAR_OUT_CH_)
+#define _PORTABLESERVER_POA__VAR_OUT_CH_
 
-  class ServantLocator;
-  typedef ServantLocator *ServantLocator_ptr;
+  class POA;
+  typedef POA *POA_ptr;
 
   typedef
     TAO_Objref_Var_T<
-        ServantLocator
+        POA
       >
-    ServantLocator_var;
+    POA_var;
 
   typedef
     TAO_Objref_Out_T<
-        ServantLocator
+        POA
       >
-    ServantLocator_out;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR_CH_)
-#define _PORTABLESERVER_SERVANTLOCATOR_CH_
-
-  class TAO_PortableServer_Export ServantLocator
-    : public virtual PortableServer::ServantManager
-  {
-  public:
-    typedef void *Cookie;
-
-    typedef ServantLocator_ptr _ptr_type;
-    typedef ServantLocator_var _var_type;
-
-    // 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
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::PortableServer::Servant preinvoke (
-        const PortableServer::ObjectId & oid,
-        PortableServer::POA_ptr adapter,
-        const char * operation,
-        PortableServer::ServantLocator::Cookie & the_cookie
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::ForwardRequest
-      )) = 0;
-#else
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void postinvoke (
-        const PortableServer::ObjectId & oid,
-        PortableServer::POA_ptr adapter,
-        const char * operation,
-        PortableServer::ServantLocator::Cookie the_cookie,
-        PortableServer::Servant the_servant
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:208
-
-    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:
-    // Abstract or local interface only.
-    ServantLocator (void);
-
-    virtual ~ServantLocator (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ServantLocator (const ServantLocator &);
-
-    void operator= (const ServantLocator &);
-  };
+    POA_out;
 
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // 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
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLESERVER_POA_CH_)
@@ -2038,12 +311,6 @@ namespace PortableServer
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
 
-    // Hand crafted.
-    virtual TAO_POA* _tao_poa_downcast (void)
-      {
-        return 0;
-      }
-
     static POA_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2051,7 +318,7 @@ namespace PortableServer
 
     static POA_ptr _nil (void)
     {
-      return (POA_ptr)0;
+      return static_cast<POA_ptr> (0);
     }
 
     static void _tao_any_destructor (void *);
@@ -2075,6 +342,8 @@ namespace PortableServer
       static void _tao_any_destructor (void *);
 
       static AdapterAlreadyExists *_downcast (CORBA::Exception *);
+      static const AdapterAlreadyExists *_downcast (CORBA::Exception const *);
+
       static CORBA::Exception *_alloc (void);
 
       virtual CORBA::Exception *_tao_duplicate (void) const;
@@ -2092,7 +361,7 @@ namespace PortableServer
         );
 
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:125
+      // be\be_visitor_exception/exception_ch.cpp:127
 
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
@@ -2123,6 +392,8 @@ namespace PortableServer
       static void _tao_any_destructor (void *);
 
       static AdapterNonExistent *_downcast (CORBA::Exception *);
+      static const AdapterNonExistent *_downcast (CORBA::Exception const *);
+
       static CORBA::Exception *_alloc (void);
 
       virtual CORBA::Exception *_tao_duplicate (void) const;
@@ -2140,7 +411,7 @@ namespace PortableServer
         );
 
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:125
+      // be\be_visitor_exception/exception_ch.cpp:127
 
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
@@ -2172,6 +443,8 @@ namespace PortableServer
       static void _tao_any_destructor (void *);
 
       static InvalidPolicy *_downcast (CORBA::Exception *);
+      static const InvalidPolicy *_downcast (CORBA::Exception const *);
+
       static CORBA::Exception *_alloc (void);
 
       virtual CORBA::Exception *_tao_duplicate (void) const;
@@ -2196,7 +469,7 @@ namespace PortableServer
         );
 
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:125
+      // be\be_visitor_exception/exception_ch.cpp:127
 
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
@@ -2208,11 +481,11 @@ namespace PortableServer
 
 #endif /* end #if !defined */
 
-#if (TAO_HAS_MINIMUM_POA == 0)
-
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 #if !defined (_PORTABLESERVER_POA_NOSERVANT_CH_)
 #define _PORTABLESERVER_POA_NOSERVANT_CH_
 
@@ -2229,6 +502,8 @@ namespace PortableServer
       static void _tao_any_destructor (void *);
 
       static NoServant *_downcast (CORBA::Exception *);
+      static const NoServant *_downcast (CORBA::Exception const *);
+
       static CORBA::Exception *_alloc (void);
 
       virtual CORBA::Exception *_tao_duplicate (void) const;
@@ -2246,7 +521,7 @@ namespace PortableServer
         );
 
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:125
+      // be\be_visitor_exception/exception_ch.cpp:127
 
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
@@ -2258,7 +533,7 @@ namespace PortableServer
 
 #endif /* end #if !defined */
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
@@ -2279,6 +554,8 @@ namespace PortableServer
       static void _tao_any_destructor (void *);
 
       static ObjectAlreadyActive *_downcast (CORBA::Exception *);
+      static const ObjectAlreadyActive *_downcast (CORBA::Exception const *);
+
       static CORBA::Exception *_alloc (void);
 
       virtual CORBA::Exception *_tao_duplicate (void) const;
@@ -2296,7 +573,7 @@ namespace PortableServer
         );
 
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:125
+      // be\be_visitor_exception/exception_ch.cpp:127
 
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
@@ -2327,6 +604,8 @@ namespace PortableServer
       static void _tao_any_destructor (void *);
 
       static ObjectNotActive *_downcast (CORBA::Exception *);
+      static const ObjectNotActive *_downcast (CORBA::Exception const *);
+
       static CORBA::Exception *_alloc (void);
 
       virtual CORBA::Exception *_tao_duplicate (void) const;
@@ -2344,7 +623,7 @@ namespace PortableServer
         );
 
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:125
+      // be\be_visitor_exception/exception_ch.cpp:127
 
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
@@ -2375,6 +654,8 @@ namespace PortableServer
       static void _tao_any_destructor (void *);
 
       static ServantAlreadyActive *_downcast (CORBA::Exception *);
+      static const ServantAlreadyActive *_downcast (CORBA::Exception const *);
+
       static CORBA::Exception *_alloc (void);
 
       virtual CORBA::Exception *_tao_duplicate (void) const;
@@ -2392,7 +673,7 @@ namespace PortableServer
         );
 
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:125
+      // be\be_visitor_exception/exception_ch.cpp:127
 
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
@@ -2423,6 +704,8 @@ namespace PortableServer
       static void _tao_any_destructor (void *);
 
       static ServantNotActive *_downcast (CORBA::Exception *);
+      static const ServantNotActive *_downcast (CORBA::Exception const *);
+
       static CORBA::Exception *_alloc (void);
 
       virtual CORBA::Exception *_tao_duplicate (void) const;
@@ -2440,7 +723,7 @@ namespace PortableServer
         );
 
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:125
+      // be\be_visitor_exception/exception_ch.cpp:127
 
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
@@ -2471,6 +754,8 @@ namespace PortableServer
       static void _tao_any_destructor (void *);
 
       static WrongAdapter *_downcast (CORBA::Exception *);
+      static const WrongAdapter *_downcast (CORBA::Exception const *);
+
       static CORBA::Exception *_alloc (void);
 
       virtual CORBA::Exception *_tao_duplicate (void) const;
@@ -2488,7 +773,7 @@ namespace PortableServer
         );
 
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:125
+      // be\be_visitor_exception/exception_ch.cpp:127
 
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
@@ -2519,6 +804,8 @@ namespace PortableServer
       static void _tao_any_destructor (void *);
 
       static WrongPolicy *_downcast (CORBA::Exception *);
+      static const WrongPolicy *_downcast (CORBA::Exception const *);
+
       static CORBA::Exception *_alloc (void);
 
       virtual CORBA::Exception *_tao_duplicate (void) const;
@@ -2536,7 +823,7 @@ namespace PortableServer
         );
 
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:125
+      // be\be_visitor_exception/exception_ch.cpp:127
 
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
@@ -2553,14 +840,14 @@ namespace PortableServer
 
     virtual ::PortableServer::POA_ptr create_POA (
         const char * adapter_name,
-        PortableServer::POAManager_ptr a_POAManager,
-        const CORBA::PolicyList & policies
+        ::PortableServer::POAManager_ptr a_POAManager,
+        const ::CORBA::PolicyList & policies
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::POA::AdapterAlreadyExists
-        , PortableServer::POA::InvalidPolicy
+        CORBA::SystemException,
+        ::PortableServer::POA::AdapterAlreadyExists,
+        ::PortableServer::POA::InvalidPolicy
       )) = 0;
 
     // TAO_IDL - Generated from
@@ -2568,46 +855,44 @@ namespace PortableServer
 
     virtual ::PortableServer::POA_ptr find_POA (
         const char * adapter_name,
-        CORBA::Boolean activate_it
+        ::CORBA::Boolean activate_it
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::POA::AdapterNonExistent
+        CORBA::SystemException,
+        ::PortableServer::POA::AdapterNonExistent
       )) = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void destroy (
-        CORBA::Boolean etherealize_objects,
-        CORBA::Boolean wait_for_completion
+        ::CORBA::Boolean etherealize_objects,
+        ::CORBA::Boolean wait_for_completion
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
-#if (TAO_HAS_MINIMUM_POA == 0)
-
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
+#if (TAO_HAS_MINIMUM_POA == 0)
     virtual ::PortableServer::ThreadPolicy_ptr create_thread_policy (
-        PortableServer::ThreadPolicyValue value
+        ::PortableServer::ThreadPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::PortableServer::LifespanPolicy_ptr create_lifespan_policy (
-        PortableServer::LifespanPolicyValue value
+        ::PortableServer::LifespanPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2618,7 +903,7 @@ namespace PortableServer
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (
-        PortableServer::IdUniquenessPolicyValue value
+        ::PortableServer::IdUniquenessPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -2629,48 +914,50 @@ namespace PortableServer
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (
-        PortableServer::IdAssignmentPolicyValue value
+        ::PortableServer::IdAssignmentPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
-#if (TAO_HAS_MINIMUM_POA == 0)
-
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
+#if (TAO_HAS_MINIMUM_POA == 0)
     virtual ::PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (
-        PortableServer::ImplicitActivationPolicyValue value
+        ::PortableServer::ImplicitActivationPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
+#if (TAO_HAS_MINIMUM_POA == 0)
     virtual ::PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (
-        PortableServer::ServantRetentionPolicyValue value
+        ::PortableServer::ServantRetentionPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
+#if (TAO_HAS_MINIMUM_POA == 0)
     virtual ::PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (
-        PortableServer::RequestProcessingPolicyValue value
+        ::PortableServer::RequestProcessingPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
     // TAO_IDL - Generated from
@@ -2713,11 +1000,11 @@ namespace PortableServer
         CORBA::SystemException
       )) = 0;
 
-#if (TAO_HAS_MINIMUM_POA == 0)
-
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
     virtual ::PortableServer::AdapterActivator_ptr the_activator (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -2729,101 +1016,106 @@ namespace PortableServer
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void the_activator (
-        PortableServer::AdapterActivator_ptr the_activator
+        ::PortableServer::AdapterActivator_ptr the_activator
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
+#if (TAO_HAS_MINIMUM_POA == 0)
     virtual ::PortableServer::ServantManager_ptr get_servant_manager (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::POA::WrongPolicy
+        CORBA::SystemException,
+        ::PortableServer::POA::WrongPolicy
       )) = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void set_servant_manager (
-        PortableServer::ServantManager_ptr imgr
+        ::PortableServer::ServantManager_ptr imgr
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::POA::WrongPolicy
+        CORBA::SystemException,
+        ::PortableServer::POA::WrongPolicy
       )) = 0;
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
     virtual ::PortableServer::Servant get_servant (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::POA::NoServant
-        , PortableServer::POA::WrongPolicy
+        CORBA::SystemException,
+        ::PortableServer::POA::NoServant,
+        ::PortableServer::POA::WrongPolicy
       )) = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void set_servant (
-        PortableServer::Servant p_servant
+        ::PortableServer::Servant p_servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::POA::WrongPolicy
+        CORBA::SystemException,
+        ::PortableServer::POA::WrongPolicy
       )) = 0;
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::PortableServer::ObjectId * activate_object (
-        PortableServer::Servant p_servant
+        ::PortableServer::Servant p_servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::POA::ServantAlreadyActive
-        , PortableServer::POA::WrongPolicy
+        CORBA::SystemException,
+        ::PortableServer::POA::ServantAlreadyActive,
+        ::PortableServer::POA::WrongPolicy
       )) = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void activate_object_with_id (
-        const PortableServer::ObjectId & id,
-        PortableServer::Servant p_servant
+        const ::PortableServer::ObjectId & id,
+        ::PortableServer::Servant p_servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::POA::ServantAlreadyActive
-        , PortableServer::POA::ObjectAlreadyActive
-        , PortableServer::POA::WrongPolicy
+        CORBA::SystemException,
+        ::PortableServer::POA::ServantAlreadyActive,
+        ::PortableServer::POA::ObjectAlreadyActive,
+        ::PortableServer::POA::WrongPolicy
       )) = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual void deactivate_object (
-        const PortableServer::ObjectId & oid
+        const ::PortableServer::ObjectId & oid
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::POA::ObjectNotActive
-        , PortableServer::POA::WrongPolicy
+        CORBA::SystemException,
+        ::PortableServer::POA::ObjectNotActive,
+        ::PortableServer::POA::WrongPolicy
       )) = 0;
 
     // TAO_IDL - Generated from
@@ -2834,100 +1126,99 @@ namespace PortableServer
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::POA::WrongPolicy
+        CORBA::SystemException,
+        ::PortableServer::POA::WrongPolicy
       )) = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Object_ptr create_reference_with_id (
-        const PortableServer::ObjectId & oid,
+        const ::PortableServer::ObjectId & oid,
         const char * intf
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
-        , PortableServer::POA::WrongPolicy
       )) = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::PortableServer::ObjectId * servant_to_id (
-        PortableServer::Servant p_servant
+        ::PortableServer::Servant p_servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::POA::ServantNotActive
-        , PortableServer::POA::WrongPolicy
+        CORBA::SystemException,
+        ::PortableServer::POA::ServantNotActive,
+        ::PortableServer::POA::WrongPolicy
       )) = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Object_ptr servant_to_reference (
-        PortableServer::Servant p_servant
+        ::PortableServer::Servant p_servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::POA::ServantNotActive
-        , PortableServer::POA::WrongPolicy
+        CORBA::SystemException,
+        ::PortableServer::POA::ServantNotActive,
+        ::PortableServer::POA::WrongPolicy
       )) = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::PortableServer::Servant reference_to_servant (
-        CORBA::Object_ptr reference
+        ::CORBA::Object_ptr reference
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::POA::ObjectNotActive
-        , PortableServer::POA::WrongAdapter
-        , PortableServer::POA::WrongPolicy
+        CORBA::SystemException,
+        ::PortableServer::POA::ObjectNotActive,
+        ::PortableServer::POA::WrongAdapter,
+        ::PortableServer::POA::WrongPolicy
       )) = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::PortableServer::ObjectId * reference_to_id (
-        CORBA::Object_ptr reference
+        ::CORBA::Object_ptr reference
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::POA::WrongAdapter
-        , PortableServer::POA::WrongPolicy
+        CORBA::SystemException,
+        ::PortableServer::POA::WrongAdapter,
+        ::PortableServer::POA::WrongPolicy
       )) = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::PortableServer::Servant id_to_servant (
-        const PortableServer::ObjectId & oid
+        const ::PortableServer::ObjectId & oid
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::POA::ObjectNotActive
-        , PortableServer::POA::WrongPolicy
+        CORBA::SystemException,
+        ::PortableServer::POA::ObjectNotActive,
+        ::PortableServer::POA::WrongPolicy
       )) = 0;
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
 
     virtual CORBA::Object_ptr id_to_reference (
-        const PortableServer::ObjectId & oid
+        const ::PortableServer::ObjectId & oid
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::POA::ObjectNotActive
-        , PortableServer::POA::WrongPolicy
+        CORBA::SystemException,
+        ::PortableServer::POA::ObjectNotActive,
+        ::PortableServer::POA::WrongPolicy
       )) = 0;
 
     // TAO_IDL - Generated from
@@ -2940,60 +1231,6 @@ namespace PortableServer
         CORBA::SystemException
       )) = 0;
 
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-    // TAO_IDL - Generated from
-    // 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
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::NotAGroupObject
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // 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
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::NotAGroupObject
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void associate_reference_with_id (
-        CORBA::Object_ptr ref,
-        const PortableServer::ObjectId & oid
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::NotAGroupObject
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual void disassociate_reference_with_id (
-        CORBA::Object_ptr ref,
-        const PortableServer::ObjectId & oid
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::NotAGroupObject
-      )) = 0;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
 
@@ -3025,169 +1262,6 @@ namespace PortableServer
 
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_POA;
 
-  // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
-
-#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;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
-
-#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;
-
-    // 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
-    // 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);
-
-      virtual CORBA::Exception *_tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (
-          TAO_OutputCDR &
-          ACE_ENV_ARG_DECL
-        ) const;
-
-      virtual void _tao_decode (
-          TAO_InputCDR &
-          ACE_ENV_ARG_DECL
-        );
-
-      // TAO_IDL - Generated from
-      // 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
-
-    static ::CORBA::TypeCode_ptr _tc_NoContext;
-
-#endif /* end #if !defined */
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::PortableServer::POA_ptr get_POA (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::Current::NoContext
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::PortableServer::ObjectId * get_object_id (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableServer::Current::NoContext
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:208
-
-    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:
-    // Abstract or local interface only.
-    Current (void);
-
-    virtual ~Current (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    Current (const Current &);
-
-    void operator= (const Current &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // 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
 // be\be_visitor_module/module_ch.cpp:66
 
@@ -3204,302 +1278,17 @@ namespace TAO
 #define _PORTABLESERVER_POA__TRAITS_CH_
 
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_PortableServer_Export Objref_Traits<PortableServer::POA>
+  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::POA>
   {
-    static PortableServer::POA_ptr duplicate (
-        PortableServer::POA_ptr
+    static ::PortableServer::POA_ptr duplicate (
+        ::PortableServer::POA_ptr
       );
     static void release (
-        PortableServer::POA_ptr
+        ::PortableServer::POA_ptr
       );
-    static PortableServer::POA_ptr nil (void);
+    static ::PortableServer::POA_ptr nil (void);
     static CORBA::Boolean marshal (
-        PortableServer::POA_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-#if !defined (_PORTABLESERVER_THREADPOLICY__TRAITS_CH_)
-#define _PORTABLESERVER_THREADPOLICY__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_PortableServer_Export Objref_Traits<PortableServer::ThreadPolicy>
-  {
-    static PortableServer::ThreadPolicy_ptr duplicate (
-        PortableServer::ThreadPolicy_ptr
-      );
-    static void release (
-        PortableServer::ThreadPolicy_ptr
-      );
-    static PortableServer::ThreadPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        PortableServer::ThreadPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if !defined (_PORTABLESERVER_LIFESPANPOLICY__TRAITS_CH_)
-#define _PORTABLESERVER_LIFESPANPOLICY__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_PortableServer_Export Objref_Traits<PortableServer::LifespanPolicy>
-  {
-    static PortableServer::LifespanPolicy_ptr duplicate (
-        PortableServer::LifespanPolicy_ptr
-      );
-    static void release (
-        PortableServer::LifespanPolicy_ptr
-      );
-    static PortableServer::LifespanPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        PortableServer::LifespanPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY__TRAITS_CH_)
-#define _PORTABLESERVER_IDUNIQUENESSPOLICY__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_PortableServer_Export Objref_Traits<PortableServer::IdUniquenessPolicy>
-  {
-    static PortableServer::IdUniquenessPolicy_ptr duplicate (
-        PortableServer::IdUniquenessPolicy_ptr
-      );
-    static void release (
-        PortableServer::IdUniquenessPolicy_ptr
-      );
-    static PortableServer::IdUniquenessPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        PortableServer::IdUniquenessPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY__TRAITS_CH_)
-#define _PORTABLESERVER_IDASSIGNMENTPOLICY__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_PortableServer_Export Objref_Traits<PortableServer::IdAssignmentPolicy>
-  {
-    static PortableServer::IdAssignmentPolicy_ptr duplicate (
-        PortableServer::IdAssignmentPolicy_ptr
-      );
-    static void release (
-        PortableServer::IdAssignmentPolicy_ptr
-      );
-    static PortableServer::IdAssignmentPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        PortableServer::IdAssignmentPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY__TRAITS_CH_)
-#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_PortableServer_Export Objref_Traits<PortableServer::ImplicitActivationPolicy>
-  {
-    static PortableServer::ImplicitActivationPolicy_ptr duplicate (
-        PortableServer::ImplicitActivationPolicy_ptr
-      );
-    static void release (
-        PortableServer::ImplicitActivationPolicy_ptr
-      );
-    static PortableServer::ImplicitActivationPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        PortableServer::ImplicitActivationPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY__TRAITS_CH_)
-#define _PORTABLESERVER_SERVANTRETENTIONPOLICY__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_PortableServer_Export Objref_Traits<PortableServer::ServantRetentionPolicy>
-  {
-    static PortableServer::ServantRetentionPolicy_ptr duplicate (
-        PortableServer::ServantRetentionPolicy_ptr
-      );
-    static void release (
-        PortableServer::ServantRetentionPolicy_ptr
-      );
-    static PortableServer::ServantRetentionPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        PortableServer::ServantRetentionPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY__TRAITS_CH_)
-#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_PortableServer_Export Objref_Traits<PortableServer::RequestProcessingPolicy>
-  {
-    static PortableServer::RequestProcessingPolicy_ptr duplicate (
-        PortableServer::RequestProcessingPolicy_ptr
-      );
-    static void release (
-        PortableServer::RequestProcessingPolicy_ptr
-      );
-    static PortableServer::RequestProcessingPolicy_ptr nil (void);
-    static CORBA::Boolean marshal (
-        PortableServer::RequestProcessingPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if !defined (_PORTABLESERVER_POAMANAGER__TRAITS_CH_)
-#define _PORTABLESERVER_POAMANAGER__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_PortableServer_Export Objref_Traits<PortableServer::POAManager>
-  {
-    static PortableServer::POAManager_ptr duplicate (
-        PortableServer::POAManager_ptr
-      );
-    static void release (
-        PortableServer::POAManager_ptr
-      );
-    static PortableServer::POAManager_ptr nil (void);
-    static CORBA::Boolean marshal (
-        PortableServer::POAManager_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_CH_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_PortableServer_Export Objref_Traits<PortableServer::AdapterActivator>
-  {
-    static PortableServer::AdapterActivator_ptr duplicate (
-        PortableServer::AdapterActivator_ptr
-      );
-    static void release (
-        PortableServer::AdapterActivator_ptr
-      );
-    static PortableServer::AdapterActivator_ptr nil (void);
-    static CORBA::Boolean marshal (
-        PortableServer::AdapterActivator_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_SERVANTMANAGER__TRAITS_CH_)
-#define _PORTABLESERVER_SERVANTMANAGER__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_PortableServer_Export Objref_Traits<PortableServer::ServantManager>
-  {
-    static PortableServer::ServantManager_ptr duplicate (
-        PortableServer::ServantManager_ptr
-      );
-    static void release (
-        PortableServer::ServantManager_ptr
-      );
-    static PortableServer::ServantManager_ptr nil (void);
-    static CORBA::Boolean marshal (
-        PortableServer::ServantManager_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_SERVANTACTIVATOR__TRAITS_CH_)
-#define _PORTABLESERVER_SERVANTACTIVATOR__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_PortableServer_Export Objref_Traits<PortableServer::ServantActivator>
-  {
-    static PortableServer::ServantActivator_ptr duplicate (
-        PortableServer::ServantActivator_ptr
-      );
-    static void release (
-        PortableServer::ServantActivator_ptr
-      );
-    static PortableServer::ServantActivator_ptr nil (void);
-    static CORBA::Boolean marshal (
-        PortableServer::ServantActivator_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR__TRAITS_CH_)
-#define _PORTABLESERVER_SERVANTLOCATOR__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_PortableServer_Export Objref_Traits<PortableServer::ServantLocator>
-  {
-    static PortableServer::ServantLocator_ptr duplicate (
-        PortableServer::ServantLocator_ptr
-      );
-    static void release (
-        PortableServer::ServantLocator_ptr
-      );
-    static PortableServer::ServantLocator_ptr nil (void);
-    static CORBA::Boolean marshal (
-        PortableServer::ServantLocator_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if !defined (_PORTABLESERVER_CURRENT__TRAITS_CH_)
-#define _PORTABLESERVER_CURRENT__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_PortableServer_Export Objref_Traits<PortableServer::Current>
-  {
-    static PortableServer::Current_ptr duplicate (
-        PortableServer::Current_ptr
-      );
-    static void release (
-        PortableServer::Current_ptr
-      );
-    static PortableServer::Current_ptr nil (void);
-    static CORBA::Boolean marshal (
-        PortableServer::Current_ptr p,
+        ::PortableServer::POA_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -3515,186 +1304,6 @@ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POALis
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POAList *&); // deprecated
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POAList *&);
 
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::ForwardRequest &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ForwardRequest*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ForwardRequest *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ForwardRequest *&);
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::NotAGroupObject &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::NotAGroupObject*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::NotAGroupObject *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::NotAGroupObject *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::IDs &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IDs*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IDs *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::IDs *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicy_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicy_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicy_ptr &);
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::LifespanPolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicy_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicy_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::LifespanPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdUniquenessPolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicy_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicy_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdUniquenessPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdAssignmentPolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicy_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicy_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdAssignmentPolicy_ptr &);
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicy_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicy_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantRetentionPolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicy_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicy_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantRetentionPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicy_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicy_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicy_ptr &);
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAManager_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAManager_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POAManager_ptr &);
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POAManager::AdapterInactive &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAManager::AdapterInactive*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POAManager::AdapterInactive *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POAManager::AdapterInactive *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAManager::State);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POAManager::State &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::AdapterActivator_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::AdapterActivator_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::AdapterActivator_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantManager_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantManager_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantManager_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantActivator_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantActivator_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantActivator_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantLocator_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantLocator_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantLocator_ptr &);
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
 // TAO_IDL - Generated from
 // be\be_visitor_interface/any_op_ch.cpp:52
 
@@ -3726,16 +1335,18 @@ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::I
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::InvalidPolicy *&); // deprecated
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::InvalidPolicy *&);
 
-#if (TAO_HAS_MINIMUM_POA == 0)
-
 // TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_ch.cpp:52
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::NoServant &); // copying version
 TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::NoServant*); // noncopying version
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::NoServant *&); // deprecated
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::NoServant *&);
 
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+
 // TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_ch.cpp:52
 
@@ -3784,118 +1395,14 @@ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::W
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::WrongPolicy *&); // deprecated
 TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::WrongPolicy *&);
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Current_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Current_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::Current_ptr &);
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::Current::NoContext &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::Current::NoContext*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::Current::NoContext *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::Current::NoContext *&);
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_ch.cpp:52
-
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ForwardRequest &);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ForwardRequest &);
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_ch.cpp:52
-
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::NotAGroupObject &);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::NotAGroupObject &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_PortableServer_IDs_H_
-#define _TAO_CDR_OP_PortableServer_IDs_H_
-
-TAO_PortableServer_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const PortableServer::IDs &
-  );
-TAO_PortableServer_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    PortableServer::IDs &
-  );
-
-#endif /* _TAO_CDR_OP_PortableServer_IDs_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_ch.cpp:50
-
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &);
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_ch.cpp:50
-
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::LifespanPolicyValue &);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::LifespanPolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_ch.cpp:50
-
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdUniquenessPolicyValue &);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdUniquenessPolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_ch.cpp:50
-
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdAssignmentPolicyValue &);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdAssignmentPolicyValue &);
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_ch.cpp:50
-
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_ch.cpp:50
-
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicyValue &);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/cdr_op_ch.cpp:50
-
-TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicyValue &);
-TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicyValue &);
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "PortableServerC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -3906,3 +1413,4 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
diff --git a/TAO/tao/PortableServer/PortableServerC.inl b/TAO/tao/PortableServer/PortableServerC.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/tao/PortableServer/PortableServerC.inl
+++ b/TAO/tao/PortableServer/PortableServerC.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/tao/PortableServer/PortableServer_Functions.cpp b/TAO/tao/PortableServer/PortableServer_Functions.cpp
new file mode 100644
index 00000000000..23fb82cb0fd
--- /dev/null
+++ b/TAO/tao/PortableServer/PortableServer_Functions.cpp
@@ -0,0 +1,56 @@
+#include "PortableServer_Functions.h"
+
+ACE_RCSID (PortableServer,
+           PortableServer_Functions,
+           "$Id$")
+
+#include "ace/OS_NS_string.h"
+
+namespace PortableServer
+{
+  PortableServer::ObjectId *
+  string_to_ObjectId (const char *string)
+  {
+    // Size of string
+    //
+    // We DO NOT include the zero terminator, as this is simply an
+    // artifact of the way strings are stored in C.
+    //
+    CORBA::ULong buffer_size = static_cast <CORBA::ULong>
+                                           (ACE_OS::strlen (string));
+
+    // Create the buffer for the Id
+    CORBA::Octet *buffer = PortableServer::ObjectId::allocbuf (buffer_size);
+
+    // Copy the contents
+    ACE_OS::memcpy (buffer, string, buffer_size);
+
+    // Create and return a new ID
+    PortableServer::ObjectId *id = 0;
+    ACE_NEW_RETURN (id,
+                    PortableServer::ObjectId (buffer_size,
+                                              buffer_size,
+                                              buffer,
+                                              1),
+                    0);
+
+    return id;
+  }
+
+  char *
+  ObjectId_to_string (const PortableServer::ObjectId &id)
+  {
+    // Create space
+    char * string = CORBA::string_alloc (id.length ());
+
+    // Copy the data
+    ACE_OS::memcpy (string, id.get_buffer (), id.length ());
+
+    // Null terminate the string
+    string[id.length ()] = '\0';
+
+    // Return string
+    return string;
+  }
+}
+
diff --git a/TAO/tao/PortableServer/PortableServer_Functions.h b/TAO/tao/PortableServer/PortableServer_Functions.h
new file mode 100644
index 00000000000..e5de24e99f7
--- /dev/null
+++ b/TAO/tao/PortableServer/PortableServer_Functions.h
@@ -0,0 +1,55 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    PortableServer_Functions.h
+ *
+ *  $Id$
+ *
+ *  PortableServer helper functions
+ *
+ *  @author  Irfan Pyarali <irfan@cs.wustl.edu>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_FUNCTIONS_H
+#define TAO_PORTABLESERVER_FUNCTIONS_H
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/orbconf.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_PortableServer_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#include "tao/PortableServer/PS_ForwardC.h"
+#include "ace/OS_NS_wchar.h"
+
+namespace PortableServer
+{
+  /// Utility functions for the other
+  TAO_NAMESPACE_STORAGE_CLASS char* ObjectId_to_string (
+    const PortableServer::ObjectId &id);
+
+  TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *string_to_ObjectId (
+    const char *id);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_PORTABLESERVER_FUNCTIONS_H */
diff --git a/TAO/tao/PortableServer/PortableServer_ORBInitializer.cpp b/TAO/tao/PortableServer/PortableServer_ORBInitializer.cpp
index 1265dd4d0b6..d116a64af7a 100644
--- a/TAO/tao/PortableServer/PortableServer_ORBInitializer.cpp
+++ b/TAO/tao/PortableServer/PortableServer_ORBInitializer.cpp
@@ -2,8 +2,8 @@
 
 #include "PortableServer_ORBInitializer.h"
 #include "PortableServer_PolicyFactory.h"
-#include "PortableServerC.h"
-#include "Object_Adapter.h"
+#include "PortableServer.h"
+#include "POA_Current.h"
 #include "tao/ORBInitInfo.h"
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
@@ -57,7 +57,7 @@ TAO_PortableServer_ORBInitializer::register_poa_current (PortableInterceptor::OR
 
   // Create Current.
   CORBA::Object_var current =
-    new TAO_POA_Current;
+    new TAO::Portable_Server::POA_Current;
 
   // Setup the POA_Current object in the ORB Core.
   tao_info->orb_core ()->poa_current (current.in ());
@@ -73,7 +73,7 @@ TAO_PortableServer_ORBInitializer::register_policy_factories (PortableIntercepto
                     TAO_PortableServer_PolicyFactory,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/tao/PortableServer/PortableServer_PolicyFactory.cpp b/TAO/tao/PortableServer/PortableServer_PolicyFactory.cpp
index 97d70992797..b57602fbc30 100644
--- a/TAO/tao/PortableServer/PortableServer_PolicyFactory.cpp
+++ b/TAO/tao/PortableServer/PortableServer_PolicyFactory.cpp
@@ -1,5 +1,16 @@
+
 #include "PortableServer_PolicyFactory.h"
-#include "POA_Policies.h"
+
+#include "ThreadPolicy.h"
+#include "LifespanPolicy.h"
+#include "IdAssignmentPolicy.h"
+#include "IdUniquenessPolicy.h"
+#include "ImplicitActivationPolicy.h"
+#include "RequestProcessingPolicy.h"
+#include "ServantRetentionPolicy.h"
+#include "PortableServer.h"
+
+#include "Policy_Creator_T.h"
 
 ACE_RCSID (PortableServer,
            PortableServer_PolicyFactory,
@@ -15,37 +26,86 @@ TAO_PortableServer_PolicyFactory::create_policy (
 {
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-  if (type == PortableServer::THREAD_POLICY_ID)
-    return TAO_Thread_Policy::create (value
-                                      ACE_ENV_ARG_PARAMETER);
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
+  if (type == ::PortableServer::THREAD_POLICY_ID)
+    {
+      TAO::Portable_Server::ThreadPolicy *thread_policy = 0;
+      PortableServer::ThreadPolicyValue thr_value;
+
+      TAO::Portable_Server::create_policy (thread_policy, thr_value, value ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
+      return thread_policy;
+    }
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
   if (type == PortableServer::LIFESPAN_POLICY_ID)
-    return TAO_Lifespan_Policy::create (value
-                                        ACE_ENV_ARG_PARAMETER);
+    {
+      TAO::Portable_Server::LifespanPolicy *lifespan_policy = 0;
+      PortableServer::LifespanPolicyValue lifespan_value;
+
+      TAO::Portable_Server::create_policy (lifespan_policy, lifespan_value, value ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+
+      return lifespan_policy;
+    }
 
   if (type == PortableServer::ID_UNIQUENESS_POLICY_ID)
-    return TAO_Id_Uniqueness_Policy::create (value
-                                             ACE_ENV_ARG_PARAMETER);
+    {
+      TAO::Portable_Server::IdUniquenessPolicy *id_uniqueness_policy = 0;
+      PortableServer::IdUniquenessPolicyValue id_uniqueness_value;
+
+      TAO::Portable_Server::create_policy (id_uniqueness_policy, id_uniqueness_value, value ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+
+      return id_uniqueness_policy;
+    }
 
   if (type == PortableServer::ID_ASSIGNMENT_POLICY_ID)
-    return TAO_Id_Assignment_Policy::create (value
-                                             ACE_ENV_ARG_PARAMETER);
+    {
+      TAO::Portable_Server::IdAssignmentPolicy *id_assignment_policy = 0;
+      PortableServer::IdAssignmentPolicyValue id_assignment_value;
+
+      TAO::Portable_Server::create_policy (id_assignment_policy, id_assignment_value, value ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+
+      return id_assignment_policy;
+    }
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
   if (type == PortableServer::IMPLICIT_ACTIVATION_POLICY_ID)
-    return TAO_Implicit_Activation_Policy::create (value
-                                                   ACE_ENV_ARG_PARAMETER);
+    {
+      TAO::Portable_Server::ImplicitActivationPolicy *implicit_activatation_policy = 0;
+      PortableServer::ImplicitActivationPolicyValue implicit_activation_value;
+
+      TAO::Portable_Server::create_policy (implicit_activatation_policy, implicit_activation_value, value ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+
+      return implicit_activatation_policy;
+    }
 
   if (type == PortableServer::SERVANT_RETENTION_POLICY_ID)
-    return TAO_Servant_Retention_Policy::create (value
-                                                 ACE_ENV_ARG_PARAMETER);
+    {
+      TAO::Portable_Server::ServantRetentionPolicy *servant_retention_policy = 0;
+      PortableServer::ServantRetentionPolicyValue servant_retention_value;
+
+      TAO::Portable_Server::create_policy (servant_retention_policy, servant_retention_value, value ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+
+      return servant_retention_policy;
+    }
 
   if (type == PortableServer::REQUEST_PROCESSING_POLICY_ID)
-      return TAO_Request_Processing_Policy::create (value
-                                                    ACE_ENV_ARG_PARAMETER);
+    {
+      TAO::Portable_Server::RequestProcessingPolicy *request_processing_policy = 0;
+      PortableServer::RequestProcessingPolicyValue request_processing_value;
+
+      TAO::Portable_Server::create_policy (request_processing_policy, request_processing_value, value ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+
+      return request_processing_policy;
+    }
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
diff --git a/TAO/tao/PortableServer/PortableServer_PolicyFactory.h b/TAO/tao/PortableServer/PortableServer_PolicyFactory.h
index d0e3f9f4a1e..039a2ce76df 100644
--- a/TAO/tao/PortableServer/PortableServer_PolicyFactory.h
+++ b/TAO/tao/PortableServer/PortableServer_PolicyFactory.h
@@ -30,7 +30,6 @@ class TAO_PortableServer_Export TAO_PortableServer_PolicyFactory
     public virtual TAO_Local_RefCounted_Object
 {
 public:
-
   CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
                                    const CORBA::Any & value
                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
diff --git a/TAO/tao/PortableServer/PortableServer_WFunctions.cpp b/TAO/tao/PortableServer/PortableServer_WFunctions.cpp
new file mode 100644
index 00000000000..d37374d5062
--- /dev/null
+++ b/TAO/tao/PortableServer/PortableServer_WFunctions.cpp
@@ -0,0 +1,68 @@
+#include "PortableServer_WFunctions.h"
+
+ACE_RCSID (PortableServer,
+           PortableServer_WFunctions,
+           "$Id$")
+
+#include "ace/OS_NS_string.h"
+
+namespace PortableServer
+{
+  PortableServer::ObjectId *
+  wstring_to_ObjectId (const CORBA::WChar *string)
+  {
+    // Size of Id
+    //
+    // We DO NOT include the zero terminator, as this is simply an
+    // artifact of the way strings are stored in C.
+    //
+    CORBA::ULong string_length = ACE_OS::wslen (string);
+
+    CORBA::ULong buffer_size = string_length * sizeof (CORBA::WChar);
+
+    // Create the buffer for the Id
+    CORBA::Octet *buffer = PortableServer::ObjectId::allocbuf (buffer_size);
+
+    // Copy contents
+    ACE_OS::memcpy (buffer, string, buffer_size);
+
+    // Create a new ID
+    PortableServer::ObjectId *id = 0;
+    ACE_NEW_RETURN (id,
+                    PortableServer::ObjectId (buffer_size,
+                                              buffer_size,
+                                              buffer,
+                                              1),
+                    0);
+
+    return id;
+  }
+
+  CORBA::WChar *
+  ObjectId_to_wstring (const PortableServer::ObjectId &id)
+  {
+    // Compute resulting wide string's length.
+    CORBA::ULong string_length =
+      id.length () / sizeof (CORBA::WChar) + 1;
+
+    // Allocate an extra slot if the id's length is not "aligned" on a
+    // CORBA::WChar.
+    if (id.length () % sizeof (CORBA::WChar))
+      string_length++;
+
+    // Create space.
+    CORBA::WChar* string = CORBA::wstring_alloc (string_length);
+
+    // Copy the data
+    ACE_OS::memcpy (string,
+                    id.get_buffer (),
+                    id.length ());
+
+    // Null terminate the string
+    string[string_length] = '\0';
+
+    // Return string.
+    return string;
+  }
+}
+
diff --git a/TAO/tao/PortableServer/PortableServer_WFunctions.h b/TAO/tao/PortableServer/PortableServer_WFunctions.h
new file mode 100644
index 00000000000..b020106a939
--- /dev/null
+++ b/TAO/tao/PortableServer/PortableServer_WFunctions.h
@@ -0,0 +1,54 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    PortableServer_WFunctions.h
+ *
+ *  $Id$
+ *
+ *  PortableServer helper functions
+ *
+ *  @author  Irfan Pyarali <irfan@cs.wustl.edu>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_WFUNCTIONS_H
+#define TAO_PORTABLESERVER_WFUNCTIONS_H
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/orbconf.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_PortableServer_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#include "tao/PortableServer/PS_ForwardC.h"
+#include "ace/OS_NS_wchar.h"
+
+namespace PortableServer
+{
+  TAO_NAMESPACE_STORAGE_CLASS CORBA::WChar* ObjectId_to_wstring (
+    const PortableServer::ObjectId &id);
+
+  TAO_NAMESPACE_STORAGE_CLASS PortableServer::ObjectId *wstring_to_ObjectId (
+    const CORBA::WChar *id);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_PORTABLESERVER_WFUNCTIONS_H */
diff --git a/TAO/tao/PortableServer/PortableServer_includeC.h b/TAO/tao/PortableServer/PortableServer_includeC.h
index fc8cea9bfc1..5c813b75bd5 100644
--- a/TAO/tao/PortableServer/PortableServer_includeC.h
+++ b/TAO/tao/PortableServer/PortableServer_includeC.h
@@ -79,10 +79,6 @@ namespace TAO
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:961
 
-#if defined (__ACE_INLINE__)
-#include "PortableServer_includeC.inl"
-#endif /* defined INLINE */
-
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/PortableServer/Regular_POA.cpp b/TAO/tao/PortableServer/Regular_POA.cpp
new file mode 100644
index 00000000000..1b8045b030d
--- /dev/null
+++ b/TAO/tao/PortableServer/Regular_POA.cpp
@@ -0,0 +1,69 @@
+#include "Regular_POA.h"
+
+ACE_RCSID (PortableServer,
+           POA,
+           "$Id$")
+
+//
+#if !defined (__ACE_INLINE__)
+# include "Regular_POA.inl"
+#endif /* ! __ACE_INLINE__ */
+
+TAO_Regular_POA::TAO_Regular_POA (const TAO_Root_POA::String &name,
+                  TAO_POA_Manager &poa_manager,
+                  const TAO_POA_Policy_Set &policies,
+                  TAO_Root_POA *parent,
+                  ACE_Lock &lock,
+                  TAO_SYNCH_MUTEX &thread_lock,
+                  TAO_ORB_Core &orb_core,
+                  TAO_Object_Adapter *object_adapter
+                  ACE_ENV_ARG_DECL)
+  : TAO_Root_POA (name,
+                  poa_manager,
+                  policies,
+                  parent,
+                  lock,
+                  thread_lock,
+                  orb_core,
+                  object_adapter
+                  ACE_ENV_ARG_PARAMETER),
+     parent_ (parent)
+{
+}
+
+TAO_Regular_POA::~TAO_Regular_POA (void)
+{
+}
+
+void
+TAO_Regular_POA::remove_from_parent_i (ACE_ENV_SINGLE_ARG_DECL)
+{
+  // Remove POA from the parent
+  if (this->parent_ != 0)
+    {
+      int result = this->parent_->delete_child (this->name_);
+      if (result != 0)
+        {
+          ACE_THROW (CORBA::OBJ_ADAPTER ());
+        }
+    }
+}
+
+CORBA::Boolean
+TAO_Regular_POA::root (void) const
+{
+  return (parent_ == 0);
+}
+
+char
+TAO_Regular_POA::root_key_type (void)
+{
+  if (this->parent_ != 0)
+    {
+      return TAO_Root_POA::non_root_key_char ();
+    }
+  else
+    {
+      return TAO_Root_POA::root_key_type ();
+    }
+}
diff --git a/TAO/tao/PortableServer/Regular_POA.h b/TAO/tao/PortableServer/Regular_POA.h
new file mode 100644
index 00000000000..516fa3b6f68
--- /dev/null
+++ b/TAO/tao/PortableServer/Regular_POA.h
@@ -0,0 +1,76 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Regular_POA.h
+ *
+ *  $Id$
+ *
+ *  Header file for CORBA's ORB type.
+ *
+ *  @author  Irfan Pyarali <irfan@cs.wustl.edu>
+ */
+//=============================================================================
+
+#ifndef TAO_REGULAR_POA_H
+#define TAO_REGULAR_POA_H
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/PortableServer/Root_POA.h"
+
+/**
+ * @class TAO_Regular_POA
+ *
+ * @brief Implementation of the PortableServer::POA interface.
+ *
+ * Implementation of the PortableServer::POA interface.
+ */
+class TAO_PortableServer_Export TAO_Regular_POA
+  : public TAO_Root_POA
+{
+public:
+  TAO_Regular_POA (const String &name,
+                   TAO_POA_Manager &poa_manager,
+                   const TAO_POA_Policy_Set &policies,
+                   TAO_Root_POA *parent,
+                   ACE_Lock &lock,
+                   TAO_SYNCH_MUTEX &thread_lock,
+                   TAO_ORB_Core &orb_core,
+                   TAO_Object_Adapter *object_adapter
+                   ACE_ENV_ARG_DECL);
+
+  virtual ~TAO_Regular_POA (void);
+
+  PortableServer::POA_ptr the_parent (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException));
+
+protected:
+  virtual void remove_from_parent_i (ACE_ENV_SINGLE_ARG_DECL);
+
+  virtual CORBA::Boolean root (void) const;
+
+  virtual char root_key_type (void);
+
+  /// The parent of this POA, be aware that in case this pointer is nill,
+  /// we are a parent. This can be achieved by deriving from this Regular_POA
+  /// and pass a nill pointer as parent with the constructor.
+  TAO_Root_POA *parent_;
+};
+
+
+// ****************************************************************
+
+#if defined (__ACE_INLINE__)
+# include "Regular_POA.inl"
+#endif /* __ACE_INLINE__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_REGULAR_POA_H */
diff --git a/TAO/tao/PortableServer/Regular_POA.inl b/TAO/tao/PortableServer/Regular_POA.inl
new file mode 100644
index 00000000000..fa533b4991e
--- /dev/null
+++ b/TAO/tao/PortableServer/Regular_POA.inl
@@ -0,0 +1,14 @@
+// -*- C++ -*-
+//
+// $Id$
+
+ACE_INLINE PortableServer::POA_ptr
+TAO_Regular_POA::the_parent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  if (this->parent_ != 0)
+    return PortableServer::POA::_duplicate (this->parent_);
+  else
+    return PortableServer::POA::_nil ();
+}
+
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
new file mode 100644
index 00000000000..ca76ad11887
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
@@ -0,0 +1,69 @@
+#include "RequestProcessingPolicy.h"
+#include "PortableServer.h"
+
+ACE_RCSID (PortableServer,
+           RequestProcessingPolicy,
+           "$Id$")
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    RequestProcessingPolicy::RequestProcessingPolicy (
+      ::PortableServer::RequestProcessingPolicyValue value) :
+        value_ (value)
+    {
+    }
+
+    CORBA::Policy_ptr
+    RequestProcessingPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      RequestProcessingPolicy *copy = 0;
+      ACE_NEW_THROW_EX (copy,
+                        RequestProcessingPolicy (this->value_),
+                        CORBA::NO_MEMORY ());
+      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+
+      return copy;
+    }
+
+    void
+    RequestProcessingPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+    }
+
+    ::PortableServer::RequestProcessingPolicyValue
+    RequestProcessingPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      return value_;
+    }
+
+    CORBA::PolicyType
+    RequestProcessingPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      return ::PortableServer::REQUEST_PROCESSING_POLICY_ID;
+    }
+
+    TAO_Cached_Policy_Type
+    RequestProcessingPolicy::_tao_cached_type (void) const
+    {
+      return TAO_CACHED_POLICY_REQUEST_PROCESSING;
+    }
+
+    TAO_Policy_Scope
+    RequestProcessingPolicy::_tao_scope (void) const
+    {
+      return TAO_POLICY_POA_SCOPE;
+    }
+
+
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.h b/TAO/tao/PortableServer/RequestProcessingPolicy.h
new file mode 100644
index 00000000000..6e9b9703085
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingPolicy.h
@@ -0,0 +1,77 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file RequestProcessingPolicy.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_REQUESTPROCESSINGPOLICY_H
+#define TAO_PORTABLESERVER_REQUESTPROCESSINGPOLICY_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "RequestProcessingPolicyC.h"
+#include "tao/LocalObject.h"
+
+// This is to remove "inherits via dominance" warnings from MSVC.
+// MSVC is being a little too paranoid.
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export RequestProcessingPolicy :
+      public virtual ::PortableServer::RequestProcessingPolicy,
+      public virtual TAO_Local_RefCounted_Object
+    {
+    public:
+      RequestProcessingPolicy (::PortableServer::RequestProcessingPolicyValue value);
+
+      CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      ::PortableServer::RequestProcessingPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      /// Return the cached policy type for this policy.
+      virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;
+
+      /// Returns the scope at which this policy can be applied. See orbconf.h.
+      virtual TAO_Policy_Scope _tao_scope (void) const;
+
+    private:
+      ::PortableServer::RequestProcessingPolicyValue value_;
+    };
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGPOLICY_H */
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.pidl b/TAO/tao/PortableServer/RequestProcessingPolicy.pidl
new file mode 100644
index 00000000000..00f67b45234
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingPolicy.pidl
@@ -0,0 +1,41 @@
+/**
+ * @file RequestProcessingPolicy.pidl
+ *
+ * $Id$
+ *
+ * @brief Pre-compiled IDL source for the PortableServer module.
+ *
+ * tao_idl.exe \
+ *     -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT)
+ *          -Wb,export_macro=TAO_PortableServer_Export \
+ *          -Wb,export_include="portableserver_export.h" \
+ *          -Wb,pre_include="ace/pre.h" \
+ *          -Wb,post_include="ace/post.h" \
+ *          RequestProcessingPolicy.pidl
+ */
+
+#ifndef _PORTABLESERVER_REQUESTPROCESSINGPOLICY_IDL_
+#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY_IDL_
+
+#include <tao/Policy.pidl>
+
+#pragma prefix "omg.org"
+
+module PortableServer
+{
+# pragma version PortableServer 2.3
+
+  enum RequestProcessingPolicyValue
+  {
+    USE_ACTIVE_OBJECT_MAP_ONLY,
+    USE_DEFAULT_SERVANT,
+    USE_SERVANT_MANAGER
+  };
+
+  local interface RequestProcessingPolicy : CORBA::Policy
+  {
+    readonly attribute RequestProcessingPolicyValue value;
+  };
+};
+
+#endif // _PORTABLESERVER_REQUESTPROCESSINGPOLICY_IDL_
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp
new file mode 100644
index 00000000000..c8f640bf569
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp
@@ -0,0 +1,272 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+
+#include "RequestProcessingPolicyC.h"
+#include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
+#include "tao/Any_Impl_T.h"
+#include "tao/Any_Basic_Impl_T.h"
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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 (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 (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 (0x4c590000),  // name = USE_ACTIVE_OBJECT_MAP_ONLY
+  20,
+  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 (0x47455200),  // name = USE_SERVANT_MANAGER
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicyValue (
+    CORBA::tk_enum,
+    sizeof (_oc_PortableServer_RequestProcessingPolicyValue),
+    (char *) &_oc_PortableServer_RequestProcessingPolicyValue,
+    0,
+    0
+  );
+
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_RequestProcessingPolicyValue =
+    &_tc_TAO_tc_PortableServer_RequestProcessingPolicyValue;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+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 (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 (0x69637900),  // name = RequestProcessingPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_RequestProcessingPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_RequestProcessingPolicy),
+    (char *) &_oc_PortableServer_RequestProcessingPolicy,
+    0,
+    0
+  );
+
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_RequestProcessingPolicy =
+    &_tc_TAO_tc_PortableServer_RequestProcessingPolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::RequestProcessingPolicyValue _tao_elem
+  )
+{
+  TAO::Any_Basic_Impl_T<PortableServer::RequestProcessingPolicyValue>::insert (
+      _tao_any,
+      PortableServer::_tc_RequestProcessingPolicyValue,
+      _tao_elem
+    );
+}
+
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::RequestProcessingPolicyValue &_tao_elem
+  )
+{
+  return
+    TAO::Any_Basic_Impl_T<PortableServer::RequestProcessingPolicyValue>::extract (
+        _tao_any,
+        PortableServer::_tc_RequestProcessingPolicyValue,
+        _tao_elem 
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+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 false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::RequestProcessingPolicy_ptr _tao_elem
+  )
+{
+  PortableServer::RequestProcessingPolicy_ptr _tao_objptr =
+    PortableServer::RequestProcessingPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::RequestProcessingPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::insert (
+      _tao_any,
+      PortableServer::RequestProcessingPolicy::_tao_any_destructor,
+      PortableServer::_tc_RequestProcessingPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::RequestProcessingPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::extract (
+        _tao_any,
+        PortableServer::RequestProcessingPolicy::_tao_any_destructor,
+        PortableServer::_tc_RequestProcessingPolicy,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        PortableServer::RequestProcessingPolicyValue
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        PortableServer::RequestProcessingPolicy
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        PortableServer::RequestProcessingPolicyValue \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        PortableServer::RequestProcessingPolicy \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp
new file mode 100644
index 00000000000..1083cf4458d
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp
@@ -0,0 +1,259 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:302
+
+
+#include "RequestProcessingPolicyC.h"
+#include "tao/CDR.h"
+#include "ace/OS_NS_string.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if !defined (__ACE_INLINE__)
+#include "RequestProcessingPolicyC.inl"
+#endif /* !defined INLINE */
+
+// TAO_IDL - Generated from
+// be\be_visitor_arg_traits.cpp:66
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+// Arg traits specializations.
+namespace TAO
+{
+}
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/interface_cs.cpp:60
+
+// Traits specializations for PortableServer::RequestProcessingPolicy.
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+PortableServer::RequestProcessingPolicy_ptr
+TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::duplicate (
+    PortableServer::RequestProcessingPolicy_ptr p
+  )
+{
+  return PortableServer::RequestProcessingPolicy::_duplicate (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+void
+TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::release (
+    PortableServer::RequestProcessingPolicy_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+PortableServer::RequestProcessingPolicy_ptr
+TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::nil (void)
+{
+  return PortableServer::RequestProcessingPolicy::_nil ();
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+CORBA::Boolean
+TAO::Objref_Traits<PortableServer::RequestProcessingPolicy>::marshal (
+    PortableServer::RequestProcessingPolicy_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return CORBA::Object::marshal (p, cdr);
+}
+
+PortableServer::RequestProcessingPolicy::RequestProcessingPolicy (void)
+{}
+
+PortableServer::RequestProcessingPolicy::~RequestProcessingPolicy (void)
+{}
+
+void 
+PortableServer::RequestProcessingPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  RequestProcessingPolicy *_tao_tmp_pointer =
+    static_cast<RequestProcessingPolicy *> (_tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
+}
+
+PortableServer::RequestProcessingPolicy_ptr
+PortableServer::RequestProcessingPolicy::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return RequestProcessingPolicy::_nil ();
+    }
+  
+  RequestProcessingPolicy_ptr proxy =
+    dynamic_cast<RequestProcessingPolicy_ptr> (_tao_objref);
+  
+  return RequestProcessingPolicy::_duplicate (proxy);
+}
+
+PortableServer::RequestProcessingPolicy_ptr
+PortableServer::RequestProcessingPolicy::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return RequestProcessingPolicy::_nil ();
+    }
+  
+  RequestProcessingPolicy_ptr proxy =
+    dynamic_cast<RequestProcessingPolicy_ptr> (_tao_objref);
+  
+  return RequestProcessingPolicy::_duplicate (proxy);
+}
+
+PortableServer::RequestProcessingPolicy_ptr
+PortableServer::RequestProcessingPolicy::_duplicate (RequestProcessingPolicy_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+CORBA::Boolean
+PortableServer::RequestProcessingPolicy::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/Policy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/PortableServer/RequestProcessingPolicy:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+    )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+const char* PortableServer::RequestProcessingPolicy::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/PortableServer/RequestProcessingPolicy:2.3";
+}
+
+CORBA::Boolean
+PortableServer::RequestProcessingPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/cdr_op_cs.cpp:51
+
+CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::RequestProcessingPolicyValue &_tao_enumval)
+{
+  CORBA::ULong _tao_temp = _tao_enumval;
+  return strm << _tao_temp;
+}
+
+CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::RequestProcessingPolicyValue &_tao_enumval)
+{
+  CORBA::ULong _tao_temp = 0;
+  CORBA::Boolean _tao_result = strm >> _tao_temp;
+  
+  if (_tao_result == 1)
+    {
+      _tao_enumval = static_cast<PortableServer::RequestProcessingPolicyValue> (_tao_temp);
+    }
+  
+  return _tao_result;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_root/root.cpp:1629
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Objref_Traits<
+        PortableServer::RequestProcessingPolicy
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::RequestProcessingPolicy
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::RequestProcessingPolicy
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Objref_Traits< \
+        PortableServer::RequestProcessingPolicy \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::RequestProcessingPolicy
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::RequestProcessingPolicy
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.h b/TAO/tao/PortableServer/RequestProcessingPolicyC.h
new file mode 100644
index 00000000000..225f42741d5
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingPolicyC.h
@@ -0,0 +1,301 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:153
+
+#ifndef _TAO_IDL_ORIG_REQUESTPROCESSINGPOLICYC_H_
+#define _TAO_IDL_ORIG_REQUESTPROCESSINGPOLICYC_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "portableserver_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
+#include "tao/Environment.h"
+#include "tao/Object.h"
+#include "tao/Objref_VarOut_T.h"
+
+#include "tao/PolicyC.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_PortableServer_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_ch.cpp:62
+
+namespace TAO
+{
+  class Collocation_Proxy_Broker;
+  
+  template<typename T> class Narrow_Utils;
+  template<typename T> class AbstractBase_Narrow_Utils;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // 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
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestProcessingPolicyValue;
+  
+  // TAO_IDL - Generated from
+  // be\be_interface.cpp:598
+
+#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;
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_interface/interface_ch.cpp:54
+
+#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;
+    
+    // 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 static_cast<RequestProcessingPolicy_ptr> (0);
+    }
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // 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
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::Policy_ptr copy (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void destroy (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_interface/interface_ch.cpp:208
+    
+    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:
+    // Abstract or local interface only.
+    RequestProcessingPolicy (void);
+    
+    virtual ~RequestProcessingPolicy (void);
+  
+  private:
+    // Private and unimplemented for concrete interfaces.
+    RequestProcessingPolicy (const RequestProcessingPolicy &);
+    
+    void operator= (const RequestProcessingPolicy &);
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestProcessingPolicy;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:66
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:59
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+// Traits specializations.
+namespace TAO
+{
+
+#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY__TRAITS_CH_)
+#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY__TRAITS_CH_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::RequestProcessingPolicy>
+  {
+    static ::PortableServer::RequestProcessingPolicy_ptr duplicate (
+        ::PortableServer::RequestProcessingPolicy_ptr
+      );
+    static void release (
+        ::PortableServer::RequestProcessingPolicy_ptr
+      );
+    static ::PortableServer::RequestProcessingPolicy_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::PortableServer::RequestProcessingPolicy_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_ch.cpp:51
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicyValue);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicyValue &);
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicy_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicy_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicy_ptr &);
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/cdr_op_ch.cpp:50
+
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicyValue &);
+TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicyValue &);
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:961
+
+#if defined (__ACE_INLINE__)
+#include "RequestProcessingPolicyC.inl"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.inl b/TAO/tao/PortableServer/RequestProcessingPolicyC.inl
new file mode 100644
index 00000000000..c944d806c1f
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingPolicyC.inl
@@ -0,0 +1,27 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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/RequestProcessingStrategy.cpp b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
new file mode 100644
index 00000000000..6439e34779c
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
@@ -0,0 +1,66 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    RequestProcessingStrategy.cpp
+ *
+ *  $Id$
+ *
+ */
+//=============================================================================
+
+#include "RequestProcessingStrategy.h"
+
+ACE_RCSID (PortableServer,
+           RequestProcessingStrategy,
+           "$Id$")
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    RequestProcessingStrategy::RequestProcessingStrategy()
+      : poa_ (0)
+    {
+    }
+
+    RequestProcessingStrategy::~RequestProcessingStrategy()
+    {
+    }
+
+    void
+    RequestProcessingStrategy::strategy_init(
+      TAO_Root_POA *poa,
+      ::PortableServer::ServantRetentionPolicyValue sr_value
+      ACE_ENV_ARG_DECL_NOT_USED)
+    {
+      poa_ = poa;
+      sr_value_ = sr_value;
+    }
+
+    void
+    RequestProcessingStrategy::strategy_init(
+      TAO_Root_POA *poa
+      ACE_ENV_ARG_DECL_NOT_USED)
+    {
+      poa_ = poa;
+    }
+
+    void
+    RequestProcessingStrategy::strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    {
+      poa_ = 0;
+    }
+
+    ::PortableServer::ServantRetentionPolicyValue
+    RequestProcessingStrategy::sr_type() const
+    {
+      return sr_value_;
+    }
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.h b/TAO/tao/PortableServer/RequestProcessingStrategy.h
new file mode 100644
index 00000000000..bc9f0e53041
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingStrategy.h
@@ -0,0 +1,144 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file RequestProcessingStrategy.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_REQUEST_PROCESSING_STRATEGY_H
+#define TAO_REQUEST_PROCESSING_STRATEGY_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "Policy_Strategy.h"
+#include "PortableServer.h"
+#include "Servant_Location.h"
+
+namespace PortableServer
+{
+  class ServantManager;
+  typedef ServantManager *ServantManager_ptr;
+}
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class Servant_Upcall;
+    class POA_Current_Impl;
+  }
+}
+
+class TAO_Root_POA;
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export RequestProcessingStrategy
+      : public virtual Policy_Strategy
+    {
+    public:
+      RequestProcessingStrategy (void);
+
+      virtual ~RequestProcessingStrategy (void);
+
+      virtual void strategy_init(
+        TAO_Root_POA *poa
+        ACE_ENV_ARG_DECL);
+
+      virtual void strategy_init(
+        TAO_Root_POA *poa,
+        ::PortableServer::ServantRetentionPolicyValue
+        ACE_ENV_ARG_DECL);
+
+      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+      virtual PortableServer::ServantManager_ptr get_servant_manager (
+        ACE_ENV_SINGLE_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::WrongPolicy)) = 0;
+
+      virtual void set_servant_manager (
+        PortableServer::ServantManager_ptr imgr
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::WrongPolicy)) = 0;
+
+      virtual void set_servant (PortableServer::Servant servant ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongPolicy)) = 0;
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+      virtual PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongPolicy)) = 0;
+
+      virtual TAO_SERVANT_LOCATION locate_servant (
+        const PortableServer::ObjectId &system_id,
+        PortableServer::Servant &servant
+        ACE_ENV_ARG_DECL) = 0;
+
+      virtual PortableServer::Servant locate_servant (
+        const char *operation,
+        const PortableServer::ObjectId &system_id,
+        TAO::Portable_Server::Servant_Upcall &servant_upcall,
+        TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
+        int &wait_occurred_restart_call
+        ACE_ENV_ARG_DECL) = 0;
+
+      virtual void cleanup_servant (
+        PortableServer::Servant servant,
+        const PortableServer::ObjectId &user_id
+        ACE_ENV_ARG_DECL) = 0;
+
+      virtual PortableServer::Servant system_id_to_servant (
+        const PortableServer::ObjectId &system_id
+        ACE_ENV_ARG_DECL) = 0;
+
+      virtual PortableServer::Servant id_to_servant (
+        const PortableServer::ObjectId &id
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::ObjectNotActive,
+                           PortableServer::POA::WrongPolicy)) = 0;
+
+      virtual void etherealize_objects (CORBA::Boolean etherealize_objects) = 0;
+
+      virtual PortableServer::ObjectId *servant_to_id (
+        PortableServer::Servant servant
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::ServantNotActive,
+                           PortableServer::POA::WrongPolicy)) = 0;
+
+      virtual void post_invoke_servant_cleanup(
+        const PortableServer::ObjectId &system_id,
+        const TAO::Portable_Server::Servant_Upcall &servant_upcall) = 0;
+
+      virtual ::PortableServer::RequestProcessingPolicyValue type() const = 0;
+
+      virtual ::PortableServer::ServantRetentionPolicyValue sr_type() const;
+
+    protected:
+      TAO_Root_POA* poa_;
+      ::PortableServer::ServantRetentionPolicyValue sr_value_;
+    };
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_REQUEST_PROCESSING_STRATEGY_H */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
new file mode 100644
index 00000000000..396953587da
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
@@ -0,0 +1,186 @@
+// -*- C++ -*-
+
+#include "tao/ORB_Constants.h"
+#include "RequestProcessingStrategyAOMOnly.h"
+#include "ServantManagerC.h"
+#include "Non_Servant_Upcall.h"
+#include "Servant_Base.h"
+#include "Root_POA.h"
+
+ACE_RCSID (PortableServer,
+           Request_Processing,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    RequestProcessingStrategyAOMOnly::RequestProcessingStrategyAOMOnly()
+    {
+    }
+
+    RequestProcessingStrategyAOMOnly::~RequestProcessingStrategyAOMOnly()
+    {
+    }
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+    PortableServer::ServantManager_ptr
+    RequestProcessingStrategyAOMOnly::get_servant_manager (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       PortableServer::POA::WrongPolicy))
+    {
+      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
+                        PortableServer::ServantManager::_nil ());
+    }
+
+    void
+    RequestProcessingStrategyAOMOnly::set_servant_manager (
+      PortableServer::ServantManager_ptr /*imgr*/
+                         ACE_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       PortableServer::POA::WrongPolicy))
+    {
+      ACE_THROW (PortableServer::POA::WrongPolicy ());
+    }
+
+    void
+    RequestProcessingStrategyAOMOnly::set_servant (
+      PortableServer::Servant /*servant*/
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongPolicy))
+    {
+      ACE_THROW (PortableServer::POA::WrongPolicy ());
+    }
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+    PortableServer::Servant
+    RequestProcessingStrategyAOMOnly::get_servant (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       PortableServer::POA::WrongPolicy))
+    {
+      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
+                        0);
+    }
+
+    TAO_SERVANT_LOCATION
+    RequestProcessingStrategyAOMOnly::locate_servant (
+      const PortableServer::ObjectId & system_id,
+      PortableServer::Servant & servant
+      ACE_ENV_ARG_DECL)
+    {
+      return this->poa_->servant_present (system_id,
+                                          servant
+                                          ACE_ENV_ARG_PARAMETER);
+    }
+
+    PortableServer::Servant
+    RequestProcessingStrategyAOMOnly::locate_servant (
+      const char * /*operation*/,
+      const PortableServer::ObjectId &system_id,
+      TAO::Portable_Server::Servant_Upcall &servant_upcall,
+      TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
+      int & /*wait_occurred_restart_call*/
+      ACE_ENV_ARG_DECL)
+    {
+      PortableServer::Servant servant = 0;
+
+      servant = this->poa_->find_servant (system_id,
+                                          servant_upcall,
+                                          poa_current_impl
+                                          ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      if (servant == 0)
+        {
+          ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (CORBA::OMGVMCID | 2,
+                                                     CORBA::COMPLETED_NO),
+                            0);
+        }
+
+      return servant;
+    }
+
+    PortableServer::Servant
+    RequestProcessingStrategyAOMOnly::system_id_to_servant (
+      const PortableServer::ObjectId &system_id
+      ACE_ENV_ARG_DECL)
+    {
+      return this->poa_->find_servant (system_id
+                                       ACE_ENV_ARG_PARAMETER);
+    }
+
+    PortableServer::Servant
+    RequestProcessingStrategyAOMOnly::id_to_servant (
+      const PortableServer::ObjectId &id
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::ObjectNotActive,
+                         PortableServer::POA::WrongPolicy))
+    {
+      return this->poa_->user_id_to_servant_i (id
+                                               ACE_ENV_ARG_PARAMETER);
+    }
+
+    void
+    RequestProcessingStrategyAOMOnly::cleanup_servant (
+      PortableServer::Servant servant,
+      const PortableServer::ObjectId &user_id
+      ACE_ENV_ARG_DECL)
+    {
+      if (servant)
+        {
+          // ATTENTION: Trick locking here, see class header for details
+          Non_Servant_Upcall non_servant_upcall (*this->poa_);
+          ACE_UNUSED_ARG (non_servant_upcall);
+
+          servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+
+      // This operation causes the association of the Object Id specified
+      // by the oid parameter and its servant to be removed from the
+      // Active Object Map.
+      int result = this->poa_->unbind_using_user_id (user_id);
+
+      if (result != 0)
+        {
+          ACE_THROW (CORBA::OBJ_ADAPTER ());
+        }
+    }
+
+    void
+    RequestProcessingStrategyAOMOnly::etherealize_objects (
+      CORBA::Boolean /*etherealize_objects*/)
+    {
+    }
+
+    PortableServer::ObjectId *
+    RequestProcessingStrategyAOMOnly::servant_to_id (
+      PortableServer::Servant servant
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::ServantNotActive,
+                         PortableServer::POA::WrongPolicy))
+    {
+      return this->poa_->servant_to_user_id (servant ACE_ENV_ARG_PARAMETER);
+    }
+
+    void
+    RequestProcessingStrategyAOMOnly::post_invoke_servant_cleanup(
+      const PortableServer::ObjectId &/*system_id*/,
+      const TAO::Portable_Server::Servant_Upcall &/*servant_upcall*/)
+    {
+    }
+
+    ::PortableServer::RequestProcessingPolicyValue
+    RequestProcessingStrategyAOMOnly::type() const
+    {
+      return ::PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY;
+    }
+
+  }
+}
+
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
new file mode 100644
index 00000000000..704b1b8a3a5
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
@@ -0,0 +1,115 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file RequestProcessingStrategyAOMOnly.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_REQUESTPROCESSINGSTRATEGYAOMONLY_H
+#define TAO_REQUESTPROCESSINGSTRATEGYAOMONLY_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "RequestProcessingStrategy.h"
+#include "Servant_Location.h"
+#include "PortableServer.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export RequestProcessingStrategyAOMOnly
+      : public virtual RequestProcessingStrategy
+    {
+    public:
+      RequestProcessingStrategyAOMOnly (void);
+
+      virtual ~RequestProcessingStrategyAOMOnly (void);
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+      PortableServer::ServantManager_ptr
+      get_servant_manager (ACE_ENV_SINGLE_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongPolicy));
+
+      void
+      set_servant_manager (PortableServer::ServantManager_ptr imgr
+                           ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongPolicy));
+
+      void
+      set_servant (PortableServer::Servant servant
+                   ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongPolicy));
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+      PortableServer::Servant
+      get_servant (ACE_ENV_SINGLE_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongPolicy));
+
+      virtual
+      TAO_SERVANT_LOCATION
+      locate_servant (const PortableServer::ObjectId &system_id,
+                      PortableServer::Servant &servant
+                      ACE_ENV_ARG_DECL);
+
+      virtual
+      PortableServer::Servant
+      locate_servant (const char *operation,
+                      const PortableServer::ObjectId &system_id,
+                      TAO::Portable_Server::Servant_Upcall &servant_upcall,
+                      TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
+                      int &wait_occurred_restart_call
+                      ACE_ENV_ARG_DECL);
+
+      virtual PortableServer::Servant system_id_to_servant (
+        const PortableServer::ObjectId &system_id
+        ACE_ENV_ARG_DECL);
+
+      virtual PortableServer::Servant id_to_servant (
+        const PortableServer::ObjectId &id
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::ObjectNotActive,
+                           PortableServer::POA::WrongPolicy));
+
+      virtual void cleanup_servant (
+        PortableServer::Servant servant,
+        const PortableServer::ObjectId &user_id
+        ACE_ENV_ARG_DECL);
+
+      virtual void etherealize_objects (CORBA::Boolean etherealize_objects);
+
+      virtual PortableServer::ObjectId *servant_to_id (
+        PortableServer::Servant servant
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::ServantNotActive,
+                           PortableServer::POA::WrongPolicy));
+
+      virtual void post_invoke_servant_cleanup(
+        const PortableServer::ObjectId &system_id,
+        const TAO::Portable_Server::Servant_Upcall &servant_upcall);
+
+      virtual ::PortableServer::RequestProcessingPolicyValue type() const;
+    };
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_REQUESTPROCESSINGSTRATEGYAOMONLY_H */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
new file mode 100644
index 00000000000..30fcabf47f8
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
@@ -0,0 +1,77 @@
+// $Id$
+
+#include "RequestProcessingStrategyAOMOnlyFactoryImpl.h"
+#include "RequestProcessingStrategy.h"
+#include "RequestProcessingStrategyAOMOnly.h"
+#include "ace/Dynamic_Service.h"
+
+ACE_RCSID (PortableServer,
+           RequestProcessingStrategyAOMOnlyFactoryImpl,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    RequestProcessingStrategyAOMOnlyFactoryImpl::~RequestProcessingStrategyAOMOnlyFactoryImpl (void)
+    {
+    }
+
+    RequestProcessingStrategy*
+    RequestProcessingStrategyAOMOnlyFactoryImpl::create (
+      ::PortableServer::RequestProcessingPolicyValue value,
+      ::PortableServer::ServantRetentionPolicyValue /*srvalue*/)
+    {
+      RequestProcessingStrategy* strategy = 0;
+
+      switch (value)
+      {
+        case ::PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY :
+        {
+          ACE_NEW_RETURN (strategy, RequestProcessingStrategyAOMOnly, 0);
+          break;
+        }
+        default :
+        {
+          ACE_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyAOMOnlyFactoryImpl"));
+          break;
+        }
+      }
+
+      return strategy;
+    }
+
+    void
+    RequestProcessingStrategyAOMOnlyFactoryImpl::destroy (
+      RequestProcessingStrategy *strategy
+      ACE_ENV_ARG_DECL)
+    {
+      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+
+      delete strategy;
+    }
+
+    ACE_STATIC_SVC_DEFINE (
+        RequestProcessingStrategyAOMOnlyFactoryImpl,
+        ACE_TEXT ("RequestProcessingStrategyAOMOnlyFactory"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (RequestProcessingStrategyAOMOnlyFactoryImpl),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+
+    ACE_FACTORY_DEFINE (TAO_PortableServer, RequestProcessingStrategyAOMOnlyFactoryImpl)
+
+    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+    template class ACE_Dynamic_Service<RequestProcessingStrategyAOMOnlyFactoryImpl>;
+
+    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+    #pragma instantiate ACE_Dynamic_Service<RequestProcessingStrategyAOMOnlyFactoryImpl>
+
+    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  }
+}
+
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h
new file mode 100644
index 00000000000..d4767c44272
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h
@@ -0,0 +1,52 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file RequestProcessingStrategyAOMOnlyFactoryImpl.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYAOMONLYFACTORYIMPL_H
+#define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYAOMONLYFACTORYIMPL_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Service_Config.h"
+#include "tao/PortableServer/RequestProcessingStrategyFactory.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export RequestProcessingStrategyAOMOnlyFactoryImpl
+       : public virtual RequestProcessingStrategyFactory
+    {
+    public:
+      virtual ~RequestProcessingStrategyAOMOnlyFactoryImpl (void);
+
+      /// Create a new servant retention strategy
+      virtual RequestProcessingStrategy* create (
+        ::PortableServer::RequestProcessingPolicyValue value,
+        ::PortableServer::ServantRetentionPolicyValue srvalue);
+
+      virtual void destroy (
+        RequestProcessingStrategy *strategy
+        ACE_ENV_ARG_DECL);
+    };
+
+    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyAOMOnlyFactoryImpl)
+    ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyAOMOnlyFactoryImpl)
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYAOMONLYFACTORYIMPL_H*/
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
new file mode 100644
index 00000000000..148dceb7a5b
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
@@ -0,0 +1,318 @@
+// -*- C++ -*-
+
+#include "tao/ORB_Constants.h"
+#include "tao/TSS_Resources.h"
+#include "RequestProcessingStrategyDefaultServant.h"
+#include "Non_Servant_Upcall.h"
+#include "Root_POA.h"
+#include "ServantManagerC.h"
+#include "Servant_Base.h"
+#include "POA_Current_Impl.h"
+
+ACE_RCSID (PortableServer,
+           Request_Processing,
+           "$Id$")
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    RequestProcessingStrategyDefaultServant::RequestProcessingStrategyDefaultServant (void)
+      : default_servant_ (0)
+    {
+    }
+
+    RequestProcessingStrategyDefaultServant::~RequestProcessingStrategyDefaultServant (void)
+    {
+    }
+
+    void
+    RequestProcessingStrategyDefaultServant::strategy_cleanup(
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    {
+      this->default_servant_ = 0;
+    }
+
+    PortableServer::ServantManager_ptr
+    RequestProcessingStrategyDefaultServant::get_servant_manager (
+      ACE_ENV_SINGLE_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongPolicy))
+    {
+      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
+                        PortableServer::ServantManager::_nil ());
+    }
+
+    void
+    RequestProcessingStrategyDefaultServant::set_servant_manager (
+      PortableServer::ServantManager_ptr /*imgr*/
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongPolicy))
+    {
+      ACE_THROW (PortableServer::POA::WrongPolicy ());
+    }
+
+    PortableServer::Servant
+    RequestProcessingStrategyDefaultServant::get_servant (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongPolicy))
+    {
+      // This operation returns the default servant associated with the
+      // POA.
+      return this->default_servant_.in ();
+    }
+
+    void
+    RequestProcessingStrategyDefaultServant::set_servant (
+      PortableServer::Servant servant
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongPolicy))
+    {
+      // This operation registers the specified servant with the POA as
+      // the default servant. This servant will be used for all requests
+      // for which no servant is found in the Active Object Map.
+      this->default_servant_ = servant;
+
+      // The implementation of set_servant will invoke _add_ref at least
+      // once on the Servant argument before returning. When the POA no
+      // longer needs the Servant, it will invoke _remove_ref on it the
+      // same number of times.
+      if (servant != 0)
+        {
+          // A recursive thread lock without using a recursive thread
+          // lock.  Non_Servant_Upcall has a magic constructor and
+          // destructor.  We unlock the Object_Adapter lock for the
+          // duration of the servant activator upcalls; reacquiring once
+          // the upcalls complete.  Even though we are releasing the lock,
+          // other threads will not be able to make progress since
+          // <Object_Adapter::non_servant_upcall_in_progress_> has been
+          // set.
+          Non_Servant_Upcall non_servant_upcall (*this->poa_);
+          ACE_UNUSED_ARG (non_servant_upcall);
+
+          servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+    }
+
+    TAO_SERVANT_LOCATION
+    RequestProcessingStrategyDefaultServant::locate_servant (
+      const PortableServer::ObjectId & system_id,
+      PortableServer::Servant & servant
+      ACE_ENV_ARG_DECL)
+    {
+      TAO_SERVANT_LOCATION location = TAO_SERVANT_NOT_FOUND;
+
+      location = this->poa_->servant_present (system_id,
+                                              servant
+                                              ACE_ENV_ARG_PARAMETER);
+
+      if (location == TAO_SERVANT_NOT_FOUND)
+        {
+          if (this->default_servant_.in () != 0)
+            {
+              location = TAO_DEFAULT_SERVANT;
+            }
+        }
+
+      return location;
+    }
+
+    PortableServer::Servant
+    RequestProcessingStrategyDefaultServant::locate_servant (
+      const char * /*operation*/,
+      const PortableServer::ObjectId & system_id,
+      TAO::Portable_Server::Servant_Upcall &servant_upcall,
+      TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
+      int & /*wait_occurred_restart_call*/
+      ACE_ENV_ARG_DECL)
+    {
+      PortableServer::Servant servant = 0;
+
+      servant = this->poa_->find_servant (system_id,
+                                          servant_upcall,
+                                          poa_current_impl
+                                          ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      if (servant == 0)
+        {
+          // If the POA has the USE_DEFAULT_SERVANT policy, a default servant
+          // has been associated with the POA so the POA will invoke the
+          // appropriate method on that servant. If no servant has been
+          // associated with the POA, the POA raises the OBJ_ADAPTER system
+          // exception.
+          PortableServer::Servant default_servant = this->default_servant_.in ();
+          if (default_servant == 0)
+            {
+              ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 3,
+                                                    CORBA::COMPLETED_NO),
+                                                    0);
+            }
+          else
+            {
+              // Success
+              servant = default_servant;
+            }
+        }
+
+        return servant;
+    }
+
+    PortableServer::Servant
+    RequestProcessingStrategyDefaultServant::system_id_to_servant (
+      const PortableServer::ObjectId &system_id
+      ACE_ENV_ARG_DECL)
+    {
+      PortableServer::Servant servant = this->default_servant_.in ();
+
+      if (servant != 0)
+        {
+          // ATTENTION: Trick locking here, see class header for details
+          Non_Servant_Upcall non_servant_upcall (*this->poa_);
+          ACE_UNUSED_ARG (non_servant_upcall);
+
+          // The POA invokes _add_ref once on the Servant before returning
+          // it. If the application uses reference counting, the caller of
+          // id_to_servant is responsible for invoking _remove_ref once on
+          // the returned Servant when it is finished with it. A
+          // conforming caller need not invoke _remove_ref on the returned
+          // Servant if the type of the Servant uses the default reference
+          // counting inherited from ServantBase.
+          servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
+
+          return servant;
+        }
+      else
+        {
+          return this->poa_->find_servant (system_id
+                                           ACE_ENV_ARG_PARAMETER);
+        }
+    }
+
+    PortableServer::Servant
+    RequestProcessingStrategyDefaultServant::id_to_servant (
+      const PortableServer::ObjectId & /*id*/
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::ObjectNotActive,
+                         PortableServer::POA::WrongPolicy))
+    {
+      PortableServer::Servant servant = this->default_servant_.in ();
+
+      if (servant)
+        {
+          // ATTENTION: Trick locking here, see class header for details
+          Non_Servant_Upcall non_servant_upcall (*this->poa_);
+          ACE_UNUSED_ARG (non_servant_upcall);
+
+          // The POA invokes _add_ref once on the Servant before returning
+          // it. If the application uses reference counting, the caller of
+          // id_to_servant is responsible for invoking _remove_ref once on
+          // the returned Servant when it is finished with it. A
+          // conforming caller need not invoke _remove_ref on the returned
+          // Servant if the type of the Servant uses the default reference
+          // counting inherited from ServantBase.
+          servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
+
+          return servant;
+        }
+      else
+        {
+          /*
+           * If using default servant request processing strategy but
+           * no default servant is available, we will raise the
+           * ObjectNotActive system exception.
+           */
+          ACE_THROW_RETURN (PortableServer::POA::ObjectNotActive (),
+                            0);
+        }
+    }
+
+    void
+    RequestProcessingStrategyDefaultServant::cleanup_servant (
+      PortableServer::Servant servant,
+      const PortableServer::ObjectId &user_id
+      ACE_ENV_ARG_DECL)
+    {
+      if (servant)
+        {
+          // ATTENTION: Trick locking here, see class header for details
+          Non_Servant_Upcall non_servant_upcall (*this->poa_);
+          ACE_UNUSED_ARG (non_servant_upcall);
+
+          servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+
+      // This operation causes the association of the Object Id specified
+      // by the oid parameter and its servant to be removed from the
+      // Active Object Map.
+      int result = this->poa_->unbind_using_user_id (user_id);
+
+      if (result != 0)
+        {
+          ACE_THROW (CORBA::OBJ_ADAPTER ());
+        }
+    }
+
+    void
+    RequestProcessingStrategyDefaultServant::etherealize_objects (
+      CORBA::Boolean /*etherealize_objects*/)
+    {
+    }
+
+    PortableServer::ObjectId *
+    RequestProcessingStrategyDefaultServant::servant_to_id (
+      PortableServer::Servant servant
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::ServantNotActive,
+                         PortableServer::POA::WrongPolicy))
+    {
+      PortableServer::Servant default_servant = this->default_servant_.in ();
+
+      if (default_servant != 0 &&
+          default_servant == servant)
+        {
+          // If they are the same servant, then check if we are in an
+          // upcall.
+          TAO::Portable_Server::POA_Current_Impl *poa_current_impl =
+            static_cast <TAO::Portable_Server::POA_Current_Impl *>
+                        (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
+          // If we are in an upcall on the default servant, return the
+          // ObjectId associated with the current invocation.
+          if (poa_current_impl != 0 &&
+              servant == poa_current_impl->servant ())
+            {
+              return poa_current_impl->get_object_id (ACE_ENV_SINGLE_ARG_PARAMETER);
+            }
+        }
+
+      return this->poa_->servant_to_user_id (servant ACE_ENV_ARG_PARAMETER);
+    }
+
+    void
+    RequestProcessingStrategyDefaultServant::post_invoke_servant_cleanup(
+      const PortableServer::ObjectId &/*system_id*/,
+      const TAO::Portable_Server::Servant_Upcall &/*servant_upcall*/)
+    {
+    }
+
+    ::PortableServer::RequestProcessingPolicyValue
+    RequestProcessingStrategyDefaultServant::type() const
+    {
+      return ::PortableServer::USE_DEFAULT_SERVANT;
+    }
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
new file mode 100644
index 00000000000..eb58a60dfde
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
@@ -0,0 +1,122 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file RequestProcessingStrategyDefaultServant.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_REQUESTPROCESSINGSTRATEGYDEFAULTSERVANT_H
+#define TAO_REQUESTPROCESSINGSTRATEGYDEFAULTSERVANT_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "RequestProcessingStrategy.h"
+#include "Servant_Base.h"
+
+#include "Servant_Location.h"
+#include "PortableServer.h"
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+class TAO_Root_POA;
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export RequestProcessingStrategyDefaultServant
+      : public virtual RequestProcessingStrategy
+    {
+    public:
+      RequestProcessingStrategyDefaultServant (void);
+
+      virtual ~RequestProcessingStrategyDefaultServant (void);
+
+      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
+
+      PortableServer::ServantManager_ptr
+      get_servant_manager (ACE_ENV_SINGLE_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongPolicy));
+
+      void set_servant_manager (
+        PortableServer::ServantManager_ptr imgr
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::WrongPolicy));
+
+      PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongPolicy));
+
+      void set_servant (
+        PortableServer::Servant servant
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::WrongPolicy));
+
+      virtual TAO_SERVANT_LOCATION locate_servant (
+        const PortableServer::ObjectId &system_id,
+        PortableServer::Servant &servant
+        ACE_ENV_ARG_DECL);
+
+      virtual PortableServer::Servant locate_servant (
+        const char *operation,
+        const PortableServer::ObjectId &system_id,
+        TAO::Portable_Server::Servant_Upcall &servant_upcall,
+        TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
+        int &wait_occurred_restart_call
+        ACE_ENV_ARG_DECL);
+
+      virtual PortableServer::Servant system_id_to_servant (
+        const PortableServer::ObjectId &system_id
+        ACE_ENV_ARG_DECL);
+
+      virtual PortableServer::Servant id_to_servant (
+        const PortableServer::ObjectId &id
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::ObjectNotActive,
+                           PortableServer::POA::WrongPolicy));
+
+      virtual void cleanup_servant (
+        PortableServer::Servant servant,
+        const PortableServer::ObjectId &user_id
+        ACE_ENV_ARG_DECL);
+
+      virtual void etherealize_objects (CORBA::Boolean etherealize_objects);
+
+      virtual PortableServer::ObjectId *servant_to_id (
+        PortableServer::Servant servant
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::ServantNotActive,
+                           PortableServer::POA::WrongPolicy));
+
+      virtual void post_invoke_servant_cleanup(
+        const PortableServer::ObjectId &system_id,
+        const TAO::Portable_Server::Servant_Upcall &servant_upcall);
+
+      virtual ::PortableServer::RequestProcessingPolicyValue type() const;
+
+    private:
+      PortableServer::ServantBase_var default_servant_;
+    };
+
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_REQUESTPROCESSINGSTRATEGYDEFAULTSERVANT_H */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFactoryImpl.cpp
new file mode 100644
index 00000000000..b1ddf961515
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFactoryImpl.cpp
@@ -0,0 +1,81 @@
+// $Id$
+
+#include "RequestProcessingStrategyDefaultServantFactoryImpl.h"
+#include "RequestProcessingStrategy.h"
+#include "RequestProcessingStrategyDefaultServant.h"
+#include "ace/Dynamic_Service.h"
+
+ACE_RCSID (PortableServer,
+           RequestProcessingStrategyDefaultServantFactoryImpl,
+           "$Id$")
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    RequestProcessingStrategyDefaultServantFactoryImpl::~RequestProcessingStrategyDefaultServantFactoryImpl (void)
+    {
+    }
+
+    RequestProcessingStrategy*
+    RequestProcessingStrategyDefaultServantFactoryImpl::create (
+      ::PortableServer::RequestProcessingPolicyValue value,
+      ::PortableServer::ServantRetentionPolicyValue /*srvalue*/)
+    {
+      RequestProcessingStrategy* strategy = 0;
+
+      switch (value)
+      {
+        case ::PortableServer::USE_DEFAULT_SERVANT :
+        {
+          ACE_NEW_RETURN (strategy, RequestProcessingStrategyDefaultServant, 0);
+          break;
+        }
+        default :
+        {
+          ACE_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyDefaultServantFactoryImpl"));
+          break;
+        }
+      }
+
+      return strategy;
+    }
+
+    void
+    RequestProcessingStrategyDefaultServantFactoryImpl::destroy (
+      RequestProcessingStrategy *strategy
+      ACE_ENV_ARG_DECL)
+    {
+      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+
+      delete strategy;
+    }
+
+    ACE_STATIC_SVC_DEFINE (
+        RequestProcessingStrategyDefaultServantFactoryImpl,
+        ACE_TEXT ("RequestProcessingStrategyDefaultServantFactory"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (RequestProcessingStrategyDefaultServantFactoryImpl),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+
+    ACE_FACTORY_DEFINE (TAO_PortableServer, RequestProcessingStrategyDefaultServantFactoryImpl)
+
+    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+    template class ACE_Dynamic_Service<RequestProcessingStrategyDefaultServantFactoryImpl>;
+
+    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+    #pragma instantiate ACE_Dynamic_Service<RequestProcessingStrategyDefaultServantFactoryImpl>
+
+    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFactoryImpl.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFactoryImpl.h
new file mode 100644
index 00000000000..ce193f80499
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFactoryImpl.h
@@ -0,0 +1,56 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file RequestProcessingStrategyDefaultServantFactoryImpl.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYDEFAULTSERVANTFACTORYIMPL_H
+#define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYDEFAULTSERVANTFACTORYIMPL_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Service_Config.h"
+#include "tao/PortableServer/RequestProcessingStrategyFactory.h"
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export RequestProcessingStrategyDefaultServantFactoryImpl
+       : public virtual RequestProcessingStrategyFactory
+    {
+    public:
+      virtual ~RequestProcessingStrategyDefaultServantFactoryImpl (void);
+
+      /// Create a new servant retention strategy
+      virtual RequestProcessingStrategy* create (
+        ::PortableServer::RequestProcessingPolicyValue value,
+        ::PortableServer::ServantRetentionPolicyValue srvalue);
+
+      virtual void destroy (
+        RequestProcessingStrategy *strategy
+        ACE_ENV_ARG_DECL);
+    };
+
+    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyDefaultServantFactoryImpl)
+    ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyDefaultServantFactoryImpl)
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYDEFAULTSERVANTFACTORYIMPL_H*/
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h b/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h
new file mode 100644
index 00000000000..bd082ec8bf2
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactory.h
@@ -0,0 +1,50 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file RequestProcessingStrategyFactory.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORY_H
+#define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORY_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/PortableServer/StrategyFactory.h"
+#include "tao/PortableServer/RequestProcessingPolicyC.h"
+#include "tao/PortableServer/ServantRetentionPolicyC.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class RequestProcessingStrategy;
+
+    class TAO_PortableServer_Export RequestProcessingStrategyFactory
+      : public virtual StrategyFactory
+    {
+    public:
+      /// Create a new servant retention strategy
+      virtual RequestProcessingStrategy* create (
+        ::PortableServer::RequestProcessingPolicyValue value,
+        ::PortableServer::ServantRetentionPolicyValue srvalue) = 0;
+
+      virtual void destroy (
+        RequestProcessingStrategy *strategy
+        ACE_ENV_ARG_DECL) = 0;
+    };
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORY_H */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
new file mode 100644
index 00000000000..45141e775fa
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
@@ -0,0 +1,154 @@
+// $Id$
+
+#include "RequestProcessingStrategyFactoryImpl.h"
+#include "RequestProcessingStrategyAOMOnly.h"
+#include "RequestProcessingStrategyDefaultServant.h"
+#include "RequestProcessingStrategyServantLocator.h"
+#include "RequestProcessingStrategyServantActivator.h"
+#include "ace/Dynamic_Service.h"
+
+ACE_RCSID (PortableServer,
+           RequestProcessingStrategyFactoryImpl,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    RequestProcessingStrategyFactoryImpl::~RequestProcessingStrategyFactoryImpl (void)
+    {
+    }
+
+    RequestProcessingStrategy*
+    RequestProcessingStrategyFactoryImpl::create (
+        ::PortableServer::RequestProcessingPolicyValue value,
+        ::PortableServer::ServantRetentionPolicyValue srvalue)
+    {
+      RequestProcessingStrategy* strategy = 0;
+      RequestProcessingStrategyFactory *strategy_factory = 0;
+
+      switch (value)
+      {
+        case ::PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY :
+        {
+          strategy_factory =
+            ACE_Dynamic_Service<RequestProcessingStrategyFactory>::instance ("RequestProcessingStrategyAOMOnlyFactory");
+
+          break;
+        }
+        case ::PortableServer::USE_DEFAULT_SERVANT :
+        {
+          strategy_factory =
+            ACE_Dynamic_Service<RequestProcessingStrategyFactory>::instance ("RequestProcessingStrategyDefaultServantFactory");
+
+          break;
+        }
+        case ::PortableServer::USE_SERVANT_MANAGER :
+        {
+#if (TAO_HAS_MINIMUM_POA == 0)
+          switch (srvalue)
+          {
+            case ::PortableServer::RETAIN :
+            {
+              strategy_factory =
+                ACE_Dynamic_Service<RequestProcessingStrategyFactory>::instance ("RequestProcessingStrategyServantActivatorFactory");
+
+              break;
+            }
+            case ::PortableServer::NON_RETAIN :
+            {
+              strategy_factory =
+                ACE_Dynamic_Service<RequestProcessingStrategyFactory>::instance ("RequestProcessingStrategyServantLocatorFactory");
+
+              break;
+            }
+          }
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+          break;
+        }
+      }
+
+      if (strategy_factory != 0)
+        strategy = strategy_factory->create (value, srvalue);
+      else
+        ACE_ERROR ((LM_ERROR,
+                    ACE_TEXT ("(%P|%t) %p\n"),
+                    ACE_TEXT ("Unable to get ")
+                    ACE_TEXT ("RequestProcessingStrategyFactory")));
+
+      return strategy;
+    }
+
+    void
+    RequestProcessingStrategyFactoryImpl::destroy (
+      RequestProcessingStrategy *strategy
+      ACE_ENV_ARG_DECL)
+    {
+      RequestProcessingStrategyFactory *strategy_factory = 0;
+
+      switch (strategy->type ())
+      {
+        case ::PortableServer::USE_ACTIVE_OBJECT_MAP_ONLY :
+        {
+          strategy_factory =
+            ACE_Dynamic_Service<RequestProcessingStrategyFactory>::instance ("RequestProcessingStrategyAOMOnlyFactory");
+
+          break;
+        }
+        case ::PortableServer::USE_DEFAULT_SERVANT :
+        {
+          strategy_factory =
+            ACE_Dynamic_Service<RequestProcessingStrategyFactory>::instance ("RequestProcessingStrategyDefaultServantFactory");
+
+          break;
+        }
+        case ::PortableServer::USE_SERVANT_MANAGER :
+        {
+#if (TAO_HAS_MINIMUM_POA == 0)
+          switch (strategy->sr_type ())
+          {
+            case ::PortableServer::RETAIN :
+            {
+              strategy_factory =
+                ACE_Dynamic_Service<RequestProcessingStrategyFactory>::instance ("RequestProcessingStrategyServantActivatorFactory");
+
+              break;
+            }
+            case ::PortableServer::NON_RETAIN :
+            {
+              strategy_factory =
+                ACE_Dynamic_Service<RequestProcessingStrategyFactory>::instance ("RequestProcessingStrategyServantLocatorFactory");
+              break;
+            }
+          }
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+          break;
+        }
+      }
+
+      if (strategy_factory != 0)
+        {
+          strategy_factory->destroy (strategy ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+    }
+
+    ACE_STATIC_SVC_DEFINE (
+        RequestProcessingStrategyFactoryImpl,
+        ACE_TEXT ("RequestProcessingStrategyFactory"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (RequestProcessingStrategyFactoryImpl),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+
+    ACE_FACTORY_DEFINE (TAO_PortableServer, RequestProcessingStrategyFactoryImpl)
+
+    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+    template class ACE_Dynamic_Service<RequestProcessingStrategyFactoryImpl>;
+    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+    #pragma instantiate ACE_Dynamic_Service<RequestProcessingStrategyFactoryImpl>
+    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  }
+}
+
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h
new file mode 100644
index 00000000000..af187c40b66
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.h
@@ -0,0 +1,52 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file RequestProcessingStrategyFactoryImpl.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORYIMPL_H
+#define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORYIMPL_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Service_Config.h"
+#include "tao/PortableServer/RequestProcessingStrategyFactory.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export RequestProcessingStrategyFactoryImpl
+      : public virtual RequestProcessingStrategyFactory
+    {
+    public:
+      virtual ~RequestProcessingStrategyFactoryImpl (void);
+
+      /// Create a new request processing strategy
+      virtual RequestProcessingStrategy* create (
+        ::PortableServer::RequestProcessingPolicyValue value,
+        ::PortableServer::ServantRetentionPolicyValue srvalue);
+
+      virtual void destroy (
+        RequestProcessingStrategy *strategy
+        ACE_ENV_ARG_DECL);
+    };
+
+    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyFactoryImpl)
+    ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyFactoryImpl)
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
new file mode 100644
index 00000000000..42d4aba1f21
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
@@ -0,0 +1,353 @@
+// $Id$
+#include "tao/ORB_Constants.h"
+#include "ServantActivatorC.h"
+#include "RequestProcessingStrategyServantActivator.h"
+#include "Servant_Base.h"
+#include "Non_Servant_Upcall.h"
+#include "Root_POA.h"
+#include "POA_Current_Impl.h"
+#include "Servant_Upcall.h"
+
+ACE_RCSID (PortableServer,
+           Request_Processing,
+           "$Id$")
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    RequestProcessingStrategyServantActivator::RequestProcessingStrategyServantActivator (void) :
+      etherealize_objects_ (1)
+    {
+    }
+
+    RequestProcessingStrategyServantActivator::~RequestProcessingStrategyServantActivator (void)
+    {
+    }
+
+    void
+    RequestProcessingStrategyServantActivator::strategy_cleanup (
+      ACE_ENV_SINGLE_ARG_DECL)
+    {
+      {
+        Non_Servant_Upcall non_servant_upcall (*this->poa_);
+        ACE_UNUSED_ARG (non_servant_upcall);
+
+        this->servant_activator_ =
+          PortableServer::ServantActivator::_nil ();
+      }
+
+      RequestProcessingStrategy::strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
+    }
+
+    PortableServer::ServantManager_ptr
+    RequestProcessingStrategyServantActivator::get_servant_manager (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongPolicy))
+    {
+      return PortableServer::ServantManager::_duplicate (this->servant_activator_.in ());
+    }
+
+    void
+    RequestProcessingStrategyServantActivator::set_servant_manager (
+      PortableServer::ServantManager_ptr imgr
+      ACE_ENV_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException,
+                       PortableServer::POA::WrongPolicy))
+    {
+      // This operation sets the default servant manager associated with the
+      // POA. This operation may only be invoked once after a POA has been
+      // created. Attempting to set the servant manager after one has already
+      // been set will result in the BAD_INV_ORDER system exception with
+      // standard minor code 6 being raised (see 11.3.9.12 of the corba spec)
+      if (!CORBA::is_nil (this->servant_activator_.in ()))
+        {
+          ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 6,
+                                           CORBA::COMPLETED_NO));
+        }
+
+      this->servant_activator_ =
+        PortableServer::ServantActivator::_narrow (imgr
+                                                   ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      this->validate_servant_manager (this->servant_activator_.in ()
+                                      ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+
+    TAO_SERVANT_LOCATION
+    RequestProcessingStrategyServantActivator::locate_servant (
+      const PortableServer::ObjectId &system_id,
+      PortableServer::Servant &servant
+      ACE_ENV_ARG_DECL)
+    {
+      TAO_SERVANT_LOCATION location = TAO_SERVANT_NOT_FOUND;
+
+      location = this->poa_->servant_present (system_id,
+                                              servant
+                                              ACE_ENV_ARG_PARAMETER);
+
+      if (location == TAO_SERVANT_NOT_FOUND)
+        {
+          if (!CORBA::is_nil (this->servant_activator_.in ()))
+            {
+              location = TAO_SERVANT_MANAGER;
+            }
+        }
+
+      return location;
+    }
+
+    PortableServer::Servant
+    RequestProcessingStrategyServantActivator::locate_servant (
+      const char * /*operation*/,
+      const PortableServer::ObjectId &system_id,
+      TAO::Portable_Server::Servant_Upcall &servant_upcall,
+      TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
+      int &wait_occurred_restart_call
+      ACE_ENV_ARG_DECL)
+    {
+      PortableServer::Servant servant = 0;
+
+      servant = this->poa_->find_servant (system_id,
+                                          servant_upcall,
+                                          poa_current_impl
+                                          ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      if (servant != 0)
+        {
+          return servant;
+        }
+
+      // If the POA has the USE_SERVANT_MANAGER policy, a servant manager
+      // has been associated with the POA so the POA will invoke incarnate
+      // or preinvoke on it to find a servant that may handle the
+      // request. (The choice of method depends on the NON_RETAIN or
+      // RETAIN policy of the POA.) If no servant manager has been
+      // associated with the POA, the POA raises the OBJ_ADAPTER system
+      // exception.
+      //
+      // If a servant manager is located and invoked, but the servant
+      // manager is not directly capable of incarnating the object, it
+      // (the servant manager) may deal with the circumstance in a variety
+      // of ways, all of which are the application's responsibility.  Any
+      // system exception raised by the servant manager will be returned
+      // to the client in the reply. In addition to standard CORBA
+      // exceptions, a servant manager is capable of raising a
+      // ForwardRequest exception. This exception includes an object
+      // reference.
+      //
+
+      this->validate_servant_manager (this->servant_activator_.in ()
+                                      ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      servant =
+        this->incarnate_servant (poa_current_impl.object_id ()
+                                 ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      // If the incarnate operation returns a servant that is
+      // already active for a different Object Id and if the POA
+      // also has the UNIQUE_ID policy, the incarnate has violated
+      // the POA policy and is considered to be in error. The POA
+      // will raise an OBJ_ADAPTER system exception for the
+      // request.
+      bool may_activate =
+        this->poa_->is_servant_activation_allowed (servant,
+                                                   wait_occurred_restart_call);
+
+      if (!may_activate)
+        {
+          // If we are not allowed to activate the servant, throw an exception
+          // etherealize is not called because the servant is never added to
+          // the active object map
+          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
+                            0);
+        }
+
+      // The POA enters the returned Servant value into the Active
+      // Object Map so that subsequent requests with the same
+      // ObjectId value will be delivered directly to that servant
+      // without invoking the servant manager.  Only run if there
+      // are no errors or if a restart is not required.
+      if (!wait_occurred_restart_call)
+        {
+          int result =
+            this->poa_->
+              rebind_using_user_id_and_system_id (servant,
+                                                  poa_current_impl.object_id (),
+                                                  system_id,
+                                                  servant_upcall);
+          if (result != 0)
+            {
+              // Throw an exception, etherealize is not called because servant
+              // is not added to the active object map
+              ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
+                                0);
+            }
+
+          // Increment the reference count on the servant upcall.
+          servant_upcall.increment_servant_refcount ();
+        }
+      else
+        {
+          CORBA::Boolean cleanup_in_progress = 0;
+          this->etherealize_servant (poa_current_impl.object_id (),
+                                     servant,
+                                     cleanup_in_progress
+                                     ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
+
+          // We ended up waiting on a condition variable, the
+          // POA state may have changed while we are waiting.
+          // Therefore, we need to restart this call.
+          return 0;
+        }
+
+      // Success
+      return servant;
+    }
+
+    void
+    RequestProcessingStrategyServantActivator::etherealize_servant (
+      const PortableServer::ObjectId& object_id,
+      PortableServer::Servant servant,
+      CORBA::Boolean cleanup_in_progress
+      ACE_ENV_ARG_DECL)
+    {
+      CORBA::Boolean remaining_activations =
+        this->poa_->servant_has_remaining_activations (servant);
+
+      // ATTENTION: Trick locking here, see class header for details
+      Non_Servant_Upcall non_servant_upcall (*this->poa_);
+      ACE_UNUSED_ARG (non_servant_upcall);
+
+      // @todo This is not according to the spec. According to 11.3.6.2 at the
+      // end when etherealize returns a system exception the POA ignores the
+      // exception
+      this->servant_activator_->etherealize (object_id,
+                                             this->poa_,
+                                             servant,
+                                             cleanup_in_progress,
+                                             remaining_activations
+                                             ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+
+    PortableServer::Servant
+    RequestProcessingStrategyServantActivator::incarnate_servant (
+      const PortableServer::ObjectId& object_id
+      ACE_ENV_ARG_DECL)
+    {
+      PortableServer::Servant servant = 0;
+
+      // ATTENTION: Trick locking here, see class header for details
+      Non_Servant_Upcall non_servant_upcall (*this->poa_);
+      ACE_UNUSED_ARG (non_servant_upcall);
+
+      // @@
+      // Invocations of incarnate on the servant manager are serialized.
+      // Invocations of etherealize on the servant manager are serialized.
+      // Invocations of incarnate and etherealize on the servant manager are mutually exclusive.
+      servant = this->servant_activator_->incarnate (object_id,
+                                                     this->poa_
+                                                     ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      if (servant == 0)
+        {
+          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 7,
+                                                CORBA::COMPLETED_NO),
+                                                0);
+        }
+      else
+        {
+          return servant;
+        }
+    }
+
+    void
+    RequestProcessingStrategyServantActivator::cleanup_servant (
+      PortableServer::Servant servant,
+      const PortableServer::ObjectId &user_id
+      ACE_ENV_ARG_DECL)
+    {
+      // If a servant manager is associated with the POA,
+      // ServantLocator::etherealize will be invoked with the oid and the
+      // servant. (The deactivate_object operation does not wait for the
+      // etherealize operation to complete before deactivate_object
+      // returns.)
+      //
+      // Note: If the servant associated with the oid is serving multiple
+      // Object Ids, ServantLocator::etherealize may be invoked multiple
+      // times with the same servant when the other objects are
+      // deactivated. It is the responsibility of the object
+      // implementation to refrain from destroying the servant while it is
+      // active with any Id.
+
+      // If the POA has no ServantActivator associated with it, the POA
+      // implementation calls _remove_ref when all operation invocations
+      // have completed. If there is a ServantActivator, the Servant is
+      // consumed by the call to ServantActivator::etherealize instead.
+
+      // @bala, is this order correct, see 11.3.9.17 of the spec, it
+      // says first remove from the map, then etherealize. not the
+      // other way around
+      // @@ Johnny, you are right! This will not show up until a
+      // thread is trying to activate the object in another thread
+      // using activate_object_with_id (). A test case is a must for
+      // atleast this issue.
+      if (servant)
+        {
+          if (this->etherealize_objects_ &&
+              !CORBA::is_nil (this->servant_activator_.in ()))
+            {
+              this->etherealize_servant (user_id,
+                                         servant,
+                                         this->poa_->cleanup_in_progress ()
+                                         ACE_ENV_ARG_PARAMETER);
+              ACE_CHECK;
+            }
+          else
+            {
+              // ATTENTION: Trick locking here, see class header for details
+              Non_Servant_Upcall non_servant_upcall (*this->poa_);
+              ACE_UNUSED_ARG (non_servant_upcall);
+
+              servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
+              ACE_CHECK;
+            }
+        }
+
+      // This operation causes the association of the Object Id specified
+      // by the oid parameter and its servant to be removed from the
+      // Active Object Map.
+      int result = this->poa_->unbind_using_user_id (user_id);
+
+      if (result != 0)
+        ACE_THROW (CORBA::OBJ_ADAPTER ());
+    }
+
+    void
+    RequestProcessingStrategyServantActivator::etherealize_objects (
+      CORBA::Boolean etherealize_objects)
+    {
+      this->etherealize_objects_ = etherealize_objects;
+    }
+
+    void
+    RequestProcessingStrategyServantActivator::post_invoke_servant_cleanup(
+      const PortableServer::ObjectId &/*system_id*/,
+      const TAO::Portable_Server::Servant_Upcall &/*servant_upcall*/)
+    {
+    }
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h
new file mode 100644
index 00000000000..c5367708484
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h
@@ -0,0 +1,104 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file RequestProcessingStrategyServantActivator.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_REQUESTPROCESSINGSTRATEGYSERVANTACTIVATOR_H
+#define TAO_REQUESTPROCESSINGSTRATEGYSERVANTACTIVATOR_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "RequestProcessingStrategyServantManager.h"
+#include "Servant_Location.h"
+#include "PortableServer.h"
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace PortableServer
+{
+  class ServantActivator;
+
+  typedef ServantActivator *ServantActivator_ptr;
+  typedef TAO_Objref_Var_T<ServantActivator> ServantActivator_var;
+}
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export RequestProcessingStrategyServantActivator
+      : public virtual RequestProcessingStrategyServantManager
+    {
+    public:
+      RequestProcessingStrategyServantActivator (void);
+
+      virtual ~RequestProcessingStrategyServantActivator (void);
+
+      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
+
+      PortableServer::ServantManager_ptr get_servant_manager (ACE_ENV_SINGLE_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongPolicy));
+
+      void set_servant_manager (PortableServer::ServantManager_ptr imgr
+                                ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongPolicy));
+
+      virtual TAO_SERVANT_LOCATION locate_servant (
+        const PortableServer::ObjectId &system_id,
+        PortableServer::Servant &servant
+        ACE_ENV_ARG_DECL);
+
+      virtual PortableServer::Servant locate_servant (
+        const char *operation,
+        const PortableServer::ObjectId &system_id,
+        TAO::Portable_Server::Servant_Upcall &servant_upcall,
+        TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
+        int &wait_occurred_restart_call
+        ACE_ENV_ARG_DECL);
+
+      virtual void cleanup_servant (
+        PortableServer::Servant servant,
+        const PortableServer::ObjectId &user_id
+        ACE_ENV_ARG_DECL);
+
+      virtual void etherealize_objects (CORBA::Boolean etherealize_objects);
+
+      virtual void post_invoke_servant_cleanup(
+        const PortableServer::ObjectId &system_id,
+        const TAO::Portable_Server::Servant_Upcall &servant_upcall);
+
+    private:
+      PortableServer::Servant incarnate_servant (
+        const PortableServer::ObjectId& object_id
+        ACE_ENV_ARG_DECL);
+
+      void etherealize_servant (const PortableServer::ObjectId& object_id,
+        PortableServer::Servant servant,
+        CORBA::Boolean cleanup_in_progress
+        ACE_ENV_ARG_DECL);
+
+    private:
+      PortableServer::ServantActivator_var servant_activator_;
+      CORBA::Boolean etherealize_objects_;
+    };
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_REQUESTPROCESSINGSTRATEGYSERVANTACTIVATOR_H */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFactoryImpl.cpp
new file mode 100644
index 00000000000..a3be603b455
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFactoryImpl.cpp
@@ -0,0 +1,92 @@
+// $Id$
+
+#include "RequestProcessingStrategyServantActivatorFactoryImpl.h"
+#include "RequestProcessingStrategy.h"
+#include "RequestProcessingStrategyServantActivator.h"
+#include "ace/Dynamic_Service.h"
+
+ACE_RCSID (PortableServer,
+           RequestProcessingStrategyServantActivatorFactoryImpl,
+           "$Id$")
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    RequestProcessingStrategyServantActivatorFactoryImpl::~RequestProcessingStrategyServantActivatorFactoryImpl (void)
+    {
+    }
+
+    RequestProcessingStrategy*
+    RequestProcessingStrategyServantActivatorFactoryImpl::create (
+      ::PortableServer::RequestProcessingPolicyValue value,
+      ::PortableServer::ServantRetentionPolicyValue srvalue)
+    {
+      RequestProcessingStrategy* strategy = 0;
+
+      switch (value)
+      {
+        case ::PortableServer::USE_SERVANT_MANAGER :
+        {
+          switch (srvalue)
+          {
+            case ::PortableServer::RETAIN :
+            {
+              ACE_NEW_RETURN (strategy, RequestProcessingStrategyServantActivator, 0);
+              break;
+            }
+            case ::PortableServer::NON_RETAIN :
+            {
+              ACE_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyServantActivatorFactoryImpl"));
+              break;
+            }
+          }
+          break;
+        }
+        default :
+        {
+          ACE_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyServantActivatorFactoryImpl"));
+          break;
+        }
+      }
+
+      return strategy;
+    }
+
+    void
+    RequestProcessingStrategyServantActivatorFactoryImpl::destroy (
+      RequestProcessingStrategy *strategy
+      ACE_ENV_ARG_DECL)
+    {
+      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+
+      delete strategy;
+    }
+
+    ACE_STATIC_SVC_DEFINE (
+        RequestProcessingStrategyServantActivatorFactoryImpl,
+        ACE_TEXT ("RequestProcessingStrategyServantActivatorFactory"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (RequestProcessingStrategyServantActivatorFactoryImpl),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+
+    ACE_FACTORY_DEFINE (TAO_PortableServer, RequestProcessingStrategyServantActivatorFactoryImpl)
+
+    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+    template class ACE_Dynamic_Service<RequestProcessingStrategyServantActivatorFactoryImpl>;
+
+    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+    #pragma instantiate ACE_Dynamic_Service<RequestProcessingStrategyServantActivatorFactoryImpl>
+
+    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFactoryImpl.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFactoryImpl.h
new file mode 100644
index 00000000000..3db0ec0043b
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFactoryImpl.h
@@ -0,0 +1,56 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file RequestProcessingStrategyServantActivatorFactoryImpl.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYSERVANTACTIVATORFACTORYIMPL_H
+#define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYSERVANTACTIVATORFACTORYIMPL_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Service_Config.h"
+#include "tao/PortableServer/RequestProcessingStrategyFactory.h"
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export RequestProcessingStrategyServantActivatorFactoryImpl
+       : public virtual RequestProcessingStrategyFactory
+    {
+    public:
+      virtual ~RequestProcessingStrategyServantActivatorFactoryImpl (void);
+
+      /// Create a new servant retention strategy
+      virtual RequestProcessingStrategy* create (
+        ::PortableServer::RequestProcessingPolicyValue value,
+        ::PortableServer::ServantRetentionPolicyValue srvalue);
+
+      virtual void destroy (
+        RequestProcessingStrategy *strategy
+        ACE_ENV_ARG_DECL);
+    };
+
+    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyServantActivatorFactoryImpl)
+    ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyServantActivatorFactoryImpl)
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYSERVANTACTIVATORFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
new file mode 100644
index 00000000000..8fa14b1cdd4
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
@@ -0,0 +1,259 @@
+// -*- C++ -*-
+
+#include "tao/ORB_Constants.h"
+#include "ServantLocatorC.h"
+#include "RequestProcessingStrategyServantLocator.h"
+#include "Root_POA.h"
+#include "POA_Current_Impl.h"
+#include "Servant_Upcall.h"
+#include "Non_Servant_Upcall.h"
+#include "Servant_Base.h"
+
+ACE_RCSID (PortableServer,
+           Request_Processing,
+           "$Id$")
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    RequestProcessingStrategyServantLocator::RequestProcessingStrategyServantLocator (void)
+    {
+    }
+
+    RequestProcessingStrategyServantLocator::~RequestProcessingStrategyServantLocator (void)
+    {
+    }
+
+    void
+    RequestProcessingStrategyServantLocator::strategy_cleanup(
+      ACE_ENV_SINGLE_ARG_DECL)
+    {
+      {
+        Non_Servant_Upcall non_servant_upcall (*this->poa_);
+        ACE_UNUSED_ARG (non_servant_upcall);
+
+        this->servant_locator_ = PortableServer::ServantLocator::_nil ();
+      }
+
+      RequestProcessingStrategy::strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
+    }
+
+    PortableServer::ServantManager_ptr
+    RequestProcessingStrategyServantLocator::get_servant_manager (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongPolicy))
+    {
+      return PortableServer::ServantManager::_duplicate (this->servant_locator_.in ());
+    }
+
+    void
+    RequestProcessingStrategyServantLocator::set_servant_manager (
+      PortableServer::ServantManager_ptr imgr
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongPolicy))
+    {
+      // This operation sets the default servant manager associated with the
+      // POA. This operation may only be invoked once after a POA has been
+      // created. Attempting to set the servant manager after one has already
+      // been set will result in the BAD_INV_ORDER system exception with
+      // standard minor code 6 being raised (see 11.3.9.12 of the corba spec)
+      if (!CORBA::is_nil (this->servant_locator_.in ()))
+        {
+          ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 6,
+                                           CORBA::COMPLETED_NO));
+        }
+
+      this->servant_locator_ = PortableServer::ServantLocator::_narrow (imgr
+                                                                        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      this->validate_servant_manager (this->servant_locator_.in () ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+
+    TAO_SERVANT_LOCATION
+    RequestProcessingStrategyServantLocator::locate_servant (
+      const PortableServer::ObjectId &system_id,
+      PortableServer::Servant &servant
+      ACE_ENV_ARG_DECL)
+    {
+      TAO_SERVANT_LOCATION location = TAO_SERVANT_NOT_FOUND;
+
+      location = this->poa_->servant_present (system_id,
+                                              servant
+                                              ACE_ENV_ARG_PARAMETER);
+
+      if (location == TAO_SERVANT_NOT_FOUND)
+        {
+          if (!CORBA::is_nil (this->servant_locator_.in ()))
+            {
+              location = TAO_SERVANT_MANAGER;
+            }
+        }
+
+      return location;
+    }
+
+    PortableServer::Servant
+    RequestProcessingStrategyServantLocator::locate_servant (
+      const char *operation,
+      const PortableServer::ObjectId &system_id,
+      TAO::Portable_Server::Servant_Upcall &servant_upcall,
+      TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
+      int &/*wait_occurred_restart_call*/
+      ACE_ENV_ARG_DECL)
+    {
+      PortableServer::Servant servant = 0;
+
+      servant = this->poa_->find_servant (system_id,
+                                          servant_upcall,
+                                          poa_current_impl
+                                          ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      if (servant != 0)
+        {
+          return servant;
+        }
+
+      // If the POA has the USE_SERVANT_MANAGER policy, a servant manager
+      // has been associated with the POA so the POA will invoke incarnate
+      // or preinvoke on it to find a servant that may handle the
+      // request. (The choice of method depends on the NON_RETAIN or
+      // RETAIN policy of the POA.) If no servant manager has been
+      // associated with the POA, the POA raises the OBJ_ADAPTER system
+      // exception.
+      //
+      // If a servant manager is located and invoked, but the servant
+      // manager is not directly capable of incarnating the object, it
+      // (the servant manager) may deal with the circumstance in a variety
+      // of ways, all of which are the application's responsibility.  Any
+      // system exception raised by the servant manager will be returned
+      // to the client in the reply. In addition to standard CORBA
+      // exceptions, a servant manager is capable of raising a
+      // ForwardRequest exception. This exception includes an object
+      // reference.
+      //
+
+      this->validate_servant_manager (this->servant_locator_.in () ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      // No serialization of invocations of preinvoke or
+      // postinvoke may be assumed; there may be multiple
+      // concurrent invocations of preinvoke for the same
+      // ObjectId.
+      //
+      // The same thread will be used to preinvoke the object,
+      // process the request, and postinvoke the object.
+
+      // @@ Note that it is possible for some other thread to
+      // reset the servant locator once the lock is released.
+      // However, this possiblility also exists for postinvoke()
+      // which is also called outside the lock.
+
+      // Release the object adapter lock.
+      this->poa_->object_adapter().lock ().release ();
+
+      // We have released the object adapter lock.  Record this
+      // for later use.
+      servant_upcall.state (TAO::Portable_Server::Servant_Upcall::OBJECT_ADAPTER_LOCK_RELEASED);
+
+      PortableServer::ServantLocator::Cookie cookie = 0;
+      servant =
+        this->servant_locator_->preinvoke (poa_current_impl.object_id (),
+                                           this->poa_,
+                                           operation,
+                                           cookie
+                                           ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      if (servant == 0)
+        {
+          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 7,
+                                                CORBA::COMPLETED_NO),
+                                                0);
+        }
+
+      // Remember the cookie
+      servant_upcall.locator_cookie (cookie);
+
+      // Remember operation name.
+      servant_upcall.operation (operation);
+
+      // Success
+      return servant;
+    }
+
+    void
+    RequestProcessingStrategyServantLocator::cleanup_servant (
+      PortableServer::Servant servant,
+      const PortableServer::ObjectId &user_id
+      ACE_ENV_ARG_DECL)
+    {
+      if (servant)
+        {
+          // ATTENTION: Trick locking here, see class header for details
+          Non_Servant_Upcall non_servant_upcall (*this->poa_);
+          ACE_UNUSED_ARG (non_servant_upcall);
+
+          servant->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+
+      // This operation causes the association of the Object Id specified
+      // by the oid parameter and its servant to be removed from the
+      // Active Object Map.
+      int result = this->poa_->unbind_using_user_id (user_id);
+
+      if (result != 0)
+        {
+          ACE_THROW (CORBA::OBJ_ADAPTER ());
+        }
+    }
+
+    void
+    RequestProcessingStrategyServantLocator::etherealize_objects (
+      CORBA::Boolean /*etherealize_objects*/)
+    {
+    }
+
+    void
+    RequestProcessingStrategyServantLocator::post_invoke_servant_cleanup(
+      const PortableServer::ObjectId &system_id,
+      const TAO::Portable_Server::Servant_Upcall &servant_upcall)
+    {
+      // @todo This method seems to misbehave according to the corba spec, see
+      // section 11.3.7.2. It says that when postinvoke raises an system
+      // exception the methods normal return is overrriden, the request completes
+      // with the exception
+
+      if (!CORBA::is_nil (this->servant_locator_.in ()))
+        {
+          ACE_DECLARE_NEW_CORBA_ENV;
+          ACE_TRY
+            {
+              servant_locator_->postinvoke (system_id,
+                                            this->poa_,
+                                            servant_upcall.operation (),
+                                            servant_upcall.locator_cookie (),
+                                            servant_upcall.servant ()
+                                            ACE_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+            }
+          ACE_CATCHANY
+            {
+              // Ignore errors from servant locator ....
+            }
+          ACE_ENDTRY;
+        }
+    }
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h
new file mode 100644
index 00000000000..6c9fd9c7439
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h
@@ -0,0 +1,95 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file RequestProcessingStrategyServantLocator.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_REQUESTPROCESSINGSTRATEGYSERVANTLOCATOR_H
+#define TAO_REQUESTPROCESSINGSTRATEGYSERVANTLOCATOR_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "RequestProcessingStrategyServantManager.h"
+#include "Servant_Location.h"
+#include "PortableServer.h"
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace PortableServer
+{
+  class ServantLocator;
+
+  typedef ServantLocator *ServantLocator_ptr;
+  typedef TAO_Objref_Var_T<ServantLocator> ServantLocator_var;
+}
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export RequestProcessingStrategyServantLocator
+      : public virtual RequestProcessingStrategyServantManager
+    {
+    public:
+      RequestProcessingStrategyServantLocator (void);
+
+      virtual ~RequestProcessingStrategyServantLocator (void);
+
+      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
+
+      PortableServer::ServantManager_ptr get_servant_manager (
+        ACE_ENV_SINGLE_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::WrongPolicy));
+
+      void set_servant_manager (
+        PortableServer::ServantManager_ptr imgr
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::WrongPolicy));
+
+      virtual TAO_SERVANT_LOCATION locate_servant (
+        const PortableServer::ObjectId &system_id,
+        PortableServer::Servant &servant
+        ACE_ENV_ARG_DECL);
+
+      virtual void post_invoke_servant_cleanup(
+        const PortableServer::ObjectId &system_id,
+        const TAO::Portable_Server::Servant_Upcall &servant_upcall);
+
+      virtual PortableServer::Servant locate_servant (
+        const char *operation,
+        const PortableServer::ObjectId &system_id,
+        TAO::Portable_Server::Servant_Upcall &servant_upcall,
+        TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
+        int &wait_occurred_restart_call
+        ACE_ENV_ARG_DECL);
+
+      virtual void cleanup_servant (
+        PortableServer::Servant servant,
+        const PortableServer::ObjectId &user_id
+        ACE_ENV_ARG_DECL);
+
+      virtual void etherealize_objects (CORBA::Boolean etherealize_objects);
+
+    private:
+      PortableServer::ServantLocator_var servant_locator_;
+    };
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_REQUESTPROCESSINGSTRATEGYSERVANTLOCATOR_H */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFactoryImpl.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFactoryImpl.cpp
new file mode 100644
index 00000000000..b456dd43ff6
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFactoryImpl.cpp
@@ -0,0 +1,93 @@
+// $Id$
+
+#include "RequestProcessingStrategyServantLocatorFactoryImpl.h"
+#include "RequestProcessingStrategy.h"
+#include "RequestProcessingStrategyServantLocator.h"
+#include "ace/Dynamic_Service.h"
+
+ACE_RCSID (PortableServer,
+           RequestProcessingStrategyServantLocatorFactoryImpl,
+           "$Id$")
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    RequestProcessingStrategyServantLocatorFactoryImpl::~RequestProcessingStrategyServantLocatorFactoryImpl (void)
+    {
+    }
+
+    RequestProcessingStrategy*
+    RequestProcessingStrategyServantLocatorFactoryImpl::create (
+      ::PortableServer::RequestProcessingPolicyValue value,
+      ::PortableServer::ServantRetentionPolicyValue srvalue)
+    {
+      RequestProcessingStrategy* strategy = 0;
+
+      switch (value)
+      {
+        case ::PortableServer::USE_SERVANT_MANAGER :
+        {
+          switch (srvalue)
+          {
+            case ::PortableServer::RETAIN :
+            {
+              ACE_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyServantLocatorFactoryImpl"));
+              break;
+            }
+            case ::PortableServer::NON_RETAIN :
+            {
+              ACE_NEW_RETURN (strategy, RequestProcessingStrategyServantLocator, 0);
+              break;
+            }
+          }
+          break;
+        }
+        default :
+        {
+          ACE_ERROR ((LM_ERROR, "Incorrect type in RequestProcessingStrategyServantLocatorFactoryImpl"));
+          break;
+        }
+      }
+
+      return strategy;
+    }
+
+    void
+    RequestProcessingStrategyServantLocatorFactoryImpl::destroy (
+      RequestProcessingStrategy *strategy
+      ACE_ENV_ARG_DECL)
+    {
+      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+
+      delete strategy;
+    }
+
+    ACE_STATIC_SVC_DEFINE (
+        RequestProcessingStrategyServantLocatorFactoryImpl,
+        ACE_TEXT ("RequestProcessingStrategyServantLocatorFactory"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (RequestProcessingStrategyServantLocatorFactoryImpl),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+
+    ACE_FACTORY_DEFINE (TAO_PortableServer, RequestProcessingStrategyServantLocatorFactoryImpl)
+
+    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+    template class ACE_Dynamic_Service<RequestProcessingStrategyServantLocatorFactoryImpl>;
+
+    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+    #pragma instantiate ACE_Dynamic_Service<RequestProcessingStrategyServantLocatorFactoryImpl>
+
+    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFactoryImpl.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFactoryImpl.h
new file mode 100644
index 00000000000..dc0d83300a2
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFactoryImpl.h
@@ -0,0 +1,56 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file RequestProcessingStrategyServantLocatorFactoryImpl.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYSERVANTLOCATORFACTORYIMPL_H
+#define TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYSERVANTLOCATORFACTORYIMPL_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Service_Config.h"
+#include "tao/PortableServer/RequestProcessingStrategyFactory.h"
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export RequestProcessingStrategyServantLocatorFactoryImpl
+       : public virtual RequestProcessingStrategyFactory
+    {
+    public:
+      virtual ~RequestProcessingStrategyServantLocatorFactoryImpl (void);
+
+      /// Create a new servant retention strategy
+      virtual RequestProcessingStrategy* create (
+        ::PortableServer::RequestProcessingPolicyValue value,
+        ::PortableServer::ServantRetentionPolicyValue srvalue);
+
+      virtual void destroy (
+        RequestProcessingStrategy *strategy
+        ACE_ENV_ARG_DECL);
+    };
+
+    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, RequestProcessingStrategyServantLocatorFactoryImpl)
+    ACE_FACTORY_DECLARE (TAO_PortableServer, RequestProcessingStrategyServantLocatorFactoryImpl)
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_REQUESTPROCESSINGSTRATEGYSERVANTLOCATORFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
new file mode 100644
index 00000000000..c73b1e4bd39
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
@@ -0,0 +1,102 @@
+// -*- C++ -*-
+
+#include "RequestProcessingStrategyServantManager.h"
+#include "ServantManagerC.h"
+#include "Root_POA.h"
+#include "tao/ORB_Constants.h"
+
+ACE_RCSID (PortableServer,
+           Request_Processing,
+           "$Id$")
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    RequestProcessingStrategyServantManager::RequestProcessingStrategyServantManager (void)
+    {
+    }
+
+    RequestProcessingStrategyServantManager::~RequestProcessingStrategyServantManager (void)
+    {
+    }
+
+    PortableServer::Servant
+    RequestProcessingStrategyServantManager::get_servant (
+      ACE_ENV_SINGLE_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongPolicy))
+    {
+      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
+                        0);
+    }
+
+    void
+    RequestProcessingStrategyServantManager::set_servant (
+      PortableServer::Servant servant
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongPolicy))
+    {
+      ACE_UNUSED_ARG (servant);
+
+      ACE_THROW (PortableServer::POA::WrongPolicy ());
+    }
+
+    void
+    RequestProcessingStrategyServantManager::validate_servant_manager (
+      PortableServer::ServantManager_ptr servant_manager
+      ACE_ENV_ARG_DECL)
+    {
+      // When no servant manager is set, give an exception with minor code 4,
+      // see 11.3.8.6 of the corba spec
+      if (CORBA::is_nil (servant_manager))
+        {
+          ACE_THROW (CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 4,
+                                         CORBA::COMPLETED_NO));
+        }
+    }
+
+    PortableServer::Servant
+    RequestProcessingStrategyServantManager::system_id_to_servant (
+      const PortableServer::ObjectId &system_id
+      ACE_ENV_ARG_DECL)
+    {
+      return this->poa_->find_servant (system_id
+                                       ACE_ENV_ARG_PARAMETER);
+    }
+
+    PortableServer::ObjectId *
+    RequestProcessingStrategyServantManager::servant_to_id (
+      PortableServer::Servant servant
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::ServantNotActive,
+                         PortableServer::POA::WrongPolicy))
+    {
+      return this->poa_->servant_to_user_id (servant ACE_ENV_ARG_PARAMETER);
+    }
+
+    PortableServer::Servant
+    RequestProcessingStrategyServantManager::id_to_servant (
+      const PortableServer::ObjectId &id
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::ObjectNotActive,
+                         PortableServer::POA::WrongPolicy))
+    {
+      return this->poa_->user_id_to_servant_i (id ACE_ENV_ARG_PARAMETER);
+    }
+
+    ::PortableServer::RequestProcessingPolicyValue
+    RequestProcessingStrategyServantManager::type() const
+    {
+      return ::PortableServer::USE_SERVANT_MANAGER;
+    }
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h
new file mode 100644
index 00000000000..a00a20b1b08
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h
@@ -0,0 +1,79 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file RequestProcessingStrategyServantManager.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_REQUESTPROCESSINGSTRATEGYSERVANTMANAGER_H
+#define TAO_REQUESTPROCESSINGSTRATEGYSERVANTMANAGER_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "RequestProcessingStrategy.h"
+#include "Servant_Location.h"
+#include "PortableServer.h"
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export RequestProcessingStrategyServantManager
+      : public virtual RequestProcessingStrategy
+    {
+    public:
+      RequestProcessingStrategyServantManager (void);
+
+      virtual ~RequestProcessingStrategyServantManager (void);
+
+      PortableServer::Servant get_servant (ACE_ENV_SINGLE_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongPolicy));
+
+      void set_servant (PortableServer::Servant servant ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongPolicy));
+
+      void validate_servant_manager (
+        PortableServer::ServantManager_ptr servant_manager
+        ACE_ENV_ARG_DECL);
+
+      virtual PortableServer::Servant system_id_to_servant (
+        const PortableServer::ObjectId &system_id
+        ACE_ENV_ARG_DECL);
+
+      virtual PortableServer::Servant id_to_servant (
+        const PortableServer::ObjectId &id
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::ObjectNotActive,
+                           PortableServer::POA::WrongPolicy));
+
+      virtual PortableServer::ObjectId *servant_to_id (
+        PortableServer::Servant servant
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::ServantNotActive,
+                           PortableServer::POA::WrongPolicy));
+
+      virtual ::PortableServer::RequestProcessingPolicyValue type() const;
+    };
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_REQUESTPROCESSINGSTRATEGYSERVANTMANAGER_H */
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp
new file mode 100644
index 00000000000..b37e4a9d9e8
--- /dev/null
+++ b/TAO/tao/PortableServer/Root_POA.cpp
@@ -0,0 +1,2865 @@
+// $Id$
+
+#include "Root_POA.h"
+#include "Regular_POA.h"
+
+#include "ThreadPolicy.h"
+#include "LifespanPolicy.h"
+#include "IdAssignmentPolicy.h"
+#include "IdUniquenessPolicy.h"
+#include "ImplicitActivationPolicy.h"
+#include "RequestProcessingPolicy.h"
+#include "ServantRetentionPolicy.h"
+#include "Active_Object_Map.h"
+#include "Default_Acceptor_Filter.h"
+#include "ORT_Adapter.h"
+#include "ORT_Adapter_Factory.h"
+#include "Policy_Creator_T.h"
+#include "POA_Current_Impl.h"
+#include "Servant_Upcall.h"
+#include "AdapterActivatorC.h"
+#include "Non_Servant_Upcall.h"
+#include "POAManager.h"
+#include "ServantManagerC.h"
+#include "poa_macros.h"
+#include "POA_Guard.h"
+#include "Creation_Time.h"
+#include "RequestProcessingStrategy.h"
+#include "LifespanStrategy.h"
+#include "IdUniquenessStrategy.h"
+#include "IdAssignmentStrategy.h"
+#include "ServantRetentionStrategy.h"
+#include "ImplicitActivationStrategy.h"
+#include "ThreadStrategy.h"
+
+#include "tao/StringSeqC.h"
+#include "tao/PortableInterceptorC.h"
+#include "tao/PolicyC.h"
+#include "tao/ORB_Core.h"
+#include "tao/ORB.h"
+#include "tao/Server_Strategy_Factory.h"
+#include "tao/Acceptor_Registry.h"
+#include "tao/Thread_Lane_Resources.h"
+#include "tao/Environment.h"
+#include "tao/Exception.h"
+#include "tao/Stub.h"
+#include "tao/Profile.h"
+#include "tao/TSS_Resources.h"
+#include "tao/IORInterceptor_Adapter.h"
+#include "tao/debug.h"
+
+// auto_ptr class
+#include "ace/Auto_Ptr.h"
+#include "ace/Dynamic_Service.h"
+#include "ace/OS_NS_netdb.h"
+#include "ace/OS_NS_string.h"
+#include "ace/OS_NS_unistd.h"
+
+#if !defined (__ACE_INLINE__)
+# include "Root_POA.inl"
+#endif /* ! __ACE_INLINE__ */
+
+ACE_RCSID (PortableServer,
+           POA,
+             "$Id$")
+
+// This is the TAO_Object_key-prefix that is appended to all TAO Object keys.
+// It's an array of octets representing ^t^a^o/0 in octal.
+CORBA::Octet const
+TAO_Root_POA::objectkey_prefix [TAO_Root_POA::TAO_OBJECTKEY_PREFIX_SIZE] = {
+  024, // octal for ^t
+  001, // octal for ^a
+  017, // octal for ^o
+  000
+};
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+PortableServer::ThreadPolicy_ptr
+TAO_Root_POA::create_thread_policy (PortableServer::ThreadPolicyValue value
+                                    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  TAO::Portable_Server::ThreadPolicy *policy = 0;
+  ACE_NEW_THROW_EX (policy,
+                    TAO::Portable_Server::ThreadPolicy (value),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (PortableServer::ThreadPolicy::_nil ());
+
+  return policy;
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+PortableServer::LifespanPolicy_ptr
+TAO_Root_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value
+                                      ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  TAO::Portable_Server::LifespanPolicy *policy = 0;
+  ACE_NEW_THROW_EX (policy,
+                    TAO::Portable_Server::LifespanPolicy (value),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (PortableServer::LifespanPolicy::_nil ());
+
+  return policy;
+}
+
+PortableServer::IdUniquenessPolicy_ptr
+TAO_Root_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue value
+                                           ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  TAO::Portable_Server::IdUniquenessPolicy *policy = 0;
+  ACE_NEW_THROW_EX (policy,
+                    TAO::Portable_Server::IdUniquenessPolicy (value),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (PortableServer::IdUniquenessPolicy::_nil ());
+
+  return policy;
+}
+
+PortableServer::IdAssignmentPolicy_ptr
+TAO_Root_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue value
+                                           ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  TAO::Portable_Server::IdAssignmentPolicy *policy = 0;
+  ACE_NEW_THROW_EX (policy,
+                    TAO::Portable_Server::IdAssignmentPolicy (value),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (PortableServer::IdAssignmentPolicy::_nil ());
+
+  return policy;
+}
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+PortableServer::ImplicitActivationPolicy_ptr
+TAO_Root_POA::create_implicit_activation_policy (PortableServer::ImplicitActivationPolicyValue value
+                                                 ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  TAO::Portable_Server::ImplicitActivationPolicy *policy = 0;
+  ACE_NEW_THROW_EX (policy,
+                    TAO::Portable_Server::ImplicitActivationPolicy (value),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (PortableServer::ImplicitActivationPolicy::_nil ());
+
+  return policy;
+}
+
+PortableServer::ServantRetentionPolicy_ptr
+TAO_Root_POA::create_servant_retention_policy (PortableServer::ServantRetentionPolicyValue value
+                                               ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  TAO::Portable_Server::ServantRetentionPolicy *policy = 0;
+  ACE_NEW_THROW_EX (policy,
+                    TAO::Portable_Server::ServantRetentionPolicy (value),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (PortableServer::ServantRetentionPolicy::_nil ());
+
+  return policy;
+}
+
+PortableServer::RequestProcessingPolicy_ptr
+TAO_Root_POA::create_request_processing_policy (PortableServer::RequestProcessingPolicyValue value
+                                                ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  TAO::Portable_Server::RequestProcessingPolicy *policy = 0;
+  ACE_NEW_THROW_EX (policy,
+                    TAO::Portable_Server::RequestProcessingPolicy (value),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (PortableServer::RequestProcessingPolicy::_nil ());
+
+  return policy;
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+void
+TAO_Root_POA::set_obj_ref_factory (
+  PortableInterceptor::ObjectReferenceFactory *current_factory
+  ACE_ENV_ARG_DECL)
+{
+  if (this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER))
+    {
+      // Activate a different factory
+      this->ort_adapter_->set_obj_ref_factory (current_factory
+                                               ACE_ENV_ARG_PARAMETER);
+    }
+}
+
+TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name,
+                            TAO_POA_Manager &poa_manager,
+                            const TAO_POA_Policy_Set &policies,
+                            TAO_Root_POA *parent,
+                            ACE_Lock &lock,
+                            TAO_SYNCH_MUTEX &thread_lock,
+                            TAO_ORB_Core &orb_core,
+                            TAO_Object_Adapter *object_adapter
+                            ACE_ENV_ARG_DECL)
+  : name_ (name),
+    poa_manager_ (poa_manager),
+    tagged_component_ (),
+    tagged_component_id_ (),
+    profile_id_array_ (0),
+    policies_ (policies),
+    ort_adapter_ (0),
+    adapter_state_ (PortableInterceptor::HOLDING),
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+    adapter_activator_ (),
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+    children_ (),
+    lock_ (lock),
+    orb_core_ (orb_core),
+    object_adapter_ (object_adapter),
+    cleanup_in_progress_ (0),
+    outstanding_requests_ (0),
+    outstanding_requests_condition_ (thread_lock),
+    wait_for_completion_pending_ (0),
+    waiting_destruction_ (0),
+    servant_deactivation_condition_ (thread_lock),
+    caller_key_to_object_ (0),
+    servant_for_key_to_object_ (0)
+{
+  // Parse the policies that are used in the critical path in
+  // a cache.
+  this->cached_policies_.update (this->policies_
+                                 ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+  // If this is the RootPOA, set the value of the ImplicitActivationPolicy
+  // to IMPLICIT_ACTIVATION since it is impossible to pass the policy
+  // as it is not compiled into the library.
+  //
+  // If the ImplicitActivationPolicy policy is ever compiled in the
+  // minimum POA builds, remove this code and remove the guards
+  // in Object_Adapter.cpp when changing the default policy for the
+  // RootPOA.
+  if (ACE_OS::strcmp (this->name_.c_str (),
+                      TAO_DEFAULT_ROOTPOA_NAME) == 0)
+    {
+      this->cached_policies_.implicit_activation
+        (PortableServer::IMPLICIT_ACTIVATION);
+    }
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+  // Set the active strategies to be used by this POA
+  this->active_policy_strategies_.update (this->cached_policies_,
+                                          this
+                                          ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // Set the folded name of this POA.
+  this->set_folded_name (parent);
+
+  // Register self with manager.
+  int result = this->poa_manager_.register_poa (this);
+  if (result != 0)
+    {
+      ACE_THROW (CORBA::OBJ_ADAPTER ());
+    }
+
+  // Add self to Object Adapter class.
+  result =
+    this->object_adapter ().bind_poa (this->folded_name_,
+                                      this,
+                                      this->system_name_.out ());
+  if (result != 0)
+    {
+      // Remove from POA Manager in case of errors. No checks of
+      // further errors...
+      this->poa_manager_.remove_poa (this);
+
+      ACE_THROW (CORBA::OBJ_ADAPTER ());
+    }
+
+  // Set the id for this POA.
+  this->set_id (parent);
+
+  // Notify the Lifespan strategy of our startup
+  ACE_TRY
+    {
+      this->active_policy_strategies_.lifespan_strategy()->notify_startup (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      this->poa_manager_.remove_poa (this);
+      this->object_adapter ().unbind_poa (this,
+                                          this->folded_name_,
+                                          this->system_name_.in ());
+      ACE_RE_THROW;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK;
+}
+
+TAO_Root_POA::~TAO_Root_POA (void)
+{
+}
+
+void
+TAO_Root_POA::complete_destruction_i (ACE_ENV_SINGLE_ARG_DECL)
+{
+  // No longer awaiting destruction.
+  this->waiting_destruction_ = 0;
+
+  // Remove POA from the POAManager.
+  int result = this->poa_manager_.remove_poa (this);
+
+  if (result != 0)
+    ACE_THROW (CORBA::OBJ_ADAPTER ());
+
+  // Remove POA from the Object Adapter.
+  result = this->object_adapter ().unbind_poa (this,
+                                               this->folded_name_,
+                                               this->system_name_.in ());
+  if (result != 0)
+    ACE_THROW (CORBA::OBJ_ADAPTER ());
+
+  // Cleanup all strategies
+  this->active_policy_strategies_.cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // Forced cleanup.  The new memory management scheme is evil and can
+  // lead to reference deadlock, i.e., POA holds object A, but POA
+  // cannot die because object A hold POA.
+  {
+    //
+    // If new things are added to this cleanup code, make sure to move
+    // the minimum CORBA #define after the declaration of
+    // <non_servant_upcall>.
+    //
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+    // ATTENTION: Trick locking here, see class header for details
+    TAO::Portable_Server::Non_Servant_Upcall non_servant_upcall (*this);
+    ACE_UNUSED_ARG (non_servant_upcall);
+
+    this->adapter_activator_ = PortableServer::AdapterActivator::_nil ();
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+  }
+
+  CORBA::release (this);
+}
+
+PortableServer::POA_ptr
+TAO_Root_POA::create_POA_i (const char *adapter_name,
+                            PortableServer::POAManager_ptr poa_manager,
+                            const CORBA::PolicyList &policies
+                            ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::AdapterAlreadyExists,
+                   PortableServer::POA::InvalidPolicy))
+{
+  // Initialize a TAO_POA_Policy_Set instance so that it contains the
+  // default POA policies.
+  TAO_POA_Policy_Set tao_policies (this->object_adapter ().default_poa_policies ());
+
+  // Merge policies from the ORB level.
+  this->object_adapter ().validator ().merge_policies (tao_policies.policies ()
+                                                       ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+
+  // Merge in any policies that the user may have specified.
+  tao_policies.merge_policies (policies
+                               ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+
+  // If any of the policy objects specified are not valid for the ORB
+  // implementation, if conflicting policy objects are specified, or
+  // if any of the specified policy objects require prior
+  // administrative action that has not been performed, an
+  // InvalidPolicy exception is raised containing the index in the
+  // policies parameter value of the first offending policy object.
+  tao_policies.validate_policies (this->object_adapter ().validator (),
+                                  this->orb_core_
+                                  ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+
+  // If the poa_manager parameter is null, a new POAManager object is
+  // created and associated with the new POA. Otherwise, the specified
+  // POAManager object is associated with the new POA. The POAManager
+  // object can be obtained using the attribute name the_POAManager.
+  TAO_POA_Manager* tao_poa_manager = 0;
+  if (CORBA::is_nil (poa_manager))
+    {
+      ACE_NEW_THROW_EX (tao_poa_manager,
+                        TAO_POA_Manager (this->object_adapter ()),
+                        CORBA::NO_MEMORY ());
+      ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+    }
+  else
+    {
+      tao_poa_manager = dynamic_cast <TAO_POA_Manager *>(poa_manager);
+    }
+
+  PortableServer::POAManager_var safe_poa_manager = tao_poa_manager;
+
+  TAO_Root_POA *poa = this->create_POA_i (adapter_name,
+                                     *tao_poa_manager,
+                                     tao_policies
+                                     ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+
+  // Release the POA_Manager_var since we got here without error.  The
+  // TAO_Regular_POA object takes ownership of the POA_Manager object
+  // (actually it shares the ownership with its peers).
+  (void) safe_poa_manager._retn ();
+
+  return PortableServer::POA::_duplicate (poa);
+}
+
+TAO_Root_POA *
+TAO_Root_POA::new_POA (const String &name,
+                       TAO_POA_Manager &poa_manager,
+                       const TAO_POA_Policy_Set &policies,
+                       TAO_Root_POA *parent,
+                       ACE_Lock &lock,
+                       TAO_SYNCH_MUTEX &thread_lock,
+                       TAO_ORB_Core &orb_core,
+                       TAO_Object_Adapter *object_adapter
+                       ACE_ENV_ARG_DECL)
+{
+  TAO_Regular_POA *poa = 0;
+
+  ACE_NEW_THROW_EX (poa,
+                    TAO_Regular_POA (name,
+                             poa_manager,
+                             policies,
+                             parent,
+                             lock,
+                             thread_lock,
+                             orb_core,
+                             object_adapter
+                             ACE_ENV_ARG_PARAMETER),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (0);
+
+  return poa;
+}
+
+TAO_Root_POA *
+TAO_Root_POA::create_POA_i (const TAO_Root_POA::String &adapter_name,
+                            TAO_POA_Manager &poa_manager,
+                            const TAO_POA_Policy_Set &policies
+                            ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::AdapterAlreadyExists,
+                   PortableServer::POA::InvalidPolicy))
+{
+  // This operaton creates a new POA as a child of the target POA. The
+  // specified name identifies the new POA with respect to other POAs
+  // with the same parent POA. If the target POA already has a child
+  // POA with the specified name, the AdapterAlreadyExists exception
+  // is raised.
+  int result = this->children_.find (adapter_name);
+
+  // Child was found
+  if (result != -1)
+    {
+      ACE_THROW_RETURN (PortableServer::POA::AdapterAlreadyExists (),
+                        0);
+    }
+
+  //
+  // Child was not found
+  //
+
+  // The specified policy objects are associated with the POA and used
+  // to control its behavior. The policy objects are effectively
+  // copied before this operation returns, so the application is free
+  // to destroy them while the POA is in use. Policies are not
+  // inherited from the parent POA.
+  TAO_Root_POA *poa = this->new_POA (adapter_name,
+                                poa_manager,
+                                policies,
+                                this,
+                                this->object_adapter ().lock (),
+                                this->object_adapter ().thread_lock (),
+                                this->orb_core_,
+                                this->object_adapter_
+                                ACE_ENV_ARG_PARAMETER);
+
+  // Give ownership of the new map to the POA_var.  Note, that it
+  // is important for the POA_var to take ownership before
+  // checking for exception since we may need to delete the new map.
+  PortableServer::POA_var new_poa = poa;
+
+  // Check for exception in construction of the POA.
+  ACE_CHECK_RETURN (0);
+
+  // Add to children map
+  result = this->children_.bind (adapter_name,
+                                 poa);
+  if (result != 0)
+    {
+      ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
+                        0);
+    }
+
+  // Iterate over the registered IOR interceptors so that they may be
+  // given the opportunity to add tagged components to the profiles
+  // for this servant.
+  poa->establish_components (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  // Note: Creating a POA using a POA manager that is in the active
+  // state can lead to race conditions if the POA supports preexisting
+  // objects, because the new POA may receive a request before its
+  // adapter activator, servant manager, or default servant have been
+  // initialized. These problems do not occur if the POA is created by
+  // an adapter activator registered with a parent of the new POA,
+  // because requests are queued until the adapter activator
+  // returns. To avoid these problems when a POA must be explicitly
+  // initialized, the application can initialize the POA by invoking
+  // find_POA with a TRUE activate parameter.
+
+  // Everything is fine. Don't let the POA_var release the
+  // implementation.
+  (void) new_poa._retn ();  // We could do a "return new_poa._retn()"
+                            // but the return type doesn't match this
+                            // method's return type.
+
+  return poa;
+}
+
+PortableServer::POA_ptr
+TAO_Root_POA::find_POA (const char *adapter_name,
+                        CORBA::Boolean activate_it
+                        ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::AdapterNonExistent))
+{
+  // Lock access for the duration of this transaction.
+  TAO_POA_GUARD_RETURN (0);
+
+  TAO_Root_POA *poa = this->find_POA_i (adapter_name,
+                                   activate_it
+                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
+
+  return PortableServer::POA::_duplicate (poa);
+}
+
+TAO_Root_POA *
+TAO_Root_POA::find_POA_i (const ACE_CString &child_name,
+                     CORBA::Boolean activate_it
+                     ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::AdapterNonExistent))
+{
+  TAO_Root_POA *child = 0;
+  int result = this->children_.find (child_name,
+                                     child);
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+  if (result != 0)
+    {
+      if (activate_it)
+        {
+          if (!CORBA::is_nil (this->adapter_activator_.in ()))
+            {
+              // Check our state
+              this->check_state (ACE_ENV_SINGLE_ARG_PARAMETER);
+              ACE_CHECK_RETURN (0);
+
+              CORBA::Boolean success = false;
+              ACE_TRY_EX (UnknownAdapter)
+                {
+                  // ATTENTION: Trick locking here, see class header for details
+                  TAO::Portable_Server::Non_Servant_Upcall non_servant_upcall (*this);
+                  ACE_UNUSED_ARG (non_servant_upcall);
+
+                  // When unknown_adapter gives a system exception, the POA
+                  // should raise OBJ_ADAPTER with standard minor code 1.
+                  // See 11.3.9.2 of the Corba spec
+                  success =
+                    this->adapter_activator_->unknown_adapter (this,
+                                                               child_name.c_str ()
+                                                               ACE_ENV_ARG_PARAMETER);
+                  ACE_TRY_CHECK_EX (UnknownAdapter);
+                }
+              ACE_CATCH (CORBA::SystemException, ex)
+                {
+                  ACE_TRY_THROW_EX (CORBA::OBJ_ADAPTER (CORBA::OMGVMCID | 1,
+                                    CORBA::COMPLETED_NO),
+                                    UnknownAdapter);
+                }
+              ACE_ENDTRY;
+              ACE_CHECK_RETURN (0);
+
+              if (success)
+                {
+                  result = this->children_.find (child_name,
+                                                 child);
+                }
+              else
+                {
+                  result = -1;
+                }
+            }
+          else
+            {
+              result = -1;
+            }
+        }
+      else
+        {
+          result = -1;
+        }
+    }
+#else
+  ACE_UNUSED_ARG (activate_it);
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+  if (result == 0)
+    {
+      return child;
+    }
+  else
+    {
+      // Otherwise, the AdapterNonExistent exception is raised.
+      ACE_THROW_RETURN (PortableServer::POA::AdapterNonExistent (),
+                        0);
+    }
+}
+
+TAO_POA_Manager &
+TAO_Root_POA::tao_poa_manager ()
+{
+  return poa_manager_;
+}
+
+PortableServer::POA_ptr
+TAO_Root_POA::create_POA (const char *adapter_name,
+                          PortableServer::POAManager_ptr poa_manager,
+                          const CORBA::PolicyList &policies
+                          ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::AdapterAlreadyExists,
+                   PortableServer::POA::InvalidPolicy))
+{
+  // Lock access for the duration of this transaction.
+  TAO_POA_GUARD_RETURN (0);
+
+  return this->create_POA_i (adapter_name,
+                             poa_manager,
+                             policies
+                             ACE_ENV_ARG_PARAMETER);
+}
+
+PortableServer::ObjectId *
+TAO_Root_POA::servant_to_id (PortableServer::Servant servant
+                             ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ServantNotActive,
+                   PortableServer::POA::WrongPolicy))
+{
+  // If we had upgradeable locks, this would initially be a read lock
+  //
+  // Lock access for the duration of this transaction.
+  TAO_POA_GUARD_RETURN (0);
+
+  return this->servant_to_id_i (servant
+                                ACE_ENV_ARG_PARAMETER);
+}
+
+PortableServer::ObjectId *
+TAO_Root_POA::servant_to_user_id (PortableServer::Servant servant
+                                  ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ServantNotActive,
+                   PortableServer::POA::WrongPolicy))
+{
+  return this->active_policy_strategies_.servant_retention_strategy()->
+    servant_to_user_id (servant ACE_ENV_ARG_PARAMETER);
+}
+
+PortableServer::Servant
+TAO_Root_POA::reference_to_servant (CORBA::Object_ptr reference
+                                    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ObjectNotActive,
+                   PortableServer::POA::WrongAdapter,
+                   PortableServer::POA::WrongPolicy))
+{
+  // Lock access for the duration of this transaction.
+  TAO_POA_GUARD_RETURN (0);
+
+  return this->reference_to_servant_i (reference
+                                       ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object_ptr
+TAO_Root_POA::servant_to_reference (PortableServer::Servant servant
+                                    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ServantNotActive,
+                   PortableServer::POA::WrongPolicy))
+{
+  TAO_POA_GUARD_RETURN (CORBA::Object::_nil ());
+
+  return this->servant_to_reference_i (servant
+                                       ACE_ENV_ARG_PARAMETER);
+}
+
+PortableServer::POAList *
+TAO_Root_POA::the_children (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Lock access for the duration of this transaction.
+  TAO_POA_GUARD_RETURN (0);
+
+  return this->the_children_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+
+PortableServer::Servant
+TAO_Root_POA::id_to_servant (const PortableServer::ObjectId &oid
+                             ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ObjectNotActive,
+                   PortableServer::POA::WrongPolicy))
+{
+  // Lock access for the duration of this transaction.
+  TAO_POA_GUARD_RETURN (0);
+
+  return this->id_to_servant_i (oid
+                                ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object_ptr
+TAO_Root_POA::id_to_reference (const PortableServer::ObjectId &oid
+                               ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ObjectNotActive,
+                   PortableServer::POA::WrongPolicy))
+{
+  // Lock access for the duration of this transaction.
+  TAO_POA_GUARD_RETURN (0);
+
+  return this->id_to_reference_i (oid ACE_ENV_ARG_PARAMETER);
+}
+
+
+CORBA::Object_ptr
+TAO_Root_POA::create_reference_with_id (const PortableServer::ObjectId &id,
+                                        const char *intf
+                                        ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Lock access for the duration of this transaction.
+  TAO_POA_GUARD_RETURN (CORBA::Object::_nil ());
+
+  return this->create_reference_with_id_i (id,
+                                           intf,
+                                           this->server_priority ()
+                                           ACE_ENV_ARG_PARAMETER);
+}
+
+
+void
+TAO_Root_POA::destroy (CORBA::Boolean etherealize_objects,
+                       CORBA::Boolean wait_for_completion
+                       ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Lock access for the duration of this transaction.
+  TAO::Portable_Server::POA_Guard poa_guard (*this ACE_ENV_ARG_PARAMETER, 0);
+  ACE_CHECK;
+  ACE_UNUSED_ARG (poa_guard);
+
+  this->destroy_i (etherealize_objects,
+                   wait_for_completion
+                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+void
+TAO_Root_POA::remove_from_parent_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+{
+  // The root poa has no parent, so this is a noop
+}
+
+void
+TAO_Root_POA::destroy_i (CORBA::Boolean etherealize_objects,
+                         CORBA::Boolean wait_for_completion
+                         ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  if (this->cleanup_in_progress_)
+    return;
+
+  // Is the <wait_for_completion> semantics for this thread correct?
+  TAO_Root_POA::check_for_valid_wait_for_completions (this->orb_core (),
+                                                      wait_for_completion
+                                                      ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  this->cleanup_in_progress_ = 1;
+
+  // This operation destroys the POA and all descendant POAs. The POA
+  // so destroyed (that is, the POA with its name) may be re-created
+  // later in the same process. (This differs from the
+  // POAManager::deactivate operation that does not allow a
+  // re-creation of its associated POA in the same process.)
+
+  // Remove POA from the parent
+  this->remove_from_parent_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+  TAO::ORT_Array array_obj_ref_template (1);
+
+  CORBA::ULong i = 0;
+
+  // Gather all ObjectReferenceTemplates and change all adapter states
+  // to INACTIVE.
+  for (CHILDREN::iterator iterator = this->children_.begin ();
+       iterator != this->children_.end ();
+       ++iterator)
+    {
+      TAO_Root_POA * const child_poa = (*iterator).int_id_;
+
+      TAO::ORT_Adapter * const adapter = child_poa->ORT_adapter_i ();
+
+      // In case no ORT library is linked we get zero.
+      if (adapter != 0)
+        {
+          // Get the ObjectReferenceTemplate for the child POA.
+          PortableInterceptor::ObjectReferenceTemplate * const ort =
+            adapter->get_adapter_template ();
+
+          // Add it to the sequence of object reference templates that
+          // will be destroyed.
+          array_obj_ref_template.size (1);
+
+          array_obj_ref_template[0] = ort;
+        }
+
+      child_poa->adapter_state_ =
+        PortableInterceptor::INACTIVE;
+
+      // Notify the state changes to the IORInterceptors
+      this->adapter_state_changed (array_obj_ref_template,
+                                   PortableInterceptor::INACTIVE
+                                   ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      if (adapter != 0)
+        adapter->release (array_obj_ref_template[0]);
+
+      ++i;
+    }
+
+  // Destroy all child POA's now.
+  for (CHILDREN::iterator destroy_iterator = this->children_.begin ();
+       destroy_iterator != this->children_.end ();
+       ++destroy_iterator)
+    {
+      TAO_Root_POA *destroy_child_poa = (*destroy_iterator).int_id_;
+
+      destroy_child_poa->destroy_i (etherealize_objects,
+                                    wait_for_completion
+                                    ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+
+  // Notify the lifespan strategy of our shutdown
+  this->active_policy_strategies_.lifespan_strategy()->notify_shutdown (
+    ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+
+// @todo, is the exception handling above correct, should we just fail when
+// the notify above fails
+
+  // When a POA is destroyed, any requests that have started execution
+  // continue to completion. Any requests that have not started
+  // execution are processed as if they were newly arrived, that is,
+  // the POA will attempt to cause recreation of the POA by invoking
+  // one or more adapter activators as described in Section 3.3.3.
+  // If the wait_for_completion parameter is TRUE, the destroy
+  // operation will return only after all requests in process have
+  // completed and all invocations of etherealize have
+  // completed. Otherwise, the destroy operation returns after
+  // destroying the POAs.
+
+  this->deactivate_all_objects_i (etherealize_objects,
+                                  wait_for_completion
+                                  ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  // If there are no outstanding requests and that we are not in a
+  // non-servant upcall or if we are in a non-servant upcall, make
+  // sure we are the POA related to the non-servant upcall.
+  TAO::Portable_Server::Non_Servant_Upcall *non_servant_upcall_in_progress =
+    this->object_adapter ().non_servant_upcall_in_progress ();
+  if (this->outstanding_requests_ == 0 &&
+      (non_servant_upcall_in_progress == 0 ||
+       &non_servant_upcall_in_progress->poa () != this))
+    {
+      TAO::ORT_Array my_array_obj_ref_template;
+
+      TAO::ORT_Adapter * const ort_adapter =
+        this->ORT_adapter_i ();
+
+      // In case no ORT library is linked we get zero.
+      if (ort_adapter != 0)
+        {
+          // Get the ObjectReferenceTemplate.
+          PortableInterceptor::ObjectReferenceTemplate * const ort =
+            ort_adapter->get_adapter_template ();
+
+          // Add it to the sequence of object reference templates, we
+          // just notify for ourselves that we are now non_existent,
+          // our childs will do it for themselves.
+          my_array_obj_ref_template.size (1);
+          my_array_obj_ref_template[0] = ort;
+        }
+
+      // According to the ORT spec, after a POA is destroyed, its state
+      // has to be changed to NON_EXISTENT and all the registered
+      // interceptors are to be informed. Since, the POA is destroyed
+      // and is released in the complete_destruction_i method, we are
+      // trying to keep the poa still around by doing a duplicate of
+      // it. (a hack).
+      PortableServer::POA_var poa = PortableServer::POA::_duplicate (this);
+
+      this->complete_destruction_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+
+      this->adapter_state_ = PortableInterceptor::NON_EXISTENT;
+
+      this->adapter_state_changed (my_array_obj_ref_template,
+                                   this->adapter_state_
+                                   ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      if (ort_adapter != 0)
+        {
+          ort_adapter->release (my_array_obj_ref_template[0]);
+
+          TAO::ORT_Adapter_Factory *ort_factory =
+            this->ORT_adapter_factory ();
+
+          ort_factory->destroy (ort_adapter);
+
+          this->ort_adapter_ = 0;
+        }
+    }
+  else
+    {
+      // Mark that we are ready for destruction.
+      this->waiting_destruction_ = 1;
+    }
+}
+
+int
+TAO_Root_POA::delete_child (const TAO_Root_POA::String &child)
+{
+  int result = 0;
+
+  // If we are not closing down, we must remove this child from our
+  // collection.
+  if (!this->cleanup_in_progress_)
+    result = this->children_.unbind (child);
+
+  // Otherwise, if we are closing down, we are currently iterating
+  // over our children and there is not need to remove this child from
+  // our collection.
+
+  return result;
+}
+
+PortableServer::POAList *
+TAO_Root_POA::the_children_i (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  PortableServer::POAList_var children;
+  CORBA::ULong child_current = static_cast <CORBA::ULong>
+                                           (this->children_.current_size ());
+  ACE_NEW_THROW_EX (children,
+                    PortableServer::POAList (child_current),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (0);
+
+  children->length (child_current);
+
+  CORBA::ULong index = 0;
+  for (CHILDREN::iterator iterator = this->children_.begin ();
+       iterator != this->children_.end ();
+       ++iterator, ++index)
+    {
+      TAO_Root_POA *child_poa = (*iterator).int_id_;
+      children[index] = PortableServer::POA::_duplicate (child_poa);
+    }
+
+  return children._retn ();
+}
+
+PortableInterceptor::AdapterName *
+TAO_Root_POA::adapter_name_i (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // The adapter name is the sequence of names starting from the
+  // RootPOA to the one whose name is requested.  The name of the
+  // RootPOA is "RootPOA".
+
+  PortableServer::POA_var poa = PortableServer::POA::_duplicate (this);
+
+  CORBA::ULong len = 0;
+
+  // Find the length of the adapter name sequence by traversing the
+  // POA hierarchy until the RootPOA is reached.  The RootPOA has no
+  // parent.
+  while (!CORBA::is_nil (poa.in ()))
+    {
+      poa = poa->the_parent (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      ++len;
+    }
+
+  // Empty adapter name sequence.
+  PortableInterceptor::AdapterName *names = 0;
+  ACE_NEW_THROW_EX (names,
+                    PortableInterceptor::AdapterName (len),
+                    CORBA::NO_MEMORY (
+                      CORBA::SystemException::_tao_minor_code (
+                        TAO::VMCID,
+                        ENOMEM),
+                      CORBA::COMPLETED_NO));
+  ACE_CHECK_RETURN (0);
+
+  PortableInterceptor::AdapterName_var safe_names (names);
+
+  names->length (len);
+
+  poa = PortableServer::POA::_duplicate (this);
+
+  (*names)[0] = CORBA::string_dup ("RootPOA");
+
+  // Fill in the AdapterName sequence as the POA hierarchy is
+  // traversed.
+  CORBA::ULong ilen = len;
+  for (CORBA::ULong i = 1; i < len; ++i)
+    {
+      (*names)[--ilen] = poa->the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      poa = poa->the_parent (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      // If this condition asserts, the POA hierarchy was modified
+      // (i.e. reduced in size) by another thread!
+      ACE_ASSERT ((ilen > 0 ? !CORBA::is_nil (poa.in ()) : 1));
+    }
+
+  return safe_names._retn ();
+}
+
+void
+TAO_Root_POA::add_ior_component (TAO_MProfile & mprofile,
+                                 const IOP::TaggedComponent &component
+                                 ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Add the given tagged component to all profiles.
+  const CORBA::ULong profile_count = mprofile.profile_count ();
+
+  for (CORBA::ULong i = 0; i < profile_count; ++i)
+    {
+      TAO_Profile *profile = mprofile.get_profile (i);
+
+      profile->add_tagged_component (component
+                                     ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+}
+
+void
+TAO_Root_POA::add_ior_component_to_profile (
+    TAO_MProfile & mprofile,
+    const IOP::TaggedComponent &component,
+    IOP::ProfileId profile_id
+    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Add the given tagged component to all profiles matching the given
+  // ProfileId.
+  int found_profile = 0;
+
+  const CORBA::ULong profile_count = mprofile.profile_count ();
+
+  for (CORBA::ULong i = 0; i < profile_count; ++i)
+    {
+      TAO_Profile *profile = mprofile.get_profile (i);
+
+      if (profile->tag () == profile_id)
+        {
+          profile->add_tagged_component (component
+                                         ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+
+          found_profile = 1;
+        }
+    }
+
+  // According to the Portable Interceptor specification, we're
+  // supposed to throw a CORBA::BAD_PARAM exception if no profile
+  // matched the given ProfileId.
+  if (found_profile == 0)
+    ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 29,
+                                 CORBA::COMPLETED_NO));
+}
+
+void
+TAO_Root_POA::adapter_state_changed (
+   const TAO::ORT_Array &array_obj_ref_template,
+   PortableInterceptor::AdapterState state
+   ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  TAO_IORInterceptor_Adapter *ior_adapter =
+    this->orb_core_.ior_interceptor_adapter ();
+
+  if (ior_adapter)
+    {
+      ior_adapter->adapter_state_changed (array_obj_ref_template,
+                                          state
+                                          ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+}
+
+PortableServer::ObjectId *
+TAO_Root_POA::activate_object_i (PortableServer::Servant servant,
+                                 CORBA::Short priority,
+                                 int &wait_occurred_restart_call
+                                 ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ServantAlreadyActive,
+                   PortableServer::POA::WrongPolicy))
+{
+  return this->active_policy_strategies_.servant_retention_strategy()->
+    activate_object (servant,
+                     priority,
+                     wait_occurred_restart_call
+                     ACE_ENV_ARG_PARAMETER);
+}
+
+PortableServer::ObjectId *
+TAO_Root_POA::activate_object (PortableServer::Servant servant
+                               ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ServantAlreadyActive,
+                   PortableServer::POA::WrongPolicy))
+{
+  while (1)
+    {
+      int wait_occurred_restart_call = 0;
+
+      // Lock access for the duration of this transaction.
+      TAO_POA_GUARD_RETURN (0);
+
+      PortableServer::ObjectId *result =
+        this->activate_object_i (servant,
+                                 this->server_priority (),
+                                 wait_occurred_restart_call
+                                 ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      // If we ended up waiting on a condition variable, the POA state
+      // may have changed while we are waiting.  Therefore, we need to
+      // restart this call.
+      if (wait_occurred_restart_call)
+        continue;
+      else
+        return result;
+    }
+}
+
+void
+TAO_Root_POA::activate_object_with_id (const PortableServer::ObjectId &id,
+                                       PortableServer::Servant servant
+                                       ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ServantAlreadyActive,
+                   PortableServer::POA::ObjectAlreadyActive,
+                   PortableServer::POA::WrongPolicy))
+{
+  while (1)
+    {
+      int wait_occurred_restart_call = 0;
+
+      // Lock access for the duration of this transaction.
+      TAO_POA_GUARD;
+
+      this->activate_object_with_id_i (id,
+                                       servant,
+                                       this->server_priority (),
+                                       wait_occurred_restart_call
+                                       ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+
+      // If we ended up waiting on a condition variable, the POA state
+      // may have changed while we are waiting.  Therefore, we need to
+      // restart this call.
+      if (wait_occurred_restart_call)
+        continue;
+      else
+        return;
+    }
+}
+
+void
+TAO_Root_POA::activate_object_with_id_i (const PortableServer::ObjectId &id,
+                                         PortableServer::Servant servant,
+                                         CORBA::Short priority,
+                                         int &wait_occurred_restart_call
+                                         ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ServantAlreadyActive,
+                   PortableServer::POA::ObjectAlreadyActive,
+                   PortableServer::POA::WrongPolicy))
+{
+  this->active_policy_strategies_.servant_retention_strategy()->
+    activate_object_with_id (id,
+                             servant,
+                             priority,
+                             wait_occurred_restart_call
+                             ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+void
+TAO_Root_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects,
+                                        CORBA::Boolean wait_for_completion
+                                        ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::WrongPolicy))
+{
+  this->deactivate_all_objects_i (etherealize_objects
+                                  ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+
+  this->wait_for_completions (wait_for_completion
+                              ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+void
+TAO_Root_POA::wait_for_completions (CORBA::Boolean wait_for_completion
+                                    ACE_ENV_ARG_DECL)
+{
+  while (this->object_adapter ().enable_locking_ &&
+         wait_for_completion &&
+         this->outstanding_requests_ > 0)
+    {
+      this->wait_for_completion_pending_ = 1;
+
+      int result = this->outstanding_requests_condition_.wait ();
+      if (result == -1)
+        {
+          ACE_THROW (CORBA::OBJ_ADAPTER ());
+        }
+    }
+}
+
+/* static */
+void
+TAO_Root_POA::check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core,
+                                                    CORBA::Boolean wait_for_completion
+                                                    ACE_ENV_ARG_DECL)
+{
+  if (wait_for_completion)
+    {
+      TAO::Portable_Server::POA_Current_Impl *poa_current_impl =
+        static_cast <TAO::Portable_Server::POA_Current_Impl *>
+                    (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
+
+      while (1)
+        {
+          // If wait_for_completion is TRUE and the current thread is
+          // in an invocation context dispatched from some POA
+          // belonging to the same ORB as this POA, the BAD_INV_ORDER
+          // system exception with standard minor code 3 is raised and
+          // POA destruction does not occur.
+          if (poa_current_impl != 0)
+            {
+              if (&orb_core == &poa_current_impl->orb_core ())
+                {
+                  // CORBA 2.3 specifies which minor code corresponds
+                  // to this particular problem.
+                  ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 3,
+                                                   CORBA::COMPLETED_NO));
+                }
+            }
+          else
+            break;
+
+          poa_current_impl =
+            poa_current_impl->previous_current_impl_;
+        }
+    }
+}
+
+void
+TAO_Root_POA::deactivate_all_objects_i (CORBA::Boolean etherealize_objects
+                                        ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::WrongPolicy))
+{
+  this->active_policy_strategies_.request_processing_strategy ()->
+    etherealize_objects (etherealize_objects);
+
+  this->active_policy_strategies_.servant_retention_strategy ()->
+    deactivate_all_objects (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+void
+TAO_Root_POA::deactivate_object (const PortableServer::ObjectId &oid
+                                 ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ObjectNotActive,
+                   PortableServer::POA::WrongPolicy))
+{
+  // Lock access for the duration of this transaction.
+  TAO_POA_GUARD;
+
+  this->deactivate_object_i (oid
+                             ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+
+void
+TAO_Root_POA::deactivate_object_i (const PortableServer::ObjectId &id
+                                   ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ObjectNotActive,
+                   PortableServer::POA::WrongPolicy))
+{
+  this->active_policy_strategies_.servant_retention_strategy()->
+    deactivate_object (id
+                       ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+CORBA::Boolean
+TAO_Root_POA::is_persistent (void) const
+{
+  return active_policy_strategies_.lifespan_strategy()->is_persistent ();
+}
+
+CORBA::Object_ptr
+TAO_Root_POA::create_reference (const char *intf
+                                ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::WrongPolicy))
+{
+  // Lock access for the duration of this transaction.
+  TAO_POA_GUARD_RETURN (CORBA::Object::_nil ());
+
+  return this->create_reference_i (intf,
+                                   this->server_priority ()
+                                   ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object_ptr
+TAO_Root_POA::create_reference_i (const char *intf,
+                                  CORBA::Short priority
+                                  ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::WrongPolicy))
+{
+  if (!this->has_system_id ())
+    {
+      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
+                        CORBA::Object::_nil ());
+    }
+
+  return this->active_policy_strategies_.servant_retention_strategy()->
+    create_reference (intf, priority ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object_ptr
+TAO_Root_POA::invoke_key_to_object_helper_i (const char * repository_id,
+                                             const PortableServer::ObjectId & id
+                                             ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  const PortableInterceptor::ObjectId &user_oid =
+    reinterpret_cast <const PortableInterceptor::ObjectId &>(id);
+
+  // Ask the ORT to create the object.
+  if (this->ORT_adapter_i ())
+    {
+      // Ask the ORT to create the object.
+      return this->ort_adapter_->make_object (repository_id,
+                                              user_oid
+                                              ACE_ENV_ARG_PARAMETER);
+    }
+  else
+    {
+      return this->invoke_key_to_object (ACE_ENV_SINGLE_ARG_PARAMETER);
+    }
+}
+
+CORBA::Object_ptr
+TAO_Root_POA::create_reference_with_id_i (const PortableServer::ObjectId &user_id,
+                                          const char *intf,
+                                          CORBA::Short priority
+                                          ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // If the POA has the SYSTEM_ID policy and it detects that the
+  // Object Id value was not generated by the system or for this POA,
+  // the create_reference_with_id operation may raise the BAD_PARAM
+  // system exception. An ORB is not required to detect all such
+  // invalid Object Id values, but a portable application must not
+  // invoke this operation on a POA that has the SYSTEM_ID policy with
+  // an Object Id value that was not previously generated by the
+  // system for that POA, or, if the POA also has the PERSISTENT
+  // policy, for a previous instantiation of the same POA.
+  if (this->has_system_id () &&
+      !this->is_poa_generated_id (user_id))
+    {
+      ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 14,
+                                          CORBA::COMPLETED_NO),
+                        CORBA::Object::_nil ());
+    }
+
+  return this->active_policy_strategies_.servant_retention_strategy()->
+    create_reference_with_id (user_id, intf, priority ACE_ENV_ARG_PARAMETER);
+}
+
+PortableServer::ObjectId *
+TAO_Root_POA::servant_to_id_i (PortableServer::Servant servant
+                               ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ServantNotActive,
+                   PortableServer::POA::WrongPolicy))
+{
+  return this->active_policy_strategies_.request_processing_strategy()->
+    servant_to_id (servant ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object_ptr
+TAO_Root_POA::servant_to_reference_i (PortableServer::Servant servant
+                                      ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ServantNotActive,
+                   PortableServer::POA::WrongPolicy))
+{
+  return this->active_policy_strategies_.servant_retention_strategy()->
+    servant_to_reference (servant ACE_ENV_ARG_PARAMETER);
+}
+
+PortableServer::Servant
+TAO_Root_POA::reference_to_servant_i (CORBA::Object_ptr reference
+                                      ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ObjectNotActive,
+                   PortableServer::POA::WrongAdapter,
+                   PortableServer::POA::WrongPolicy))
+{
+  // Make sure that the reference is valid.
+  if (CORBA::is_nil (reference))
+    {
+      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
+                        0);
+    }
+
+  PortableServer::ObjectId system_id;
+  bool is_generated = this->is_poa_generated (reference, system_id ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  if (!is_generated)
+    {
+      // In case this object reference is not generated by this POA throw
+      // an exception
+      ACE_THROW_RETURN (PortableServer::POA::WrongAdapter (),
+                        0);
+    }
+
+  return this->active_policy_strategies_.request_processing_strategy()->
+    system_id_to_servant (system_id ACE_ENV_ARG_PARAMETER);
+}
+
+bool
+TAO_Root_POA::is_poa_generated (CORBA::Object_ptr reference,
+                                PortableServer::ObjectId &system_id
+                                ACE_ENV_ARG_DECL)
+{
+  TAO::ObjectKey_var key = reference->_key (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (false);
+
+  TAO_Object_Adapter::poa_name poa_system_name;
+  CORBA::Boolean is_root = 0;
+  CORBA::Boolean is_persistent = 0;
+  CORBA::Boolean is_system_id = 0;
+  TAO::Portable_Server::Temporary_Creation_Time poa_creation_time;
+
+  int result = this->parse_key (key.in (),
+                                poa_system_name,
+                                system_id,
+                                is_root,
+                                is_persistent,
+                                is_system_id,
+                                poa_creation_time);
+  if (result != 0 ||
+      !this->root () &&
+      poa_system_name != this->system_name () ||
+      is_root != this->root () ||
+      is_system_id != this->system_id () ||
+      !this->validate_lifespan (is_persistent, poa_creation_time))
+    {
+      // The passed reference is NOT generated by this POA
+      return false;
+    }
+  else
+    {
+      // The passed reference is generated by this POA
+      return true;
+    }
+}
+
+PortableServer::ObjectId *
+TAO_Root_POA::reference_to_id (CORBA::Object_ptr reference
+                               ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::WrongAdapter,
+                   PortableServer::POA::WrongPolicy))
+{
+  // Make sure that the reference is valid.
+  if (CORBA::is_nil (reference))
+    {
+      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
+                        0);
+    }
+
+  // The WrongPolicy exception is declared to allow future extensions.
+
+  // This operation is valid only if the reference was created by the
+  // POA on which the operation is being performed.  If the object
+  // reference was not created by this POA, the WrongAdapter exception
+  // is raised.
+  PortableServer::ObjectId system_id;
+  bool is_generated = this->is_poa_generated (reference,
+                                              system_id
+                                              ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  if (!is_generated)
+    {
+      ACE_THROW_RETURN (PortableServer::POA::WrongAdapter (),
+                        0);
+    }
+
+  // Lock access for the duration of this transaction.
+  TAO_POA_GUARD_RETURN (0);
+
+  return this->active_policy_strategies_.servant_retention_strategy()->
+    system_id_to_object_id (system_id ACE_ENV_ARG_PARAMETER);
+}
+
+PortableServer::Servant
+TAO_Root_POA::find_servant (const PortableServer::ObjectId &system_id
+                            ACE_ENV_ARG_DECL)
+{
+  return this->active_policy_strategies_.servant_retention_strategy()->
+    find_servant (system_id ACE_ENV_ARG_PARAMETER);
+}
+
+int
+TAO_Root_POA::unbind_using_user_id (const PortableServer::ObjectId &user_id)
+{
+  return this->active_policy_strategies_.servant_retention_strategy()->
+    unbind_using_user_id  (user_id);
+}
+
+void
+TAO_Root_POA::cleanup_servant (
+  PortableServer::Servant servant,
+  const PortableServer::ObjectId &user_id
+  ACE_ENV_ARG_DECL)
+{
+  this->active_policy_strategies_.request_processing_strategy()->
+    cleanup_servant (servant, user_id ACE_ENV_ARG_PARAMETER);
+}
+
+PortableServer::Servant
+TAO_Root_POA::id_to_servant_i (const PortableServer::ObjectId &id
+                               ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ObjectNotActive,
+                   PortableServer::POA::WrongPolicy))
+{
+  return this->active_policy_strategies_.request_processing_strategy()->
+    id_to_servant (id ACE_ENV_ARG_PARAMETER);
+}
+
+PortableServer::Servant
+TAO_Root_POA::user_id_to_servant_i (const PortableServer::ObjectId &id
+                                    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ObjectNotActive,
+                   PortableServer::POA::WrongPolicy))
+{
+  return this->active_policy_strategies_.servant_retention_strategy()->
+    user_id_to_servant (id ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object_ptr
+TAO_Root_POA::id_to_reference_i (const PortableServer::ObjectId &id
+                                 ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ObjectNotActive,
+                   PortableServer::POA::WrongPolicy))
+{
+  return this->active_policy_strategies_.servant_retention_strategy()->
+    id_to_reference (id ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::OctetSeq *
+TAO_Root_POA::id (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  CORBA::OctetSeq *id = 0;
+  ACE_NEW_THROW_EX (id,
+                    CORBA::OctetSeq (this->id_),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (0);
+
+  return id;
+}
+
+PortableServer::Servant
+TAO_Root_POA::locate_servant_i (const char *operation,
+                                const PortableServer::ObjectId &system_id,
+                                TAO::Portable_Server::Servant_Upcall &servant_upcall,
+                                TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
+                                int &wait_occurred_restart_call
+                                ACE_ENV_ARG_DECL)
+{
+  return this->active_policy_strategies_.request_processing_strategy()->
+    locate_servant (operation,
+                    system_id,
+                    servant_upcall,
+                    poa_current_impl,
+                    wait_occurred_restart_call
+                    ACE_ENV_ARG_PARAMETER);
+}
+
+/* static */
+int
+TAO_Root_POA::parse_key (const TAO::ObjectKey &key,
+                         TAO_Object_Adapter::poa_name &poa_system_name,
+                         PortableServer::ObjectId &system_id,
+                         CORBA::Boolean &is_root,
+                         CORBA::Boolean &is_persistent,
+                         CORBA::Boolean &is_system_id,
+                         TAO::Portable_Server::Temporary_Creation_Time &poa_creation_time)
+{
+  // Start at zero.
+  CORBA::ULong starting_at = 0;
+
+  // Get the object key octets.
+  const CORBA::Octet *key_data = key.get_buffer ();
+
+  // Skip the object key prefix since we have already checked for this.
+  starting_at += TAO_OBJECTKEY_PREFIX_SIZE;
+
+  // Check the root indicator.
+  char root_key_type = key_data[starting_at];
+  if (root_key_type == TAO_Root_POA::root_key_char ())
+    {
+      is_root = 1;
+    }
+  else if (root_key_type == TAO_Root_POA::non_root_key_char ())
+    {
+      is_root = 0;
+    }
+  else
+    {
+      // Incorrect key
+      return -1;
+    }
+
+  // Skip past the system id indicator
+  starting_at += TAO_Root_POA::root_key_type_length ();
+
+  // Check the system id indicator.
+  char system_id_key_type = key_data[starting_at];
+  if (system_id_key_type == TAO_Root_POA::system_id_key_char ())
+    {
+      is_system_id = 1;
+    }
+  else if (system_id_key_type == TAO_Root_POA::user_id_key_char ())
+    {
+      is_system_id = 0;
+    }
+  else
+    {
+      // Incorrect key
+      return -1;
+    }
+
+  // Skip past the system id indicator
+  starting_at += TAO_Root_POA::system_id_key_type_length ();
+
+  // Check the persistence indicator
+  char persistent_key_type = key_data[starting_at];
+  if (persistent_key_type == TAO_Root_POA::persistent_key_char ())
+    {
+      is_persistent = 1;
+    }
+  else if (persistent_key_type == TAO_Root_POA::transient_key_char ())
+    {
+      is_persistent = 0;
+    }
+  else
+    {
+      // Incorrect key
+      return -1;
+    }
+
+  // Skip past the persistent indicator
+  starting_at += TAO_Root_POA::persistent_key_type_length ();
+
+#if (POA_NO_TIMESTAMP == 0)
+  // Grab the timestamp for transient POAs.
+  if (!is_persistent)
+    {
+      // Take the creation time for the timestamp
+      poa_creation_time.creation_time (key_data + starting_at);
+
+      // Skip past the timestamp
+      starting_at += TAO::Portable_Server::Creation_Time::creation_time_length ();
+    }
+#else
+  ACE_UNUSED_ARG (poa_creation_time);
+#endif /* POA_NO_TIMESTAMP */
+
+  // Calculate the size of the POA name.
+  CORBA::ULong poa_name_size = 0;
+  if (!is_persistent)
+    {
+      // Transient POAs have fixed size.
+      poa_name_size = TAO_Object_Adapter::transient_poa_name_size ();
+    }
+  else if (is_system_id)
+    {
+      // System ids have fixed size.
+      poa_name_size = static_cast <CORBA::ULong>
+                                  (key.length () - starting_at -
+                                   TAO_Active_Object_Map::system_id_size ());
+    }
+  else
+    {
+      // Get the size from the object key.
+      ACE_OS::memcpy (&poa_name_size,
+                      key_data + starting_at,
+                      sizeof (poa_name_size));
+      poa_name_size = ACE_NTOHL (poa_name_size);
+
+      starting_at += sizeof (poa_name_size);
+    }
+
+  // Grep the name if there is aname
+  if (!is_root)
+    {
+      poa_system_name.replace (poa_name_size,
+                               poa_name_size,
+                               (CORBA::Octet *) key_data + starting_at,
+                               0);
+
+      starting_at += poa_name_size;
+    }
+
+  // The rest is the system id.
+  CORBA::ULong system_id_size = key.length () - starting_at;
+
+  // Reset <system_id>.
+  system_id.replace (system_id_size,
+                     system_id_size,
+                     (CORBA::Octet *) key_data + starting_at,
+                     0);
+
+  // Success
+  return 0;
+}
+
+TAO::ObjectKey *
+TAO_Root_POA::create_object_key (const PortableServer::ObjectId &id)
+{
+  // Calculate the space required for the key.
+  CORBA::ULong buffer_size =
+    this->id_.length () +
+    id.length ();
+
+  // Create the buffer for the key.
+  CORBA::Octet *buffer = TAO::ObjectKey::allocbuf (buffer_size);
+
+  // First copy the POA id into the key.
+  ACE_OS::memcpy (&buffer[0],
+                  this->id_.get_buffer (),
+                  this->id_.length ());
+
+  // Then copy the object id into the key.
+  ACE_OS::memcpy (&buffer[this->id_.length ()],
+                  id.get_buffer (),
+                  id.length ());
+
+  // Create the key, giving the ownership of the buffer to the
+  // sequence.
+  TAO::ObjectKey *key = 0;
+  ACE_NEW_RETURN (key,
+                  TAO::ObjectKey (buffer_size,
+                                 buffer_size,
+                                 buffer,
+                                 1),
+                  0);
+
+  return key;
+}
+
+void
+TAO_Root_POA::set_id (TAO_Root_POA *parent)
+{
+  // Calculate the prefix size.
+  CORBA::ULong prefix_size = 0;
+  prefix_size += TAO_OBJECTKEY_PREFIX_SIZE;
+
+  // If we are dealing with a persistent POA and user ids are being
+  // used, then we need to add the POA name length field to the object
+  // key. Otherwise, the POA name length can be calculated by looking
+  // at the remainder after extracting other parts of the key.
+  int add_poa_name_length =
+    this->is_persistent () &&
+    !this->system_id ();
+
+  // Size required by the POA name.
+  CORBA::ULong poa_name = 0;
+
+  // Calculate the space required for the POA name.
+  CORBA::ULong poa_name_length = this->system_name_->length ();
+  if (parent != 0)
+    {
+      poa_name += poa_name_length;
+    }
+
+  // Check if we need to added the length of the POA name.
+  if (add_poa_name_length)
+    {
+      poa_name += sizeof (poa_name_length);
+    }
+
+  // Get the space needed for the lifespan length
+  // byte.
+  CORBA::ULong lifespan_key_length =
+    this->active_policy_strategies_.lifespan_strategy()->key_length ();
+
+  CORBA::ULong id_assignment_key_length =
+    this->active_policy_strategies_.id_assignment_strategy()->key_type_length ();
+
+  // Calculate the space required for the POA id.
+  CORBA::ULong buffer_size =
+    prefix_size +
+    this->root_key_type_length () +
+    id_assignment_key_length +
+    lifespan_key_length +
+    poa_name;
+
+  // Create the buffer for the POA id.
+  this->id_.length (buffer_size);
+  CORBA::Octet *buffer = &this->id_[0];
+
+  // Keeps track of where the next infomation goes; start at 0 byte.
+  CORBA::ULong starting_at = 0;
+
+  // Add the object key prefix.
+  ACE_OS::memcpy (&buffer[starting_at],
+                  &objectkey_prefix[0],
+                  TAO_OBJECTKEY_PREFIX_SIZE);
+
+  starting_at += TAO_OBJECTKEY_PREFIX_SIZE;
+
+  // Copy the root byte.
+  if (parent != 0)
+    {
+      buffer[starting_at] = (CORBA::Octet) TAO_Root_POA::non_root_key_char ();
+    }
+  else
+    {
+      buffer[starting_at] = (CORBA::Octet) TAO_Root_POA::root_key_char ();
+    }
+  starting_at += this->root_key_type_length ();
+
+  // Add the id_assignment part
+  this->active_policy_strategies_.id_assignment_strategy()->create_key (buffer, starting_at);
+
+  // Add the lifespan part
+  this->active_policy_strategies_.lifespan_strategy()->create_key (buffer, starting_at);
+
+  // Check if we need to added the length of the POA name.
+  if (add_poa_name_length)
+    {
+      poa_name_length = ACE_HTONL (poa_name_length);
+      ACE_OS::memcpy (&buffer[starting_at],
+                      &poa_name_length,
+                      sizeof (poa_name_length));
+      starting_at += sizeof (poa_name_length);
+    }
+
+  // Put the POA name into the key (for non-root POAs).
+  if (parent != 0)
+    {
+      ACE_OS::memcpy (&buffer[starting_at],
+                      this->system_name_->get_buffer (),
+                      this->system_name_->length ());
+      starting_at += this->system_name_->length ();
+    }
+}
+
+int
+TAO_Root_POA::is_poa_generated_id (const PortableServer::ObjectId &id)
+{
+
+#if defined (POA_NAME_IN_POA_GENERATED_ID)
+
+  // Grab the buffer
+  const char *id_buffer = (const char *) id.get_buffer ();
+
+  // Check to see if the POA name is the first part of the id
+  return
+    this->name_.length () < id.length () &&
+    ACE_OS::strncmp (id_buffer,
+                     this->name_.c_str (),
+                     this->name_.length ()) == 0;
+
+#else /* POA_NAME_IN_POA_GENERATED_ID */
+
+  ACE_UNUSED_ARG (id);
+  return 1;
+
+#endif /* POA_NAME_IN_POA_GENERATED_ID */
+}
+
+void
+TAO_Root_POA::set_folded_name (TAO_Root_POA *parent)
+{
+  size_t length = 0;
+  size_t parent_length = 0;
+
+  if (parent != 0)
+    {
+      parent_length = parent->folded_name ().length ();
+      length += parent_length;
+    }
+
+  length += this->name_.length ();
+  length += TAO_Root_POA::name_separator_length ();
+
+  this->folded_name_.length (static_cast <CORBA::ULong> (length));
+  CORBA::Octet *folded_name_buffer = this->folded_name_.get_buffer ();
+
+  if (parent != 0)
+    {
+      ACE_OS::memcpy (folded_name_buffer,
+                      parent->folded_name ().get_buffer (),
+                      parent_length);
+    }
+
+  ACE_OS::memcpy (&folded_name_buffer[parent_length],
+                  this->name_.c_str (),
+                  this->name_.length ());
+
+  folded_name_buffer[length - TAO_Root_POA::name_separator_length ()] = TAO_Root_POA::name_separator ();
+}
+
+int
+TAO_Root_POA::parse_ir_object_key (const TAO::ObjectKey &object_key,
+                                   PortableServer::ObjectId &user_id)
+{
+  TAO_Object_Adapter::poa_name poa_system_name;
+  CORBA::Boolean is_root = 0;
+  CORBA::Boolean is_persistent = 0;
+  CORBA::Boolean is_system_id = 0;
+  TAO::Portable_Server::Temporary_Creation_Time poa_creation_time;
+
+  return TAO_Root_POA::parse_key (object_key,
+                                  poa_system_name,
+                                  user_id,
+                                  is_root,
+                                  is_persistent,
+                                  is_system_id,
+                                  poa_creation_time);
+}
+
+TAO_Object_Adapter &
+TAO_Root_POA::object_adapter (void)
+{
+  return *this->object_adapter_;
+}
+
+CORBA::Object_ptr
+TAO_Root_POA::invoke_key_to_object (ACE_ENV_SINGLE_ARG_DECL)
+{
+  PortableServer::ObjectId_var &system_id =
+    *this->key_to_object_params_.system_id_;
+
+  // Create object key.
+  TAO::ObjectKey_var key =
+    this->create_object_key (system_id.in ());
+
+  return this->key_to_object (key.in (),
+                              this->key_to_object_params_.type_id_,
+                              this->key_to_object_params_.servant_,
+                              this->key_to_object_params_.collocated_,
+                              this->key_to_object_params_.priority_
+                              ACE_ENV_ARG_PARAMETER);
+}
+
+CORBA::Object_ptr
+TAO_Root_POA::key_to_object (const TAO::ObjectKey &key,
+                             const char *type_id,
+                             TAO_ServantBase *servant,
+                             CORBA::Boolean collocated,
+                             CORBA::Short priority
+                             ACE_ENV_ARG_DECL)
+{
+  // Check if the ORB is still running, otherwise throw an exception.
+  // @@ What if the ORB was destroyed?  In that case we shouldn't even
+  //    get here!
+  this->orb_core_.check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  //
+  // ImplRepo related.
+  //
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+
+  CORBA::Object_ptr obj = CORBA::Object::_nil ();
+
+  if (this->active_policy_strategies_.lifespan_strategy()->use_imr ())
+    {
+      // Check to see if we alter the IOR.
+      CORBA::Object_var imr =
+        this->orb_core ().implrepo_service ();
+
+      if (CORBA::is_nil (imr.in ())
+          || !imr->_stubobj ()
+          || !imr->_stubobj ()->profile_in_use ())
+        {
+          if (TAO_debug_level > 1)
+            {
+              ACE_DEBUG ((LM_DEBUG,
+                          "Missing ImR IOR, will not use the ImR\n"));
+            }
+          goto orbkey;
+        }
+
+      CORBA::String_var imr_str =
+        imr->_stubobj ()->profile_in_use ()->to_string (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (obj);
+
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "IMR IOR = \n%s\n",
+                    ACE_TEXT_CHAR_TO_TCHAR (imr_str.in ())));
+
+      // Search for "corbaloc:" alone, without the protocol.  This code
+      // should be protocol neutral.
+      const char corbaloc[] = "corbaloc:";
+      char *pos = ACE_OS::strstr (imr_str.inout (), corbaloc);
+      pos = ACE_OS::strchr (pos + sizeof (corbaloc), ':');
+
+      pos = ACE_OS::strchr (pos + 1,
+                            imr->_stubobj ()->profile_in_use ()->object_key_delimiter ());
+
+      if (pos)
+        pos[1] = 0;  // Crop the string.
+      else
+        {
+          if (TAO_debug_level > 0)
+            ACE_ERROR ((LM_ERROR,
+                        "Could not parse ImR IOR, skipping ImRification\n"));
+          goto orbkey;
+        }
+
+      ACE_CString ior (imr_str.in ());
+
+      // Add the key.
+
+      CORBA::String_var key_str;
+      TAO::ObjectKey::encode_sequence_to_string (key_str.inout (), key);
+
+      ior += key_str.in ();
+
+      if (TAO_debug_level > 0)
+        ACE_DEBUG ((LM_DEBUG,
+                    "ImR-ified IOR = \n%s\n",
+                    ACE_TEXT_CHAR_TO_TCHAR (ior.c_str ())));
+
+      obj =
+        this->orb_core_.orb ()->string_to_object (ior.c_str ()
+                                                  ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (obj);
+
+      return obj;
+    }
+
+orbkey:
+
+#endif /* TAO_HAS_MINIMUM_CORBA */
+
+  TAO_Stub *data =
+    this->key_to_stub_i (key, type_id, priority ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (CORBA::Object::_nil ());
+
+  TAO_Stub_Auto_Ptr safe_data (data);
+
+  CORBA::Object_ptr tmp;
+
+  if (this->orb_core_.optimize_collocation_objects ())
+    {
+      ACE_NEW_THROW_EX (tmp, CORBA::Object (data,
+                                            collocated,
+                                            servant),
+                        CORBA::INTERNAL ());
+
+      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    }
+  else
+    {
+      ACE_NEW_THROW_EX (tmp,
+                        CORBA::Object (data,
+                                       collocated),
+                        CORBA::INTERNAL ());
+      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+    }
+
+  data->servant_orb (this->orb_core_.orb ());
+
+  // Transfer ownership to the Object.
+  (void) safe_data.release ();
+
+  return tmp;
+}
+
+TAO_Stub *
+TAO_Root_POA::key_to_stub (const TAO::ObjectKey &key,
+                           const char *type_id,
+                           CORBA::Short priority
+                           ACE_ENV_ARG_DECL)
+{
+  // Check if the ORB is still running, otherwise throw an exception.
+  // @@ What if the ORB was destroyed?  In that case we shouldn't even
+  //    get here!
+  this->orb_core_.check_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  return this->key_to_stub_i (key, type_id, priority ACE_ENV_ARG_PARAMETER);
+}
+
+TAO_Stub *
+TAO_Root_POA::key_to_stub_i (const TAO::ObjectKey &key,
+                             const char *type_id,
+                             CORBA::Short priority
+                             ACE_ENV_ARG_DECL)
+{
+  CORBA::PolicyList_var client_exposed_policies =
+    this->client_exposed_policies (priority
+                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  TAO_Default_Acceptor_Filter filter;
+  TAO_Stub *data =
+    this->create_stub_object (
+      key,
+      type_id,
+      client_exposed_policies._retn (),
+      &filter,
+      this->orb_core_.lane_resources ().acceptor_registry ()
+      ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  return data;
+}
+
+void
+TAO_Root_POA::establish_components (ACE_ENV_SINGLE_ARG_DECL)
+{
+  TAO_IORInterceptor_Adapter *ior_adapter =
+    this->orb_core_.ior_interceptor_adapter ();
+
+  if (ior_adapter)
+    {
+      ior_adapter->establish_components (this ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+}
+
+void
+TAO_Root_POA::components_established (PortableInterceptor::IORInfo_ptr info
+                                      ACE_ENV_ARG_DECL)
+{
+  TAO_IORInterceptor_Adapter *ior_adapter =
+    this->orb_core_.ior_interceptor_adapter ();
+
+  if (ior_adapter)
+    {
+      ior_adapter->components_established (info ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+}
+
+void
+TAO_Root_POA::save_ior_component (const IOP::TaggedComponent &component
+                                  ACE_ENV_ARG_DECL_NOT_USED)
+{
+  const CORBA::ULong old_len = this->tagged_component_.length ();
+
+  this->tagged_component_.length (old_len + 1);
+  this->tagged_component_[old_len] = component;
+}
+
+void
+TAO_Root_POA::
+save_ior_component_and_profile_id (const IOP::TaggedComponent &component,
+                                   IOP::ProfileId profile_id
+                                   ACE_ENV_ARG_DECL_NOT_USED)
+{
+  // The length of this->tagged_component_id_ is the same as the
+  // length of the profile_id_array_ since we are trying to make a
+  // one-to-one link between these two arrays. So, whenever
+  // this->tagged_component_id_ is increased, we need to increase the
+  // size of this->profile_id_array_ also.
+
+  const CORBA::ULong old_len = this->tagged_component_id_.length ();
+
+  const CORBA::ULong new_len = old_len + 1;
+
+  this->tagged_component_id_.length (new_len);
+  this->tagged_component_id_[old_len] = component;
+
+  this->profile_id_array_.size (new_len);
+  this->profile_id_array_[old_len] = profile_id;
+}
+
+TAO_Stub *
+TAO_Root_POA::create_stub_object (const TAO::ObjectKey &object_key,
+                                  const char *type_id,
+                                  CORBA::PolicyList *policy_list,
+                                  TAO_Acceptor_Filter *filter,
+                                  TAO_Acceptor_Registry &acceptor_registry
+                                  ACE_ENV_ARG_DECL)
+{
+  int error = 0;
+
+  // Count the number of endpoints.
+  size_t profile_count =
+    acceptor_registry.endpoint_count ();
+
+  // Create a profile container and have acceptor registries populate
+  // it with profiles as appropriate.
+  TAO_MProfile mprofile (0);
+
+  // Allocate space for storing the profiles.  There can never be more
+  // profiles than there are endpoints.  In some cases, there can be
+  // less profiles than endpoints.
+  int result =
+    mprofile.set (static_cast <CORBA::ULong> (profile_count));
+  if (result == -1)
+    error = 1;
+
+  if (!error)
+    {
+      result =
+        filter->fill_profile (object_key,
+                              mprofile,
+                              acceptor_registry.begin (),
+                              acceptor_registry.end ());
+      if (result == -1)
+        error = 1;
+    }
+
+  if (!error)
+    result = filter->encode_endpoints (mprofile);
+  if (result == -1)
+    error = 1;
+
+  if (error)
+    ACE_THROW_RETURN (CORBA::INTERNAL (
+                        CORBA::SystemException::_tao_minor_code (
+                          TAO_MPROFILE_CREATION_ERROR,
+                          0),
+                        CORBA::COMPLETED_NO),
+                      0);
+
+  // Make sure we have at least one profile.  <mp> may end up being
+  // empty if none of the acceptor endpoints have the right priority
+  // for this object, for example.
+  if (mprofile.profile_count () == 0)
+    ACE_THROW_RETURN (CORBA::BAD_PARAM (
+                        CORBA::SystemException::_tao_minor_code (
+                          TAO_MPROFILE_CREATION_ERROR,
+                          0),
+                        CORBA::COMPLETED_NO),
+                      0);
+
+  TAO_Stub *stub =
+    this->orb_core_.create_stub_object (mprofile,
+                                        type_id,
+                                        policy_list
+                                        ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  // Add the saved tagged components methods to the profiles.
+  CORBA::ULong len = this->tagged_component_.length ();
+  for (CORBA::ULong i = 0; i != len; ++i)
+    {
+      this->add_ior_component (mprofile,
+                               this->tagged_component_[i]
+                               ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+      }
+
+  len = this->tagged_component_id_.length ();
+
+  for (CORBA::ULong k = 0; k != len; ++k)
+    {
+      this->add_ior_component_to_profile (mprofile,
+                                          this->tagged_component_id_[k],
+                                          this->profile_id_array_[k]
+                                          ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+    }
+
+  return stub;
+}
+
+CORBA::PolicyList *
+TAO_Root_POA::client_exposed_policies (CORBA::Short /* object_priority */
+                                       ACE_ENV_ARG_DECL)
+{
+  CORBA::PolicyList *client_exposed_policies = 0;
+  ACE_NEW_THROW_EX (client_exposed_policies,
+                    CORBA::PolicyList (),
+                    CORBA::NO_MEMORY (TAO::VMCID,
+                                      CORBA::COMPLETED_NO));
+  ACE_CHECK_RETURN (0);
+
+  CORBA::PolicyList_var policies = client_exposed_policies;
+
+  // Add in all of the client exposed policies.
+  this->policies_.add_client_exposed_fixed_policies (client_exposed_policies
+                                                     ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  return policies._retn ();
+}
+
+TAO_SERVANT_LOCATION
+TAO_Root_POA::locate_servant_i (const PortableServer::ObjectId &system_id,
+                                PortableServer::Servant &servant
+                                ACE_ENV_ARG_DECL)
+{
+  return this->active_policy_strategies_.request_processing_strategy()->
+          locate_servant (system_id, servant ACE_ENV_ARG_PARAMETER);
+}
+
+TAO_SERVANT_LOCATION
+TAO_Root_POA::servant_present (const PortableServer::ObjectId &system_id,
+                               PortableServer::Servant &servant
+                               ACE_ENV_ARG_DECL)
+{
+  return this->active_policy_strategies_.servant_retention_strategy()->
+          servant_present (system_id, servant ACE_ENV_ARG_PARAMETER);
+}
+
+PortableServer::Servant
+TAO_Root_POA::find_servant (
+        const PortableServer::ObjectId &system_id,
+        TAO::Portable_Server::Servant_Upcall &servant_upcall,
+        TAO::Portable_Server::POA_Current_Impl &poa_current_impl
+        ACE_ENV_ARG_DECL)
+{
+  return this->active_policy_strategies_.servant_retention_strategy()->
+          find_servant (system_id,
+                        servant_upcall,
+                        poa_current_impl
+                        ACE_ENV_ARG_PARAMETER);
+}
+
+TAO::ORT_Adapter_Factory *
+TAO_Root_POA::ORT_adapter_factory (void)
+{
+  return ACE_Dynamic_Service<TAO::ORT_Adapter_Factory>::instance (
+           TAO_Root_POA::ort_adapter_factory_name ());
+}
+
+TAO::ORT_Adapter *
+TAO_Root_POA::ORT_adapter_i (void)
+{
+  if (this->ort_adapter_ != 0)
+    return this->ort_adapter_;
+
+  ACE_DECLARE_NEW_CORBA_ENV;
+  ACE_TRY
+    {
+      TAO::ORT_Adapter_Factory * ort_ap_factory =
+        this->ORT_adapter_factory ();
+
+      if (!ort_ap_factory)
+        return 0;
+
+      // Get the full adapter name of this POA, do this before we
+      // create the adapter so that in case this fails, we just
+      // return 0 and not a not activated adapter
+      PortableInterceptor::AdapterName *adapter_name =
+        this->adapter_name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      this->ort_adapter_ =
+          ort_ap_factory->create ();
+
+      if (!this->ort_adapter_)
+        return 0;
+
+      // @todo We have to look at this, we activate it but hold the POA lock,
+      // in case we are called by ORT_adapter, we shouldn't keep the lock
+      // here, but then the ort_adapter should be guarded against multiple
+      // activations.
+      this->ort_adapter_->activate (this->orb_core_.server_id (),
+                                    this->orb_core_.orbid (),
+                                    adapter_name,
+                                    this
+                                    ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
+    {
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "(%P|%t) Cannot initialize the "
+                           "object_reference_template_adapter\n");
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (0);
+
+  return this->ort_adapter_;
+}
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+PortableServer::AdapterActivator_ptr
+TAO_Root_POA::the_activator (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Lock access for the duration of this transaction.
+  TAO_POA_GUARD_RETURN (PortableServer::AdapterActivator::_nil ());
+
+  return PortableServer::AdapterActivator::_duplicate (this->adapter_activator_.in ());
+}
+
+void
+TAO_Root_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activator
+                             ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  // Lock access for the duration of this transaction.
+  TAO_POA_GUARD;
+
+  this->adapter_activator_ = PortableServer::AdapterActivator::_duplicate (adapter_activator);
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+PortableServer::ServantManager_ptr
+TAO_Root_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::WrongPolicy))
+{
+  // Lock access for the duration of this transaction.
+  TAO_POA_GUARD_RETURN (PortableServer::ServantManager::_nil ());
+
+  return this->active_policy_strategies_.request_processing_strategy()->
+    get_servant_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+void
+TAO_Root_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr
+                              ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::WrongPolicy))
+{
+  // Lock access for the duration of this transaction.
+  TAO_POA_GUARD;
+
+  this->active_policy_strategies_.request_processing_strategy()->
+    set_servant_manager (imgr ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+PortableServer::Servant
+TAO_Root_POA::get_servant_i (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::WrongPolicy))
+{
+  return this->active_policy_strategies_.request_processing_strategy()->
+    get_servant (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+PortableServer::Servant
+TAO_Root_POA::get_servant (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::NoServant,
+                   PortableServer::POA::WrongPolicy))
+{
+  // Lock access for the duration of this transaction.
+  TAO_POA_GUARD_RETURN (0);
+
+  PortableServer::Servant servant =
+    this->get_servant_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  if (servant != 0)
+    {
+      // ATTENTION: Trick locking here, see class header for details
+      TAO::Portable_Server::Non_Servant_Upcall non_servant_upcall (*this);
+      ACE_UNUSED_ARG (non_servant_upcall);
+
+      // The POA invokes _add_ref once on the Servant before returning
+      // it. If the application uses reference counting, the caller of
+      // get_servant is responsible for invoking _remove_ref once on
+      // the returned Servant when it is finished with it. A
+      // conforming caller need not invoke _remove_ref on the returned
+      // Servant if the type of the Servant uses the default reference
+      // counting inherited from ServantBase.
+      servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      return servant;
+    }
+  else
+    {
+      // If no servant has been associated with the POA, the NoServant
+      // exception is raised.
+      ACE_THROW_RETURN (PortableServer::POA::NoServant (),
+                        0);
+    }
+}
+
+bool
+TAO_Root_POA::is_servant_activation_allowed (PortableServer::Servant servant,
+                                             int &wait_occurred_restart_call)
+{
+  return this->active_policy_strategies_.id_uniqueness_strategy ()->
+    is_servant_activation_allowed (servant, wait_occurred_restart_call);
+}
+
+bool
+TAO_Root_POA::has_system_id (void) const
+{
+  return this->active_policy_strategies_.id_assignment_strategy ()->
+    has_system_id ();
+}
+
+int
+TAO_Root_POA::rebind_using_user_id_and_system_id (
+  PortableServer::Servant servant,
+  const PortableServer::ObjectId &user_id,
+  const PortableServer::ObjectId &system_id,
+  TAO::Portable_Server::Servant_Upcall &servant_upcall)
+{
+  return this->active_policy_strategies_.servant_retention_strategy ()->
+    rebind_using_user_id_and_system_id (servant,
+                                        user_id,
+                                        system_id,
+                                        servant_upcall);
+}
+
+CORBA::Boolean
+TAO_Root_POA::servant_has_remaining_activations (PortableServer::Servant servant)
+{
+  return this->active_policy_strategies_.servant_retention_strategy ()->
+    servant_has_remaining_activations (servant);
+}
+
+bool
+TAO_Root_POA::allow_implicit_activation (void) const
+{
+  return this->active_policy_strategies_.implicit_activation_strategy ()->
+    allow_implicit_activation ();
+}
+
+bool
+TAO_Root_POA::allow_multiple_activations (void) const
+{
+  return this->active_policy_strategies_.id_uniqueness_strategy ()->
+    allow_multiple_activations ();
+}
+
+void
+TAO_Root_POA::post_invoke_servant_cleanup(
+  const PortableServer::ObjectId &system_id,
+  const TAO::Portable_Server::Servant_Upcall &servant_upcall)
+{
+  this->active_policy_strategies_.request_processing_strategy ()->
+    post_invoke_servant_cleanup (system_id, servant_upcall);
+}
+
+CORBA::Short
+TAO_Root_POA::server_priority (void) const
+{
+  return this->cached_policies_.server_priority ();
+}
+
+int
+TAO_Root_POA::is_servant_active (
+  PortableServer::Servant servant,
+  int &wait_occurred_restart_call)
+{
+  return this->active_policy_strategies_.servant_retention_strategy ()->
+    is_servant_in_map (servant, wait_occurred_restart_call);
+}
+
+
+void
+TAO_Root_POA::set_servant (PortableServer::Servant servant
+                           ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::WrongPolicy))
+{
+  // Lock access for the duration of this transaction.
+  TAO_POA_GUARD;
+
+  this->active_policy_strategies_.request_processing_strategy()->
+    set_servant (servant ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+TAO::Portable_Server::Cached_Policies::PriorityModel
+TAO_Root_POA::priority_model (void) const
+{
+  return cached_policies_.priority_model ();
+}
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+int
+TAO_Root_POA::enter ()
+{
+  return this->active_policy_strategies_.thread_strategy ()->enter();
+}
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+int
+TAO_Root_POA::exit ()
+{
+  return this->active_policy_strategies_.thread_strategy ()->exit();
+}
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+bool
+TAO_Root_POA::validate_lifespan (
+  CORBA::Boolean is_persistent,
+  const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const
+{
+  return this->active_policy_strategies_.lifespan_strategy()->
+    validate (is_persistent, creation_time);
+}
+
+CORBA::Boolean
+TAO_Root_POA::root (void) const
+{
+  return true;
+}
+
+TAO::ORT_Adapter *
+TAO_Root_POA::ORT_adapter (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  if (this->ort_adapter_ != 0)
+    return this->ort_adapter_;
+
+  // Lock access for the duration of this transaction.
+  TAO_POA_GUARD_RETURN (0);
+
+  // DCL ..
+  if (this->ort_adapter_ != 0)
+    return this->ort_adapter_;
+
+  return this->ORT_adapter_i ();
+}
+
+CORBA::Policy *
+TAO_Root_POA::server_protocol (void)
+{
+  return 0;
+}
+
+void
+TAO_Root_POA::Key_To_Object_Params::set (PortableServer::ObjectId_var &system_id,
+                                         const char *type_id,
+                                         TAO_ServantBase *servant,
+                                         CORBA::Boolean collocated,
+                                         CORBA::Short priority)
+{
+  this->system_id_ = &system_id;
+  this->type_id_ = type_id;
+  this->servant_ = servant;
+  this->collocated_ = collocated;
+  this->priority_ = priority;
+}
+
+CORBA::ULong
+TAO_Root_POA::waiting_servant_deactivation (void) const
+{
+  return this->active_policy_strategies_.servant_retention_strategy ()->
+          waiting_servant_deactivation ();
+}
+
+void
+TAO_Root_POA::ort_adapter_factory_name (const char *name)
+{
+  TAO_POA_Static_Resources::instance ()->ort_adapter_factory_name_ =
+    name;
+}
+
+CORBA::Policy_ptr
+TAO_Root_POA::get_policy (CORBA::PolicyType policy
+                          ACE_ENV_ARG_DECL)
+{
+  return this->policies_.get_policy (policy ACE_ENV_ARG_PARAMETER);
+}
+
+void
+TAO_Root_POA::check_state (ACE_ENV_SINGLE_ARG_DECL)
+{
+  this->active_policy_strategies_.lifespan_strategy ()->
+    check_state (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+const char *
+TAO_Root_POA::ort_adapter_factory_name (void)
+{
+  return TAO_POA_Static_Resources::instance ()->ort_adapter_factory_name_.c_str();
+}
+
+void
+TAO_Root_POA::imr_client_adapter_name (const char *name)
+{
+  TAO_POA_Static_Resources::instance ()->imr_client_adapter_name_ = name;
+}
+
+const char *
+TAO_Root_POA::imr_client_adapter_name (void)
+{
+  return TAO_POA_Static_Resources::instance ()->imr_client_adapter_name_.c_str();
+}
+
+PortableServer::POAManager_ptr
+TAO_Root_POA::the_POAManager (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return PortableServer::POAManager::_duplicate (&this->poa_manager_);
+}
+
+PortableInterceptor::AdapterManagerId
+TAO_Root_POA::get_manager_id (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->poa_manager_.get_manager_id (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+
+// Initialize instance_ to 0, since this is what we test for in the call
+// to instance ().  Note that this does not require a constructor call, so
+// it is always initialized by the time that instance () can be called.
+TAO_POA_Static_Resources* TAO_POA_Static_Resources::instance_ = 0;
+
+// Force an instance to be created at module initialization time,
+// since we do not want to worry about double checked locking and
+// the race condition to initialize the lock.
+TAO_POA_Static_Resources* TAO_POA_Static_Resources::initialization_reference_ =
+  TAO_POA_Static_Resources::instance ();
+
+TAO_POA_Static_Resources*
+TAO_POA_Static_Resources::instance (void)
+{
+  if (TAO_POA_Static_Resources::instance_ == 0)
+    {
+      // This new is never freed on purpose.  The data specified by
+      // it needs to be around for the last shared library that references
+      // this class.  This could occur in a destructor in a shared library
+      // that is unloaded after this one.  One solution to avoid this
+      // harmless memory leak would be to use reference counting.
+      ACE_NEW_RETURN (TAO_POA_Static_Resources::instance_,
+                      TAO_POA_Static_Resources (),
+                      0);
+    }
+
+  return TAO_POA_Static_Resources::instance_;
+}
+
+TAO_POA_Static_Resources::TAO_POA_Static_Resources (void)
+  : ort_adapter_factory_name_ ("ORT_Adapter_Factory"),
+    imr_client_adapter_name_ ("ImR_Client_Adapter")
+{
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Array_Base<TAO_Active_Object_Map::Map_Entry *>;
+
+template class ACE_Map_Entry<TAO_Unbounded_Sequence<unsigned char>, TAO_ServantBase *>;
+template class ACE_Hash_Map_Entry<ACE_CString, TAO_Root_POA *>;
+template class ACE_Hash_Map_Manager<ACE_CString, TAO_Root_POA *, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_Root_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator<ACE_CString, TAO_Root_POA *, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Ex<ACE_CString, TAO_Root_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator<ACE_CString, TAO_Root_POA *, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_Root_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
+template class ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_Root_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>;
+template class ACE_Write_Guard<ACE_Lock>;
+template class ACE_Read_Guard<ACE_Lock>;
+template class ACE_Array_Base <IOP::ProfileId>;
+template class ACE_Node<TAO_Root_POA *>;
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Array_Base<TAO_Active_Object_Map::Map_Entry *>
+
+#pragma instantiate ACE_Map_Entry<TAO_Unbounded_Sequence<unsigned char>, TAO_ServantBase *>
+#pragma instantiate ACE_Hash_Map_Entry<ACE_CString, TAO_Root_POA *>
+#pragma instantiate ACE_Hash_Map_Manager<ACE_CString, TAO_Root_POA *, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Manager_Ex<ACE_CString, TAO_Root_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator<ACE_CString, TAO_Root_POA *, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Ex<ACE_CString, TAO_Root_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_CString, TAO_Root_POA *, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<ACE_CString, TAO_Root_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
+#pragma instantiate ACE_Hash_Map_Iterator_Base_Ex<ACE_CString, TAO_Root_POA *, ACE_Hash<ACE_CString>, ACE_Equal_To<ACE_CString>, ACE_Null_Mutex>
+#pragma instantiate ACE_Write_Guard<ACE_Lock>
+#pragma instantiate ACE_Read_Guard<ACE_Lock>
+#pragma instantiate ACE_Array_Base <IOP::ProfileId>
+#pragma instantiate ACE_Node<TAO_Root_POA *>
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/PortableServer/POA.h b/TAO/tao/PortableServer/Root_POA.h
index 98624282bef..64cb4ecadf1 100644
--- a/TAO/tao/PortableServer/POA.h
+++ b/TAO/tao/PortableServer/Root_POA.h
@@ -2,39 +2,48 @@
 
 //=============================================================================
 /**
- *  @file    POA.h
+ *  @file    Root_POA.h
  *
  *  $Id$
  *
- *  Header file for CORBA Portable Object Adapter (POA) related
- *  types.
+ *  Header file for CORBA's ORB type.
  *
  *  @author  Irfan Pyarali <irfan@cs.wustl.edu>
  */
 //=============================================================================
 
-#ifndef TAO_POA_H
-#define TAO_POA_H
+#ifndef TAO_ROOT_POA_H
+#define TAO_ROOT_POA_H
 
 #include /**/ "ace/pre.h"
 
-#include "ace/SString.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/SString.h"
+#include "ace/Hash_Map_Manager_T.h"
+#include "ace/Array_Base.h"
+#include "ace/Synch_Traits.h"
+#include "ace/Thread_Mutex.h"
+#include "ace/Recursive_Thread_Mutex.h"
+#include "ace/Null_Mutex.h"
+
 // Object Adapter
 #include "Object_Adapter.h"
 
-// POAManager
-#include "POAManager.h"
-
 // POA Policy Set
 #include "POA_Policy_Set.h"
 
 // Cached POA Policies
 #include "POA_Cached_Policies.h"
+#include "Active_Policy_Strategies.h"
+
+#include "ORT_Adapter.h"
+
+#include "PortableServer.h"
 
 // Object_Key
 #include "tao/Object_KeyC.h"
@@ -45,96 +54,21 @@
 // Portable Interceptor
 #include "tao/PI_ForwardC.h"
 
-#include "ace/Hash_Map_Manager_T.h"
-#include "ace/Array_Base.h"
-
-// Locking
-#include "ace/Synch_Traits.h"
-#include "ace/Thread_Mutex.h"
-#include "ace/Recursive_Thread_Mutex.h"
-#include "ace/Null_Mutex.h"
-
 // OctetSeq
 #include "tao/OctetSeqC.h"
 
-#include "ORT_Adapter.h"
-
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_Temporary_Creation_Time;
-
-class TAO_Creation_Time
-{
-public:
-  TAO_Creation_Time (const ACE_Time_Value &creation_time);
-
-  TAO_Creation_Time (void);
-
-  void creation_time (const void *creation_time);
-
-  const void *creation_time (void) const;
-
-  static CORBA::ULong creation_time_length (void);
-
-  bool operator== (const TAO_Creation_Time &rhs) const;
-
-  bool operator!= (const TAO_Creation_Time &rhs) const;
-
-  bool operator== (const TAO_Temporary_Creation_Time &rhs) const;
-
-  bool operator!= (const TAO_Temporary_Creation_Time &rhs) const;
-
-protected:
-
-  enum
-  {
-    SEC_FIELD = 0,
-    USEC_FIELD = 1
-  };
-
-  /// Timestamp
-  CORBA::ULong time_stamp_[2];
-
-};
-
-//
-/**
- * @class TAO_Temporary_Creation_Time
- *
- * @brief Special creation time only useful in the lifetime of the
- *        upcall.
- *
- * Special creation time only useful in the lifetime of the upcall.
- */
-class TAO_Temporary_Creation_Time
-{
-public:
-
-  TAO_Temporary_Creation_Time (void);
-
-  void creation_time (const void *creation_time);
-
-  bool operator== (const TAO_Creation_Time &rhs) const;
-
-  bool operator!= (const TAO_Creation_Time &rhs) const;
-
-protected:
-
-  void *time_stamp_;
-};
-
 // Forward Declaration
-class ServerObject_i;
 class TAO_Acceptor_Filter;
 class TAO_Acceptor_Registry;
 class TAO_IORInfo;
+class TAO_Regular_POA;
 
 namespace PortableInterceptor
 {
@@ -146,38 +80,43 @@ namespace TAO
 {
   class ORT_Adapter;
   class ORT_Adapter_Factory;
+
+  namespace Portable_Server
+  {
+    class Servant_Upcall;
+    class POA_Current_Impl;
+    class Temporary_Creation_Time;
+  }
+}
+
+namespace PortableServer
+{
+  class POAManager;
+  typedef POAManager *POAManager_ptr;
 }
 
 /**
- * @class TAO_POA
+ * @class TAO_Root_POA
  *
  * @brief Implementation of the PortableServer::POA interface.
  *
  * Implementation of the PortableServer::POA interface.
  */
-class TAO_PortableServer_Export TAO_POA
+class TAO_PortableServer_Export TAO_Root_POA
   : public virtual PortableServer::POA,
     public virtual TAO_Local_RefCounted_Object
 {
 public:
 
   friend class TAO_Object_Adapter;
-  friend class TAO_Object_Adapter::Servant_Upcall;
-  friend class TAO_Object_Adapter::Non_Servant_Upcall;
-  friend class TAO_POA_Current_Impl;
+  friend class TAO::Portable_Server::Servant_Upcall;
+  friend class TAO::Portable_Server::Non_Servant_Upcall;
   friend class TAO_POA_Manager;
   friend class TAO_RT_Collocation_Resolver;
   friend class TAO_IORInfo;
 
   typedef ACE_CString String;
 
-  /**
-   * This method is used to downcast safely an instance of
-   * PortableServer::POA to an instance of TAO_POA when RTTI is not
-   * enabled.
-   */
-  virtual TAO_POA* _tao_poa_downcast (void);
-
   PortableServer::POA_ptr create_POA (
       const char *adapter_name,
       PortableServer::POAManager_ptr poa_manager,
@@ -267,6 +206,9 @@ public:
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
+  /// @todo At the moment to POAManagerFactory is implemented and the
+  /// POAManager has the get_id method this can be zapped, IORInfo can
+  /// then just call get_id
   PortableInterceptor::AdapterManagerId get_manager_id (
       ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
@@ -351,8 +293,7 @@ public:
       const char *intf
       ACE_ENV_ARG_DECL_WITH_DEFAULTS
     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant
                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
@@ -360,6 +301,12 @@ public:
                      PortableServer::POA::ServantNotActive,
                      PortableServer::POA::WrongPolicy));
 
+  PortableServer::ObjectId *servant_to_user_id (PortableServer::Servant p_servant
+                                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     PortableServer::POA::ServantNotActive,
+                     PortableServer::POA::WrongPolicy));
+
   CORBA::Object_ptr servant_to_reference (PortableServer::Servant p_servant
                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
@@ -396,56 +343,11 @@ public:
   CORBA::OctetSeq *id (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-#if (TAO_HAS_MINIMUM_POA == 0)
-  // Methods added by the
-  /// @name MIOP specification methods
-  //@{
-  virtual PortableServer::ObjectId * create_id_for_reference (
-      CORBA::Object_ptr the_ref
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableServer::NotAGroupObject
-    ));
-
-
-  virtual PortableServer::IDs * reference_to_ids (
-      CORBA::Object_ptr the_ref
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableServer::NotAGroupObject
-    ));
-
-  virtual void associate_reference_with_id (
-      CORBA::Object_ptr ref,
-      const PortableServer::ObjectId & oid
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableServer::NotAGroupObject
-    ));
-
-  virtual void disassociate_reference_with_id (
-      CORBA::Object_ptr ref,
-      const PortableServer::ObjectId & oid
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableServer::NotAGroupObject
-    ));
-  //@}
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
   /// Accessor for POA policies.
   TAO_POA_Policy_Set &policies (void);
 
-  /// Accessor for cached POA policies.
-  TAO_POA_Cached_Policies &cached_policies (void);
+  /// Get the set policy of the given type.
+  CORBA::Policy_ptr get_policy (CORBA::PolicyType policy ACE_ENV_ARG_DECL);
 
   /// This method gives the policies that are exposed to the client.
   /// These policies are shipped within the IOR.
@@ -454,33 +356,17 @@ public:
       ACE_ENV_ARG_DECL
     );
 
-  /// Utility functions for the other
-  static char* ObjectId_to_string (const PortableServer::ObjectId &id);
-
-  static CORBA::WChar* ObjectId_to_wstring (
-      const PortableServer::ObjectId &id
-    );
+  TAO_Root_POA (const String &name,
+                TAO_POA_Manager &poa_manager,
+                const TAO_POA_Policy_Set &policies,
+                TAO_Root_POA *parent,
+                ACE_Lock &lock,
+                TAO_SYNCH_MUTEX &thread_lock,
+                TAO_ORB_Core &orb_core,
+                TAO_Object_Adapter *object_adapter
+                ACE_ENV_ARG_DECL);
 
-  static PortableServer::ObjectId *string_to_ObjectId (const char *id);
-
-  static PortableServer::ObjectId *string_to_ObjectId (const char *string,
-                                                       int size);
-
-  static PortableServer::ObjectId *wstring_to_ObjectId (
-      const CORBA::WChar *id
-    );
-
-  TAO_POA (const String &name,
-           TAO_POA_Manager &poa_manager,
-           const TAO_POA_Policy_Set &policies,
-           TAO_POA *parent,
-           ACE_Lock &lock,
-           TAO_SYNCH_MUTEX &thread_lock,
-           TAO_ORB_Core &orb_core,
-           TAO_Object_Adapter *object_adapter
-           ACE_ENV_ARG_DECL);
-
-  virtual ~TAO_POA (void);
+  virtual ~TAO_Root_POA (void);
 
   static char name_separator (void);
 
@@ -506,6 +392,8 @@ public:
   /// ORB Core for POA.
   TAO_ORB_Core &orb_core (void) const;
 
+  TAO::Portable_Server::Cached_Policies::PriorityModel priority_model (void) const;
+
   CORBA::Boolean cleanup_in_progress (void);
 
   /// Calls protected static method used when POACurrent is not appropriate.
@@ -523,10 +411,6 @@ public:
                          CORBA::Short priority
                          ACE_ENV_ARG_DECL);
 
-
-  /// Accessor for the current thread policy of this POA.
-  PortableServer::ThreadPolicyValue thread_policy (void) const;
-
   /// Accessor methods to POA state.
   /**
    * The POA can be in one of HOLDING, ACTIVE, DISCARDING, INACTIVE
@@ -543,23 +427,148 @@ public:
 
   const ACE_CString &name (void) const;
 
-  TAO_Active_Object_Map &active_object_map (void) const;
-
   CORBA::Boolean waiting_destruction (void) const;
 
   static void ort_adapter_factory_name (const char *name);
 
   static const char *ort_adapter_factory_name (void);
 
+  /// Sets the value of TAO_POA_Static_Resources::imr_client_adapter_name_.
+  static void imr_client_adapter_name (const char *name);
+
+  /// Gets the value of TAO_POA_Static_Resources::imr_client_adapter_name_.
+  static const char *imr_client_adapter_name (void);
+
   CORBA::Object_ptr invoke_key_to_object (ACE_ENV_SINGLE_ARG_DECL);
 
+  CORBA::Boolean system_id (void);
+
+  CORBA::ULong waiting_servant_deactivation (void) const;
+
+  /// Return the POA Manager related to this POA
+  TAO_POA_Manager &tao_poa_manager ();
+
+  bool is_poa_generated (CORBA::Object_ptr reference,
+                         PortableServer::ObjectId &system_id
+                         ACE_ENV_ARG_DECL);
+
+  /*
+   * Validate if the servant may be activated
+   * @retval true This servant may be activated
+   * @retval false This servant may not be activated
+   */
+  bool is_servant_activation_allowed (
+    PortableServer::Servant servant,
+    int &wait_occurred_restart_call);
+
+  int rebind_using_user_id_and_system_id (
+    PortableServer::Servant servant,
+    const PortableServer::ObjectId &user_id,
+    const PortableServer::ObjectId &system_id,
+    TAO::Portable_Server::Servant_Upcall &servant_upcall);
+
+  CORBA::Boolean servant_has_remaining_activations (
+    PortableServer::Servant servant);
+
+  bool allow_implicit_activation (void) const;
+
+  bool allow_multiple_activations (void) const;
+
+  int is_servant_active (
+    PortableServer::Servant servant,
+    int &wait_occurred_restart_call);
+
+  void deactivate_object_i (const PortableServer::ObjectId &oid
+                            ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ObjectNotActive,
+                   PortableServer::POA::WrongPolicy));
+
+  CORBA::Boolean is_persistent (void) const;
+
+  CORBA::Short server_priority (void) const;
+
+  bool has_system_id (void) const;
+
+  PortableServer::Servant find_servant (const PortableServer::ObjectId &system_id
+                                        ACE_ENV_ARG_DECL);
+
+  TAO_SERVANT_LOCATION servant_present (
+    const PortableServer::ObjectId &system_id,
+    PortableServer::Servant &servant
+    ACE_ENV_ARG_DECL);
+
+  PortableServer::Servant find_servant (
+        const PortableServer::ObjectId &system_id,
+        TAO::Portable_Server::Servant_Upcall &servant_upcall,
+        TAO::Portable_Server::POA_Current_Impl &poa_current_impl
+        ACE_ENV_ARG_DECL);
+
+  int unbind_using_user_id (const PortableServer::ObjectId &user_id);
+
+  void cleanup_servant (
+    PortableServer::Servant servant,
+    const PortableServer::ObjectId &user_id
+    ACE_ENV_ARG_DECL);
+
+  void post_invoke_servant_cleanup(
+    const PortableServer::ObjectId &system_id,
+    const TAO::Portable_Server::Servant_Upcall &servant_upcall);
+
+   bool validate_lifespan (
+    CORBA::Boolean is_persistent,
+    const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const;
+
+  PortableServer::ObjectId *activate_object_i (
+      PortableServer::Servant p_servant,
+      CORBA::Short priority,
+      int &wait_occurred_restart_call
+      ACE_ENV_ARG_DECL
+    )
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     PortableServer::POA::ServantAlreadyActive,
+                     PortableServer::POA::WrongPolicy));
+
+  CORBA::Object_ptr id_to_reference_i (const PortableServer::ObjectId &oid
+                                       ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     PortableServer::POA::ObjectNotActive,
+                     PortableServer::POA::WrongPolicy));
+
+  PortableServer::ObjectId *servant_to_id_i (PortableServer::Servant servant
+                                             ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     PortableServer::POA::ServantNotActive,
+                     PortableServer::POA::WrongPolicy));
+
+  TAO_SYNCH_CONDITION &servant_deactivation_condition (void);
+
+  int is_poa_generated_id (const PortableServer::ObjectId &id);
+
+  /// Check the state of this POA
+  void check_state (ACE_ENV_SINGLE_ARG_DECL);
+
+  int delete_child (const String &child);
+
+  PortableServer::Servant user_id_to_servant_i (const PortableServer::ObjectId &oid
+                                                ACE_ENV_ARG_DECL)
+    ACE_THROW_SPEC ((CORBA::SystemException,
+                     PortableServer::POA::ObjectNotActive,
+                     PortableServer::POA::WrongPolicy));
+
 protected:
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+  int enter (void);
+
+  int exit (void);
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
   /// Template method for creating new POA's of this type.
-  virtual TAO_POA *new_POA (const String &name,
+  virtual TAO_Root_POA *new_POA (const String &name,
                             TAO_POA_Manager &poa_manager,
                             const TAO_POA_Policy_Set &policies,
-                            TAO_POA *parent,
+                            TAO_Root_POA *parent,
                             ACE_Lock &lock,
                             TAO_SYNCH_MUTEX &thread_lock,
                             TAO_ORB_Core &orb_core,
@@ -576,7 +585,7 @@ protected:
                      PortableServer::POA::AdapterAlreadyExists,
                      PortableServer::POA::InvalidPolicy));
 
-  TAO_POA *create_POA_i (const String &adapter_name,
+  TAO_Root_POA *create_POA_i (const String &adapter_name,
                          TAO_POA_Manager &poa_manager,
                          const TAO_POA_Policy_Set &policies
                          ACE_ENV_ARG_DECL)
@@ -584,7 +593,7 @@ protected:
                      PortableServer::POA::AdapterAlreadyExists,
                      PortableServer::POA::InvalidPolicy));
 
-  TAO_POA *find_POA_i (const ACE_CString &child_name,
+  TAO_Root_POA *find_POA_i (const ACE_CString &child_name,
                        CORBA::Boolean activate_it
                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
@@ -628,43 +637,6 @@ protected:
                                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-  PortableServer::ServantManager_ptr get_servant_manager_i (
-      ACE_ENV_SINGLE_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
-
-  void set_servant_manager_i (PortableServer::ServantManager_ptr imgr
-                              ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
-
-  PortableServer::Servant get_servant_i (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::NoServant,
-                     PortableServer::POA::WrongPolicy));
-
-  void set_servant_i (PortableServer::Servant servant
-                      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-  /// @name Implementation repository related methods
-  //@{
-
-  /// ImplRepo helper method, notify the ImplRepo on startup
-  void imr_notify_startup (ACE_ENV_SINGLE_ARG_DECL);
-
-  /// ImplRepo helper method, notify the ImplRepo on shutdown
-  void imr_notify_shutdown (void);
-  //@}
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
   /// Wrapper for the ORB's key_to_object that will alter the object pointer
   /// if the ImplRepo is used.
   CORBA::Object_ptr key_to_object (const TAO::ObjectKey &key,
@@ -687,24 +659,11 @@ protected:
                                 TAO_Acceptor_Registry &acceptor_registry
                                 ACE_ENV_ARG_DECL);
 
-  int is_servant_in_map (PortableServer::Servant servant,
-                         int &wait_occurred_restart_call);
-
-  int is_user_id_in_map (const PortableServer::ObjectId &user_id,
-                         CORBA::Short priority,
-                         int &priorities_match,
-                         int &wait_occurred_restart_call);
-
-  PortableServer::ObjectId *activate_object_i (
-      PortableServer::Servant p_servant,
-      CORBA::Short priority,
-      int &wait_occurred_restart_call
-      ACE_ENV_ARG_DECL
-    )
+  PortableServer::Servant get_servant_i (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantAlreadyActive,
                      PortableServer::POA::WrongPolicy));
 
+protected:
   void activate_object_with_id_i (const PortableServer::ObjectId &id,
                                   PortableServer::Servant p_servant,
                                   CORBA::Short priority,
@@ -715,6 +674,8 @@ protected:
                      PortableServer::POA::ObjectAlreadyActive,
                      PortableServer::POA::WrongPolicy));
 
+  virtual void remove_from_parent_i (ACE_ENV_SINGLE_ARG_DECL);
+
   void deactivate_all_objects_i (CORBA::Boolean etherealize_objects
                                  ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException,
@@ -729,24 +690,6 @@ protected:
   void wait_for_completions (CORBA::Boolean wait_for_completion
                              ACE_ENV_ARG_DECL);
 
-  void check_poa_manager_state (ACE_ENV_SINGLE_ARG_DECL);
-
-  void deactivate_object_i (const PortableServer::ObjectId &oid
-                            ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::ObjectNotActive,
-                   PortableServer::POA::WrongPolicy));
-
-  void cleanup_servant (
-      TAO_Active_Object_Map::Map_Entry *active_object_map_entry
-      ACE_ENV_ARG_DECL
-    );
-
-  void deactivate_map_entry (
-      TAO_Active_Object_Map::Map_Entry *active_object_map_entry
-      ACE_ENV_ARG_DECL
-    );
-
   CORBA::Object_ptr create_reference_i (const char *intf,
                                         CORBA::Short priority
                                         ACE_ENV_ARG_DECL)
@@ -759,32 +702,7 @@ protected:
       CORBA::Short priority
       ACE_ENV_ARG_DECL
     )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
-
-  PortableServer::ObjectId *servant_to_id_i (PortableServer::Servant servant
-                                             ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantNotActive,
-                     PortableServer::POA::WrongPolicy));
-
-  PortableServer::ObjectId *servant_to_system_id (
-      PortableServer::Servant p_servant,
-      CORBA::Short &priority
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantNotActive,
-                     PortableServer::POA::WrongPolicy));
-
-  PortableServer::ObjectId *servant_to_system_id_i (
-      PortableServer::Servant p_servant,
-      CORBA::Short &priority
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ServantNotActive,
-                     PortableServer::POA::WrongPolicy));
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::Servant reference_to_servant_i (
       CORBA::Object_ptr reference
@@ -807,12 +725,6 @@ protected:
                      PortableServer::POA::ObjectNotActive,
                      PortableServer::POA::WrongPolicy));
 
-  CORBA::Object_ptr id_to_reference_i (const PortableServer::ObjectId &oid
-                                       ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::ObjectNotActive,
-                     PortableServer::POA::WrongPolicy));
-
   /// Call the IORInterceptor::establish_components() method on all
   /// registered IORInterceptors.
   /**
@@ -828,30 +740,21 @@ protected:
   void components_established (PortableInterceptor::IORInfo_ptr info
                                ACE_ENV_ARG_DECL);
 
-  int delete_child (const String &child);
-
-  void set_folded_name (void);
+  void set_folded_name (TAO_Root_POA *parent);
 
-  void set_id (void);
+  void set_id (TAO_Root_POA *parent);
 
   TAO::ObjectKey *create_object_key (const PortableServer::ObjectId &id);
 
-  int is_poa_generated_id (const PortableServer::ObjectId &id);
-
   static int parse_key (const TAO::ObjectKey &key,
                         TAO_Object_Adapter::poa_name &poa_system_name,
                         PortableServer::ObjectId &system_id,
                         CORBA::Boolean &is_root,
                         CORBA::Boolean &is_persistent,
                         CORBA::Boolean &is_system_id,
-                        TAO_Temporary_Creation_Time &poa_creation_time);
-
-  /// Access the list of default POA policies.  This list is used as a
-  /// prototype for creating new POA's.  It should
-  static TAO_POA_Policy_Set &default_poa_policies (void);
+                        TAO::Portable_Server::Temporary_Creation_Time &poa_creation_time);
 
 protected:
-
   /// Accessor methods to ObjectReferenceTemplate
   PortableInterceptor::ObjectReferenceTemplate *
     get_adapter_template (ACE_ENV_SINGLE_ARG_DECL)
@@ -870,6 +773,7 @@ protected:
     PortableInterceptor::ObjectReferenceFactory *current_factory
     ACE_ENV_ARG_DECL);
 
+
   TAO_SERVANT_LOCATION locate_servant_i (const PortableServer::ObjectId &id,
                                          PortableServer::Servant &servant
                                          ACE_ENV_ARG_DECL);
@@ -877,17 +781,20 @@ protected:
   PortableServer::Servant locate_servant_i (
       const char *operation,
       const PortableServer::ObjectId &id,
-      TAO_Object_Adapter::Servant_Upcall &servant_upcall,
-      TAO_POA_Current_Impl &poa_current_impl,
+      TAO::Portable_Server::Servant_Upcall &servant_upcall,
+      TAO::Portable_Server::POA_Current_Impl &poa_current_impl,
       int &wait_occurred_restart_call
       ACE_ENV_ARG_DECL
     );
 
+public:
+    // @todo Temporarily for servant retention
   CORBA::Object_ptr
   invoke_key_to_object_helper_i (const char * repository_id,
                                  const PortableServer::ObjectId & id
                                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
+protected:
 
   /// Get the ORT adapter, in case there is no adapter yet, this method will
   /// try to create one and hold the POA lock
@@ -895,36 +802,28 @@ protected:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Get the ORT adapter, in case there is no adapter yet, this method will
-  /// try to create one but assumes the POA lock is already hole
+  /// try to create one but assumes the POA lock is already hold
   TAO::ORT_Adapter *ORT_adapter_i (void);
 
   TAO::ORT_Adapter_Factory *ORT_adapter_factory (void);
 
-  const TAO_Creation_Time &creation_time (void);
-
   CORBA::Boolean persistent (void);
 
-  char persistent_key_type (void);
-
   static char persistent_key_char (void);
 
   static char transient_key_char (void);
 
   static CORBA::ULong persistent_key_type_length (void);
 
-  CORBA::Boolean system_id (void);
-
-  char system_id_key_type (void);
-
   static char system_id_key_char (void);
 
   static char user_id_key_char (void);
 
   static CORBA::ULong system_id_key_type_length (void);
 
-  CORBA::Boolean root (void);
+  virtual CORBA::Boolean root (void) const;
 
-  char root_key_type (void);
+  virtual char root_key_type (void);
 
   static char root_key_char (void);
 
@@ -938,10 +837,9 @@ protected:
 
   CORBA::ULong decrement_outstanding_requests (void);
 
-  TAO_SYNCH_RECURSIVE_MUTEX &single_threaded_lock (void) const;
-
   String name_;
 
+  /// The POA Manager belonging to this POA
   TAO_POA_Manager &poa_manager_;
 
   IOP::TaggedComponentList tagged_component_;
@@ -952,10 +850,6 @@ protected:
 
   TAO_POA_Policy_Set policies_;
 
-  TAO_POA *parent_;
-
-  TAO_Active_Object_Map *active_object_map_;
-
   TAO_Object_Adapter::poa_name folded_name_;
 
   TAO_Object_Adapter::poa_name_var system_name_;
@@ -968,35 +862,19 @@ protected:
   /// Adapter can be accepting, rejecting etc.
   PortableInterceptor::AdapterState adapter_state_;
 
-  TAO_POA_Cached_Policies cached_policies_;
+  TAO::Portable_Server::Cached_Policies cached_policies_;
 
-  int delete_active_object_map_;
+  TAO::Portable_Server::Active_Policy_Strategies active_policy_strategies_;
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
   PortableServer::AdapterActivator_var adapter_activator_;
 
-  PortableServer::ServantActivator_var servant_activator_;
-
-  PortableServer::ServantLocator_var servant_locator_;
-
-  PortableServer::ServantBase_var default_servant_;
-
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
-#if (TAO_HAS_MINIMUM_CORBA == 0)
-
-  /// Implementation Repository Server Object
-  ServerObject_i *server_object_;
-
-  /// Flag for whether the ImR should be used or not.
-  int use_imr_;
-
-#endif /* TAO_HAS_MINIMUM_CORBA */
-
   typedef
     ACE_Hash_Map_Manager_Ex<
-        ACE_CString, TAO_POA *,
+        ACE_CString, TAO_Root_POA *,
         ACE_Hash<ACE_CString>,
         ACE_Equal_To<ACE_CString>,
         ACE_Null_Mutex
@@ -1007,8 +885,6 @@ protected:
 
   ACE_Lock &lock_;
 
-  TAO_Creation_Time creation_time_;
-
   TAO_ORB_Core &orb_core_;
 
   /// The object adapter we belong to
@@ -1016,8 +892,6 @@ protected:
 
   CORBA::Boolean cleanup_in_progress_;
 
-  CORBA::Boolean etherealize_objects_;
-
   CORBA::ULong outstanding_requests_;
 
   TAO_SYNCH_CONDITION outstanding_requests_condition_;
@@ -1028,10 +902,8 @@ protected:
 
   TAO_SYNCH_CONDITION servant_deactivation_condition_;
 
-  CORBA::ULong waiting_servant_deactivation_;
-
-  TAO_SYNCH_RECURSIVE_MUTEX *single_threaded_lock_;
-
+public:
+    // @todo Temporarily for servant retention
   CORBA::ULong caller_key_to_object_;
 
   PortableServer::Servant servant_for_key_to_object_;
@@ -1054,47 +926,6 @@ protected:
   Key_To_Object_Params key_to_object_params_;
 };
 
-
-/**
- * @class TAO_POA_Guard
- *
- * @brief TAO_POA_Guard
- *
- * TAO_POA_Guard
- */
-class TAO_PortableServer_Export TAO_POA_Guard
-{
-public:
-  TAO_POA_Guard (TAO_POA &poa
-                 ACE_ENV_ARG_DECL,
-                 int check_for_destruction = 1);
-
-private:
-  ACE_Guard<ACE_Lock> guard_;
-};
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-class TAO_PortableServer_Export TAO_Adapter_Activator
-  : public PortableServer::AdapterActivator
-{
-public:
-
-  TAO_Adapter_Activator (PortableServer::POAManager_ptr poa_manager);
-
-  CORBA::Boolean unknown_adapter (PortableServer::POA_ptr parent,
-                                  const char *name
-                                  ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-protected:
-
-  /// POA Manager
-  PortableServer::POAManager_var poa_manager_;
-};
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
 /**
  * @class TAO_POA_Static_Resources
  *
@@ -1102,11 +933,11 @@ protected:
  *
  * This class is used by the POA to store the resources global to
  * all POA's.  All instance variables that would have been
- * declared "static" in TAO_POA, should be declared in this class
+ * declared "static" in TAO_Regular_POA, should be declared in this class
  * to avoid the "static initialization order fiasco" as described in
  * http://www.parashift.com/c++-faq-lite/ctors.html#faq-10.11.
  * Briefly, this is the problem that occurs if any static initializers
- * in any other code call into set static members of TAO_POA.
+ * in any other code call into set static members of TAO_Regular_POA.
  * Since the order in which these initializers execute is unspecified,
  * uninitialized members can be accessed.
  */
@@ -1129,6 +960,13 @@ public:
    */
   ACE_CString ort_adapter_factory_name_;
 
+  /**
+   * Name of the service object for functions that make calls on
+   * the Implementation Repository. The default value is "ImR_Client_Adapter".
+   * If TAO_IMR_CLient is linked, imr_client_adapter_name() will be
+   * called to set the value to "Concrete_ImR_Client_Adapter".
+   */
+  ACE_CString imr_client_adapter_name_;
 private:
   /// Constructor.
   TAO_POA_Static_Resources (void);
@@ -1145,14 +983,14 @@ private:
 
 // ****************************************************************
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #if defined (__ACE_INLINE__)
-# include "POA.i"
+# include "Root_POA.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
 
-#endif /* TAO_POA_H */
+#endif /* TAO_ROOT_POA_H */
diff --git a/TAO/tao/PortableServer/Root_POA.inl b/TAO/tao/PortableServer/Root_POA.inl
new file mode 100644
index 00000000000..a3abcf9341e
--- /dev/null
+++ b/TAO/tao/PortableServer/Root_POA.inl
@@ -0,0 +1,236 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// Exception macros
+#include "tao/Environment.h"
+
+ACE_INLINE CORBA::Boolean
+TAO_Root_POA::cleanup_in_progress (void)
+{
+  return this->cleanup_in_progress_;
+}
+
+ACE_INLINE ACE_Lock &
+TAO_Root_POA::lock (void)
+{
+  return this->lock_;
+}
+
+ACE_INLINE TAO_POA_Policy_Set &
+TAO_Root_POA::policies (void)
+{
+  return this->policies_;
+}
+
+ACE_INLINE PortableServer::POA_ptr
+TAO_Root_POA::the_parent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return PortableServer::POA::_nil ();
+}
+
+ACE_INLINE PortableInterceptor::AdapterName *
+TAO_Root_POA::adapter_name (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return this->adapter_name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+ACE_INLINE PortableInterceptor::ObjectReferenceTemplate *
+TAO_Root_POA::get_adapter_template (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  if (this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER))
+    {
+      return this->ort_adapter_->get_adapter_template();
+    }
+
+  return 0;
+}
+
+ACE_INLINE PortableInterceptor::ObjectReferenceTemplate *
+TAO_Root_POA::get_adapter_template_i ()
+{
+  if (this->ORT_adapter_i ())
+    {
+      return this->ort_adapter_->get_adapter_template ();
+    }
+
+  return 0;
+}
+
+ACE_INLINE PortableInterceptor::ObjectReferenceFactory *
+TAO_Root_POA::get_obj_ref_factory (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  if (this->ORT_adapter (ACE_ENV_SINGLE_ARG_PARAMETER))
+    {
+      return this->ort_adapter_->get_obj_ref_factory();
+    }
+
+  return 0;
+}
+
+ACE_INLINE CORBA::Boolean
+TAO_Root_POA::system_id (void)
+{
+  return (this->cached_policies_.id_assignment () == PortableServer::SYSTEM_ID);
+}
+
+ACE_INLINE CORBA::Boolean
+TAO_Root_POA::persistent (void)
+{
+  return (this->cached_policies_.lifespan () == PortableServer::PERSISTENT);
+}
+
+ACE_INLINE const ACE_CString &
+TAO_Root_POA::name (void) const
+{
+  return this->name_;
+}
+
+ACE_INLINE char *
+TAO_Root_POA::the_name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+  ACE_THROW_SPEC ((CORBA::SystemException))
+{
+  return CORBA::string_dup (this->name_.c_str ());
+}
+
+ACE_INLINE const TAO_Object_Adapter::poa_name &
+TAO_Root_POA::folded_name (void) const
+{
+  return this->folded_name_;
+}
+
+ACE_INLINE const TAO_Object_Adapter::poa_name &
+TAO_Root_POA::system_name (void) const
+{
+  return this->system_name_.in ();
+}
+
+ACE_INLINE char
+TAO_Root_POA::name_separator (void)
+{
+  return '\0';
+}
+
+ACE_INLINE CORBA::ULong
+TAO_Root_POA::name_separator_length (void)
+{
+  return sizeof (char);
+}
+
+ACE_INLINE char
+TAO_Root_POA::persistent_key_char (void)
+{
+  return 'P';
+}
+
+ACE_INLINE char
+TAO_Root_POA::transient_key_char (void)
+{
+  return 'T';
+}
+
+ACE_INLINE CORBA::ULong
+TAO_Root_POA::persistent_key_type_length (void)
+{
+  return sizeof (char);
+}
+
+ACE_INLINE char
+TAO_Root_POA::system_id_key_char (void)
+{
+  return 'S';
+}
+
+ACE_INLINE char
+TAO_Root_POA::user_id_key_char (void)
+{
+  return 'U';
+}
+
+ACE_INLINE CORBA::ULong
+TAO_Root_POA::system_id_key_type_length (void)
+{
+  return sizeof (char);
+}
+
+ACE_INLINE char
+TAO_Root_POA::root_key_char (void)
+{
+  return 'R';
+}
+
+ACE_INLINE char
+TAO_Root_POA::non_root_key_char (void)
+{
+  return 'N';
+}
+
+ACE_INLINE char
+TAO_Root_POA::root_key_type (void)
+{
+  return TAO_Root_POA::root_key_char ();
+}
+
+ACE_INLINE CORBA::ULong
+TAO_Root_POA::root_key_type_length (void)
+{
+  return sizeof (char);
+}
+
+ACE_INLINE CORBA::ULong
+TAO_Root_POA::outstanding_requests (void) const
+{
+  return this->outstanding_requests_;
+}
+
+ACE_INLINE void
+TAO_Root_POA::outstanding_requests (CORBA::ULong new_outstanding_requests)
+{
+  this->outstanding_requests_ = new_outstanding_requests;
+}
+
+ACE_INLINE CORBA::ULong
+TAO_Root_POA::increment_outstanding_requests (void)
+{
+  return ++this->outstanding_requests_;
+}
+
+ACE_INLINE CORBA::ULong
+TAO_Root_POA::decrement_outstanding_requests (void)
+{
+  return --this->outstanding_requests_;
+}
+
+ACE_INLINE CORBA::Boolean
+TAO_Root_POA::waiting_destruction (void) const
+{
+  return this->waiting_destruction_;
+}
+
+ACE_INLINE TAO_ORB_Core &
+TAO_Root_POA::orb_core (void) const
+{
+  return this->orb_core_;
+}
+
+ACE_INLINE PortableInterceptor::AdapterState
+TAO_Root_POA::get_adapter_state (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+{
+  return this->adapter_state_;
+}
+
+ACE_INLINE void *
+TAO_Root_POA::thread_pool (void) const
+{
+  return 0;
+}
+
+ACE_INLINE TAO_SYNCH_CONDITION &
+TAO_Root_POA::servant_deactivation_condition (void)
+{
+  return servant_deactivation_condition_;
+}
diff --git a/TAO/tao/PortableServer/ServantActivator.pidl b/TAO/tao/PortableServer/ServantActivator.pidl
new file mode 100644
index 00000000000..52052f2df94
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantActivator.pidl
@@ -0,0 +1,49 @@
+/**
+ * @file ServantActivator.pidl
+ *
+ * $Id$
+ *
+ * @brief Pre-compiled IDL source for the PortableServer module.
+ *
+ * This file was used to generate the code in
+ * ServantActivatorC.{h,inl,cpp}, using the following command:
+ *
+ * tao_idl.exe \
+ *     -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT)
+ *          -Wb,export_macro=TAO_PortableServer_Export \
+ *          -Wb,export_include="portableserver_export.h" \
+ *          -Wb,pre_include="ace/pre.h" \
+ *          -Wb,post_include="ace/post.h" \
+ *          ServantActivator.pidl
+ */
+
+#ifndef _PORTABLESERVER_SERVANT_ACTIVATOR_IDL_
+#define _PORTABLESERVER_SERVANT_ACTIVATOR_IDL_
+
+#include <tao/PortableServer/PS_Forward.pidl>
+#include <tao/PortableServer/ServantManager.pidl>
+#include <tao/PortableServer/ForwardRequest.pidl>
+
+#pragma prefix "omg.org"
+
+module PortableServer
+{
+# pragma version PortableServer 2.3
+
+  local interface ServantActivator : ServantManager
+  {
+#   pragma version ServantActivator 2.3
+
+    Servant incarnate (in ObjectId oid,
+                       in POA adapter)
+      raises (ForwardRequest);
+
+    void etherealize (in ObjectId oid,
+                      in POA adapter,
+                      in Servant serv,
+                      in boolean cleanup_in_progress,
+                      in boolean remaining_activations);
+  };
+};
+
+#endif // _PORTABLESERVER_SERVANT_ACTIVATOR_IDL_
diff --git a/TAO/tao/PortableServer/ServantActivatorA.cpp b/TAO/tao/PortableServer/ServantActivatorA.cpp
new file mode 100644
index 00000000000..565c14858f8
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantActivatorA.cpp
@@ -0,0 +1,162 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+
+#include "ServantActivatorC.h"
+#include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
+#include "tao/Any_Impl_T.h"
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+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 (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 (0x0),  // name = ServantActivator
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantActivator (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_ServantActivator),
+    (char *) &_oc_PortableServer_ServantActivator,
+    0,
+    0
+  );
+
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_ServantActivator =
+    &_tc_TAO_tc_PortableServer_ServantActivator;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+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 false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantActivator>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ServantActivator_ptr _tao_elem
+  )
+{
+  PortableServer::ServantActivator_ptr _tao_objptr =
+    PortableServer::ServantActivator::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ServantActivator_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::ServantActivator>::insert (
+      _tao_any,
+      PortableServer::ServantActivator::_tao_any_destructor,
+      PortableServer::_tc_ServantActivator,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ServantActivator_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::ServantActivator>::extract (
+        _tao_any,
+        PortableServer::ServantActivator::_tao_any_destructor,
+        PortableServer::_tc_ServantActivator,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Any_Impl_T<
+        PortableServer::ServantActivator
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        PortableServer::ServantActivator \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantActivatorC.cpp b/TAO/tao/PortableServer/ServantActivatorC.cpp
new file mode 100644
index 00000000000..7b0a64955f5
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantActivatorC.cpp
@@ -0,0 +1,238 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:302
+
+
+#include "ServantActivatorC.h"
+#include "tao/CDR.h"
+#include "tao/ORB_Core.h"
+#include "ace/OS_NS_string.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if !defined (__ACE_INLINE__)
+#include "ServantActivatorC.inl"
+#endif /* !defined INLINE */
+
+// TAO_IDL - Generated from
+// be\be_visitor_arg_traits.cpp:66
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+// Arg traits specializations.
+namespace TAO
+{
+}
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/interface_cs.cpp:60
+
+// Traits specializations for PortableServer::ServantActivator.
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+PortableServer::ServantActivator_ptr
+TAO::Objref_Traits<PortableServer::ServantActivator>::duplicate (
+    PortableServer::ServantActivator_ptr p
+  )
+{
+  return PortableServer::ServantActivator::_duplicate (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+void
+TAO::Objref_Traits<PortableServer::ServantActivator>::release (
+    PortableServer::ServantActivator_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+PortableServer::ServantActivator_ptr
+TAO::Objref_Traits<PortableServer::ServantActivator>::nil (void)
+{
+  return PortableServer::ServantActivator::_nil ();
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+CORBA::Boolean
+TAO::Objref_Traits<PortableServer::ServantActivator>::marshal (
+    PortableServer::ServantActivator_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return CORBA::Object::marshal (p, cdr);
+}
+
+PortableServer::ServantActivator::ServantActivator (void)
+{}
+
+PortableServer::ServantActivator::~ServantActivator (void)
+{}
+
+void 
+PortableServer::ServantActivator::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ServantActivator *_tao_tmp_pointer =
+    static_cast<ServantActivator *> (_tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
+}
+
+PortableServer::ServantActivator_ptr
+PortableServer::ServantActivator::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return ServantActivator::_nil ();
+    }
+  
+  ServantActivator_ptr proxy =
+    dynamic_cast<ServantActivator_ptr> (_tao_objref);
+  
+  return ServantActivator::_duplicate (proxy);
+}
+
+PortableServer::ServantActivator_ptr
+PortableServer::ServantActivator::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return ServantActivator::_nil ();
+    }
+  
+  ServantActivator_ptr proxy =
+    dynamic_cast<ServantActivator_ptr> (_tao_objref);
+  
+  return ServantActivator::_duplicate (proxy);
+}
+
+PortableServer::ServantActivator_ptr
+PortableServer::ServantActivator::_duplicate (ServantActivator_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+CORBA::Boolean
+PortableServer::ServantActivator::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/PortableServer/ServantManager:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/PortableServer/ServantActivator:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+    )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+const char* PortableServer::ServantActivator::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/PortableServer/ServantActivator:2.3";
+}
+
+CORBA::Boolean
+PortableServer::ServantActivator::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_root/root.cpp:1629
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Objref_Traits<
+        PortableServer::ServantActivator
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::ServantActivator
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::ServantActivator
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Objref_Traits< \
+        PortableServer::ServantActivator \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::ServantActivator
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::ServantActivator
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantActivatorC.h b/TAO/tao/PortableServer/ServantActivatorC.h
new file mode 100644
index 00000000000..a7531aaf33d
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantActivatorC.h
@@ -0,0 +1,271 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:153
+
+#ifndef _TAO_IDL_ORIG_SERVANTACTIVATORC_H_
+#define _TAO_IDL_ORIG_SERVANTACTIVATORC_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "portableserver_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
+#include "tao/Environment.h"
+#include "tao/Object.h"
+#include "tao/Objref_VarOut_T.h"
+
+#include "tao/PortableServer/PS_ForwardC.h"
+#include "tao/PortableServer/ServantManagerC.h"
+#include "tao/PortableServer/ForwardRequestC.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_PortableServer_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_ch.cpp:62
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  class Collocation_Proxy_Broker;
+  
+  template<typename T> class Narrow_Utils;
+  template<typename T> class AbstractBase_Narrow_Utils;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_interface.cpp:598
+
+#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;
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_interface/interface_ch.cpp:54
+
+#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;
+    
+    // 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 static_cast<ServantActivator_ptr> (0);
+    }
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::PortableServer::Servant incarnate (
+        const ::PortableServer::ObjectId & oid,
+        ::PortableServer::POA_ptr adapter
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        ::PortableServer::ForwardRequest
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void etherealize (
+        const ::PortableServer::ObjectId & oid,
+        ::PortableServer::POA_ptr adapter,
+        ::PortableServer::Servant serv,
+        ::CORBA::Boolean cleanup_in_progress,
+        ::CORBA::Boolean remaining_activations
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_interface/interface_ch.cpp:208
+    
+    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:
+    // Abstract or local interface only.
+    ServantActivator (void);
+    
+    virtual ~ServantActivator (void);
+  
+  private:
+    // Private and unimplemented for concrete interfaces.
+    ServantActivator (const ServantActivator &);
+    
+    void operator= (const ServantActivator &);
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServantActivator;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:66
+
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:59
+
+// Traits specializations.
+namespace TAO
+{
+
+#if !defined (_PORTABLESERVER_SERVANTACTIVATOR__TRAITS_CH_)
+#define _PORTABLESERVER_SERVANTACTIVATOR__TRAITS_CH_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ServantActivator>
+  {
+    static ::PortableServer::ServantActivator_ptr duplicate (
+        ::PortableServer::ServantActivator_ptr
+      );
+    static void release (
+        ::PortableServer::ServantActivator_ptr
+      );
+    static ::PortableServer::ServantActivator_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::PortableServer::ServantActivator_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantActivator_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantActivator_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantActivator_ptr &);
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:961
+
+#if defined (__ACE_INLINE__)
+#include "ServantActivatorC.inl"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/PortableServer/ServantActivatorC.inl b/TAO/tao/PortableServer/ServantActivatorC.inl
new file mode 100644
index 00000000000..c944d806c1f
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantActivatorC.inl
@@ -0,0 +1,27 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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/ServantLocator.pidl b/TAO/tao/PortableServer/ServantLocator.pidl
new file mode 100644
index 00000000000..2d452f7d2ba
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantLocator.pidl
@@ -0,0 +1,59 @@
+/**
+ * @file ServantLocator.pidl
+ *
+ * $Id$
+ *
+ * @brief Pre-compiled IDL source for the PortableServer module.
+ *
+ * This file was used to generate the code in
+ * ServantLocatorC.{h,inl,cpp}, using the following command:
+ *
+ * tao_idl.exe \
+ *     -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT)
+ *          -Wb,export_macro=TAO_PortableServer_Export \
+ *          -Wb,export_include="portableserver_export.h" \
+ *          -Wb,pre_include="ace/pre.h" \
+ *          -Wb,post_include="ace/post.h" \
+ *          ServantLocator.pidl
+ *
+ * Apply patches using the following command:
+ *
+ *   patch < diffs/PS_Forward.diff
+ */
+
+#ifndef _PORTABLESERVER_SERVANTLOCATOR_IDL_
+#define _PORTABLESERVER_SERVANTLOCATOR_IDL_
+
+#include <orb_types.pidl>
+#include <tao/PortableServer/PS_Forward.pidl>
+#include <tao/PortableServer/ServantManager.pidl>
+#include <tao/PortableServer/ForwardRequest.pidl>
+
+#pragma prefix "omg.org"
+
+module PortableServer
+{
+# pragma version PortableServer 2.3
+
+  local interface ServantLocator : ServantManager
+  {
+#   pragma version ServantLocator 2.3
+
+    native Cookie;
+
+    Servant preinvoke (in ObjectId oid,
+                       in POA adapter,
+                       in CORBA::Identifier operation,
+                       out Cookie the_cookie)
+      raises (ForwardRequest);
+
+    void postinvoke (in ObjectId oid,
+                     in POA adapter,
+                     in CORBA::Identifier operation,
+                     in Cookie  the_cookie,
+                     in Servant the_servant);
+  };
+
+};
+
+#endif // _PORTABLESERVER_SERVANTLOCATOR_IDL_
diff --git a/TAO/tao/PortableServer/ServantLocatorA.cpp b/TAO/tao/PortableServer/ServantLocatorA.cpp
new file mode 100644
index 00000000000..4599983d5ce
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantLocatorA.cpp
@@ -0,0 +1,161 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+
+#include "ServantLocatorC.h"
+#include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
+#include "tao/Any_Impl_T.h"
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+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 (0x33000000),  // repository ID = IDL:omg.org/PortableServer/ServantLocator:2.3
+    15,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x616e744c), 
+  ACE_NTOHL (0x6f636174), 
+  ACE_NTOHL (0x6f720000),  // name = ServantLocator
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantLocator (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_ServantLocator),
+    (char *) &_oc_PortableServer_ServantLocator,
+    0,
+    0
+  );
+
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_ServantLocator =
+    &_tc_TAO_tc_PortableServer_ServantLocator;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+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 false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantLocator>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ServantLocator_ptr _tao_elem
+  )
+{
+  PortableServer::ServantLocator_ptr _tao_objptr =
+    PortableServer::ServantLocator::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ServantLocator_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::ServantLocator>::insert (
+      _tao_any,
+      PortableServer::ServantLocator::_tao_any_destructor,
+      PortableServer::_tc_ServantLocator,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ServantLocator_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::ServantLocator>::extract (
+        _tao_any,
+        PortableServer::ServantLocator::_tao_any_destructor,
+        PortableServer::_tc_ServantLocator,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Any_Impl_T<
+        PortableServer::ServantLocator
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        PortableServer::ServantLocator \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantLocatorC.cpp b/TAO/tao/PortableServer/ServantLocatorC.cpp
new file mode 100644
index 00000000000..43534ae51f8
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantLocatorC.cpp
@@ -0,0 +1,238 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:302
+
+
+#include "ServantLocatorC.h"
+#include "tao/CDR.h"
+#include "tao/ORB_Core.h"
+#include "ace/OS_NS_string.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if !defined (__ACE_INLINE__)
+#include "ServantLocatorC.inl"
+#endif /* !defined INLINE */
+
+// TAO_IDL - Generated from
+// be\be_visitor_arg_traits.cpp:66
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+// Arg traits specializations.
+namespace TAO
+{
+}
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/interface_cs.cpp:60
+
+// Traits specializations for PortableServer::ServantLocator.
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+PortableServer::ServantLocator_ptr
+TAO::Objref_Traits<PortableServer::ServantLocator>::duplicate (
+    PortableServer::ServantLocator_ptr p
+  )
+{
+  return PortableServer::ServantLocator::_duplicate (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+void
+TAO::Objref_Traits<PortableServer::ServantLocator>::release (
+    PortableServer::ServantLocator_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+PortableServer::ServantLocator_ptr
+TAO::Objref_Traits<PortableServer::ServantLocator>::nil (void)
+{
+  return PortableServer::ServantLocator::_nil ();
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+CORBA::Boolean
+TAO::Objref_Traits<PortableServer::ServantLocator>::marshal (
+    PortableServer::ServantLocator_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return CORBA::Object::marshal (p, cdr);
+}
+
+PortableServer::ServantLocator::ServantLocator (void)
+{}
+
+PortableServer::ServantLocator::~ServantLocator (void)
+{}
+
+void 
+PortableServer::ServantLocator::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ServantLocator *_tao_tmp_pointer =
+    static_cast<ServantLocator *> (_tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
+}
+
+PortableServer::ServantLocator_ptr
+PortableServer::ServantLocator::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return ServantLocator::_nil ();
+    }
+  
+  ServantLocator_ptr proxy =
+    dynamic_cast<ServantLocator_ptr> (_tao_objref);
+  
+  return ServantLocator::_duplicate (proxy);
+}
+
+PortableServer::ServantLocator_ptr
+PortableServer::ServantLocator::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return ServantLocator::_nil ();
+    }
+  
+  ServantLocator_ptr proxy =
+    dynamic_cast<ServantLocator_ptr> (_tao_objref);
+  
+  return ServantLocator::_duplicate (proxy);
+}
+
+PortableServer::ServantLocator_ptr
+PortableServer::ServantLocator::_duplicate (ServantLocator_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+CORBA::Boolean
+PortableServer::ServantLocator::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/PortableServer/ServantManager:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/PortableServer/ServantLocator:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+    )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+const char* PortableServer::ServantLocator::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/PortableServer/ServantLocator:2.3";
+}
+
+CORBA::Boolean
+PortableServer::ServantLocator::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_root/root.cpp:1629
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Objref_Traits<
+        PortableServer::ServantLocator
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::ServantLocator
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::ServantLocator
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Objref_Traits< \
+        PortableServer::ServantLocator \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::ServantLocator
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::ServantLocator
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantLocatorC.h b/TAO/tao/PortableServer/ServantLocatorC.h
new file mode 100644
index 00000000000..a642e7009c9
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantLocatorC.h
@@ -0,0 +1,275 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:153
+
+#ifndef _TAO_IDL_ORIG_SERVANTLOCATORC_H_
+#define _TAO_IDL_ORIG_SERVANTLOCATORC_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "portableserver_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
+#include "tao/Environment.h"
+#include "tao/Object.h"
+#include "tao/Objref_VarOut_T.h"
+
+#include "tao/PortableServer/PS_ForwardC.h"
+#include "tao/PortableServer/ServantManagerC.h"
+#include "tao/PortableServer/ForwardRequestC.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_PortableServer_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_ch.cpp:62
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  class Collocation_Proxy_Broker;
+  
+  template<typename T> class Narrow_Utils;
+  template<typename T> class AbstractBase_Narrow_Utils;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_interface.cpp:598
+
+#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;
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_interface/interface_ch.cpp:54
+
+#if !defined (_PORTABLESERVER_SERVANTLOCATOR_CH_)
+#define _PORTABLESERVER_SERVANTLOCATOR_CH_
+  
+  class TAO_PortableServer_Export ServantLocator
+    : public virtual ::PortableServer::ServantManager
+  {
+  public:
+    typedef void *Cookie;
+
+    typedef ServantLocator_ptr _ptr_type;
+    typedef ServantLocator_var _var_type;
+    
+    // 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 static_cast<ServantLocator_ptr> (0);
+    }
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::PortableServer::Servant preinvoke (
+        const ::PortableServer::ObjectId & oid,
+        ::PortableServer::POA_ptr adapter,
+        const char * operation,
+        ::PortableServer::ServantLocator::Cookie & the_cookie
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException,
+        ::PortableServer::ForwardRequest
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void postinvoke (
+        const ::PortableServer::ObjectId & oid,
+        ::PortableServer::POA_ptr adapter,
+        const char * operation,
+        ::PortableServer::ServantLocator::Cookie the_cookie,
+        ::PortableServer::Servant the_servant
+        ACE_ENV_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_interface/interface_ch.cpp:208
+    
+    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:
+    // Abstract or local interface only.
+    ServantLocator (void);
+    
+    virtual ~ServantLocator (void);
+  
+  private:
+    // Private and unimplemented for concrete interfaces.
+    ServantLocator (const ServantLocator &);
+    
+    void operator= (const ServantLocator &);
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServantLocator;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:66
+
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:59
+
+// Traits specializations.
+namespace TAO
+{
+
+#if !defined (_PORTABLESERVER_SERVANTLOCATOR__TRAITS_CH_)
+#define _PORTABLESERVER_SERVANTLOCATOR__TRAITS_CH_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ServantLocator>
+  {
+    static ::PortableServer::ServantLocator_ptr duplicate (
+        ::PortableServer::ServantLocator_ptr
+      );
+    static void release (
+        ::PortableServer::ServantLocator_ptr
+      );
+    static ::PortableServer::ServantLocator_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::PortableServer::ServantLocator_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantLocator_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantLocator_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantLocator_ptr &);
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:961
+
+#if defined (__ACE_INLINE__)
+#include "ServantLocatorC.inl"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/PortableServer/ServantLocatorC.inl b/TAO/tao/PortableServer/ServantLocatorC.inl
new file mode 100644
index 00000000000..c944d806c1f
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantLocatorC.inl
@@ -0,0 +1,27 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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/ServantManager.pidl b/TAO/tao/PortableServer/ServantManager.pidl
new file mode 100644
index 00000000000..4bb36847cb9
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantManager.pidl
@@ -0,0 +1,33 @@
+/**
+ * @file ServantManager.pidl
+ *
+ * $Id$
+ *
+ * @brief Pre-compiled IDL source for the PortableServer module.
+ *
+ * This file was used to generate the code in
+ * ServantManagerC.{h,inl,cpp}, using the following command:
+ *
+ * tao_idl.exe \
+ *     -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT)
+ *          -Wb,export_macro=TAO_PortableServer_Export \
+ *          -Wb,export_include="portableserver_export.h" \
+ *          -Wb,pre_include="ace/pre.h" \
+ *          -Wb,post_include="ace/post.h" \
+ *          ServantManager.pidl
+ */
+
+#ifndef _PORTABLESERVER_SERVANT_MANAGER_IDL_
+#define _PORTABLESERVER_SERVANT_MANAGER_IDL_
+
+#pragma prefix "omg.org"
+
+module PortableServer
+{
+# pragma version PortableServer 2.3
+
+  // ServantManager interface.
+  local interface ServantManager {};
+};
+
+#endif // _PORTABLESERVER_SERVANT_MANAGER_IDL_
diff --git a/TAO/tao/PortableServer/ServantManagerA.cpp b/TAO/tao/PortableServer/ServantManagerA.cpp
new file mode 100644
index 00000000000..f36c7c4b6c2
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantManagerA.cpp
@@ -0,0 +1,161 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+
+#include "ServantManagerC.h"
+#include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
+#include "tao/Any_Impl_T.h"
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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 (0x33000000),  // repository ID = IDL:omg.org/PortableServer/ServantManager:2.3
+    15,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x616e744d), 
+  ACE_NTOHL (0x616e6167), 
+  ACE_NTOHL (0x65720000),  // name = ServantManager
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantManager (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_ServantManager),
+    (char *) &_oc_PortableServer_ServantManager,
+    0,
+    0
+  );
+
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_ServantManager =
+    &_tc_TAO_tc_PortableServer_ServantManager;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+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 false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantManager>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ServantManager_ptr _tao_elem
+  )
+{
+  PortableServer::ServantManager_ptr _tao_objptr =
+    PortableServer::ServantManager::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ServantManager_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::ServantManager>::insert (
+      _tao_any,
+      PortableServer::ServantManager::_tao_any_destructor,
+      PortableServer::_tc_ServantManager,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ServantManager_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::ServantManager>::extract (
+        _tao_any,
+        PortableServer::ServantManager::_tao_any_destructor,
+        PortableServer::_tc_ServantManager,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Any_Impl_T<
+        PortableServer::ServantManager
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        PortableServer::ServantManager \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantManagerC.cpp b/TAO/tao/PortableServer/ServantManagerC.cpp
new file mode 100644
index 00000000000..1af6cda1ead
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantManagerC.cpp
@@ -0,0 +1,232 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:302
+
+
+#include "ServantManagerC.h"
+#include "tao/CDR.h"
+#include "ace/OS_NS_string.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if !defined (__ACE_INLINE__)
+#include "ServantManagerC.inl"
+#endif /* !defined INLINE */
+
+// TAO_IDL - Generated from
+// be\be_visitor_arg_traits.cpp:66
+
+// Arg traits specializations.
+namespace TAO
+{
+}
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/interface_cs.cpp:60
+
+// Traits specializations for PortableServer::ServantManager.
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+PortableServer::ServantManager_ptr
+TAO::Objref_Traits<PortableServer::ServantManager>::duplicate (
+    PortableServer::ServantManager_ptr p
+  )
+{
+  return PortableServer::ServantManager::_duplicate (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+void
+TAO::Objref_Traits<PortableServer::ServantManager>::release (
+    PortableServer::ServantManager_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+PortableServer::ServantManager_ptr
+TAO::Objref_Traits<PortableServer::ServantManager>::nil (void)
+{
+  return PortableServer::ServantManager::_nil ();
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+CORBA::Boolean
+TAO::Objref_Traits<PortableServer::ServantManager>::marshal (
+    PortableServer::ServantManager_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return CORBA::Object::marshal (p, cdr);
+}
+
+PortableServer::ServantManager::ServantManager (void)
+{}
+
+PortableServer::ServantManager::~ServantManager (void)
+{}
+
+void 
+PortableServer::ServantManager::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ServantManager *_tao_tmp_pointer =
+    static_cast<ServantManager *> (_tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
+}
+
+PortableServer::ServantManager_ptr
+PortableServer::ServantManager::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return ServantManager::_nil ();
+    }
+  
+  ServantManager_ptr proxy =
+    dynamic_cast<ServantManager_ptr> (_tao_objref);
+  
+  return ServantManager::_duplicate (proxy);
+}
+
+PortableServer::ServantManager_ptr
+PortableServer::ServantManager::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return ServantManager::_nil ();
+    }
+  
+  ServantManager_ptr proxy =
+    dynamic_cast<ServantManager_ptr> (_tao_objref);
+  
+  return ServantManager::_duplicate (proxy);
+}
+
+PortableServer::ServantManager_ptr
+PortableServer::ServantManager::_duplicate (ServantManager_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+CORBA::Boolean
+PortableServer::ServantManager::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/PortableServer/ServantManager:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+    )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+const char* PortableServer::ServantManager::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/PortableServer/ServantManager:2.3";
+}
+
+CORBA::Boolean
+PortableServer::ServantManager::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_root/root.cpp:1629
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Objref_Traits<
+        PortableServer::ServantManager
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::ServantManager
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::ServantManager
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Objref_Traits< \
+        PortableServer::ServantManager \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::ServantManager
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::ServantManager
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantManagerC.h b/TAO/tao/PortableServer/ServantManagerC.h
new file mode 100644
index 00000000000..4ec924301a5
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantManagerC.h
@@ -0,0 +1,238 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:153
+
+#ifndef _TAO_IDL_ORIG_SERVANTMANAGERC_H_
+#define _TAO_IDL_ORIG_SERVANTMANAGERC_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "portableserver_export.h"
+#include "tao/ORB.h"
+#include "tao/Environment.h"
+#include "tao/Object.h"
+#include "tao/Objref_VarOut_T.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_PortableServer_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_ch.cpp:62
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  class Collocation_Proxy_Broker;
+  
+  template<typename T> class Narrow_Utils;
+  template<typename T> class AbstractBase_Narrow_Utils;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_interface.cpp:598
+
+#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;
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_interface/interface_ch.cpp:54
+
+#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;
+    
+    // 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 static_cast<ServantManager_ptr> (0);
+    }
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_interface/interface_ch.cpp:208
+    
+    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:
+    // Abstract or local interface only.
+    ServantManager (void);
+    
+    virtual ~ServantManager (void);
+  
+  private:
+    // Private and unimplemented for concrete interfaces.
+    ServantManager (const ServantManager &);
+    
+    void operator= (const ServantManager &);
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServantManager;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:66
+
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:59
+
+// Traits specializations.
+namespace TAO
+{
+
+#if !defined (_PORTABLESERVER_SERVANTMANAGER__TRAITS_CH_)
+#define _PORTABLESERVER_SERVANTMANAGER__TRAITS_CH_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ServantManager>
+  {
+    static ::PortableServer::ServantManager_ptr duplicate (
+        ::PortableServer::ServantManager_ptr
+      );
+    static void release (
+        ::PortableServer::ServantManager_ptr
+      );
+    static ::PortableServer::ServantManager_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::PortableServer::ServantManager_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantManager_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantManager_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantManager_ptr &);
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:961
+
+#if defined (__ACE_INLINE__)
+#include "ServantManagerC.inl"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/PortableServer/ServantManagerC.inl b/TAO/tao/PortableServer/ServantManagerC.inl
new file mode 100644
index 00000000000..c944d806c1f
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantManagerC.inl
@@ -0,0 +1,27 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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/ServantRetentionPolicy.cpp b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
new file mode 100644
index 00000000000..9ae6180bbb2
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
@@ -0,0 +1,67 @@
+#include "ServantRetentionPolicy.h"
+#include "PortableServer.h"
+
+ACE_RCSID (PortableServer,
+           ServantRetentionPolicy,
+           "$Id$")
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    ServantRetentionPolicy::ServantRetentionPolicy (
+      ::PortableServer::ServantRetentionPolicyValue value) :
+        value_ (value)
+    {
+    }
+
+    CORBA::Policy_ptr
+    ServantRetentionPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      ServantRetentionPolicy *copy = 0;
+      ACE_NEW_THROW_EX (copy,
+                        ServantRetentionPolicy (this->value_),
+                        CORBA::NO_MEMORY ());
+      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+
+      return copy;
+    }
+
+    void
+    ServantRetentionPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+    }
+
+    ::PortableServer::ServantRetentionPolicyValue
+    ServantRetentionPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      return value_;
+    }
+
+    CORBA::PolicyType
+    ServantRetentionPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      return ::PortableServer::SERVANT_RETENTION_POLICY_ID;
+    }
+
+    TAO_Cached_Policy_Type
+    ServantRetentionPolicy::_tao_cached_type (void) const
+    {
+      return TAO_CACHED_POLICY_SERVANT_RETENTION;
+    }
+
+    TAO_Policy_Scope
+    ServantRetentionPolicy::_tao_scope (void) const
+    {
+      return TAO_POLICY_POA_SCOPE;
+    }
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.h b/TAO/tao/PortableServer/ServantRetentionPolicy.h
new file mode 100644
index 00000000000..9495d660701
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantRetentionPolicy.h
@@ -0,0 +1,77 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file ServantRetentionPolicy.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_SERVANTRETENTIONPOLICY_H
+#define TAO_PORTABLESERVER_SERVANTRETENTIONPOLICY_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ServantRetentionPolicyC.h"
+#include "tao/LocalObject.h"
+
+// This is to remove "inherits via dominance" warnings from MSVC.
+// MSVC is being a little too paranoid.
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export ServantRetentionPolicy :
+      public virtual ::PortableServer::ServantRetentionPolicy,
+      public virtual TAO_Local_RefCounted_Object
+    {
+    public:
+      ServantRetentionPolicy (::PortableServer::ServantRetentionPolicyValue value);
+
+      CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      ::PortableServer::ServantRetentionPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      /// Return the cached policy type for this policy.
+      TAO_Cached_Policy_Type _tao_cached_type (void) const;
+
+      /// Returns the scope at which this policy can be applied. See orbconf.h.
+      TAO_Policy_Scope _tao_scope (void) const;
+
+    private:
+      ::PortableServer::ServantRetentionPolicyValue value_;
+    };
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_SERVANTRETENTIONPOLICY_H */
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.pidl b/TAO/tao/PortableServer/ServantRetentionPolicy.pidl
new file mode 100644
index 00000000000..5aeea72071d
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantRetentionPolicy.pidl
@@ -0,0 +1,40 @@
+/**
+ * @file ServantRetentionPolicy.pidl
+ *
+ * $Id$
+ *
+ * @brief Pre-compiled IDL source for the PortableServer module.
+ *
+ * tao_idl.exe \
+ *     -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT)
+ *          -Wb,export_macro=TAO_PortableServer_Export \
+ *          -Wb,export_include="portableserver_export.h" \
+ *          -Wb,pre_include="ace/pre.h" \
+ *          -Wb,post_include="ace/post.h" \
+ *          ServantRetentionPolicy.pidl
+ */
+
+#ifndef _PORTABLESERVER_SERVANTRETENTIONPOLICY_IDL_
+#define _PORTABLESERVER_SERVANTRETENTIONPOLICY_IDL_
+
+#include <tao/Policy.pidl>
+
+#pragma prefix "omg.org"
+
+module PortableServer
+{
+# pragma version PortableServer 2.3
+
+  enum ServantRetentionPolicyValue
+  {
+    RETAIN,
+    NON_RETAIN
+  };
+
+  local interface ServantRetentionPolicy : CORBA::Policy
+  {
+    readonly attribute ServantRetentionPolicyValue value;
+  };
+};
+
+#endif // _PORTABLESERVER_SERVANTRETENTIONPOLICY_IDL_
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp
new file mode 100644
index 00000000000..5e2d4cde106
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp
@@ -0,0 +1,258 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+
+#include "ServantRetentionPolicyC.h"
+#include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
+#include "tao/Any_Impl_T.h"
+#include "tao/Any_Basic_Impl_T.h"
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+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 (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 (0x6c756500),  // name = ServantRetentionPolicyValue
+  2, // member count
+  7,
+  ACE_NTOHL (0x52455441), 
+  ACE_NTOHL (0x494e0000),  // name = RETAIN
+  11,
+  ACE_NTOHL (0x4e4f4e5f), 
+  ACE_NTOHL (0x52455441), 
+  ACE_NTOHL (0x494e0000),  // name = NON_RETAIN
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantRetentionPolicyValue (
+    CORBA::tk_enum,
+    sizeof (_oc_PortableServer_ServantRetentionPolicyValue),
+    (char *) &_oc_PortableServer_ServantRetentionPolicyValue,
+    0,
+    0
+  );
+
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_ServantRetentionPolicyValue =
+    &_tc_TAO_tc_PortableServer_ServantRetentionPolicyValue;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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 (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 (0x63790000),  // name = ServantRetentionPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ServantRetentionPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_ServantRetentionPolicy),
+    (char *) &_oc_PortableServer_ServantRetentionPolicy,
+    0,
+    0
+  );
+
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_ServantRetentionPolicy =
+    &_tc_TAO_tc_PortableServer_ServantRetentionPolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ServantRetentionPolicyValue _tao_elem
+  )
+{
+  TAO::Any_Basic_Impl_T<PortableServer::ServantRetentionPolicyValue>::insert (
+      _tao_any,
+      PortableServer::_tc_ServantRetentionPolicyValue,
+      _tao_elem
+    );
+}
+
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ServantRetentionPolicyValue &_tao_elem
+  )
+{
+  return
+    TAO::Any_Basic_Impl_T<PortableServer::ServantRetentionPolicyValue>::extract (
+        _tao_any,
+        PortableServer::_tc_ServantRetentionPolicyValue,
+        _tao_elem 
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+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 false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ServantRetentionPolicy_ptr _tao_elem
+  )
+{
+  PortableServer::ServantRetentionPolicy_ptr _tao_objptr =
+    PortableServer::ServantRetentionPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ServantRetentionPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>::insert (
+      _tao_any,
+      PortableServer::ServantRetentionPolicy::_tao_any_destructor,
+      PortableServer::_tc_ServantRetentionPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ServantRetentionPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>::extract (
+        _tao_any,
+        PortableServer::ServantRetentionPolicy::_tao_any_destructor,
+        PortableServer::_tc_ServantRetentionPolicy,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        PortableServer::ServantRetentionPolicyValue
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        PortableServer::ServantRetentionPolicy
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        PortableServer::ServantRetentionPolicyValue \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        PortableServer::ServantRetentionPolicy \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp
new file mode 100644
index 00000000000..34d1af7196e
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp
@@ -0,0 +1,259 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:302
+
+
+#include "ServantRetentionPolicyC.h"
+#include "tao/CDR.h"
+#include "ace/OS_NS_string.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if !defined (__ACE_INLINE__)
+#include "ServantRetentionPolicyC.inl"
+#endif /* !defined INLINE */
+
+// TAO_IDL - Generated from
+// be\be_visitor_arg_traits.cpp:66
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+// Arg traits specializations.
+namespace TAO
+{
+}
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/interface_cs.cpp:60
+
+// Traits specializations for PortableServer::ServantRetentionPolicy.
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+PortableServer::ServantRetentionPolicy_ptr
+TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::duplicate (
+    PortableServer::ServantRetentionPolicy_ptr p
+  )
+{
+  return PortableServer::ServantRetentionPolicy::_duplicate (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+void
+TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::release (
+    PortableServer::ServantRetentionPolicy_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+PortableServer::ServantRetentionPolicy_ptr
+TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::nil (void)
+{
+  return PortableServer::ServantRetentionPolicy::_nil ();
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+CORBA::Boolean
+TAO::Objref_Traits<PortableServer::ServantRetentionPolicy>::marshal (
+    PortableServer::ServantRetentionPolicy_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return CORBA::Object::marshal (p, cdr);
+}
+
+PortableServer::ServantRetentionPolicy::ServantRetentionPolicy (void)
+{}
+
+PortableServer::ServantRetentionPolicy::~ServantRetentionPolicy (void)
+{}
+
+void 
+PortableServer::ServantRetentionPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ServantRetentionPolicy *_tao_tmp_pointer =
+    static_cast<ServantRetentionPolicy *> (_tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
+}
+
+PortableServer::ServantRetentionPolicy_ptr
+PortableServer::ServantRetentionPolicy::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return ServantRetentionPolicy::_nil ();
+    }
+  
+  ServantRetentionPolicy_ptr proxy =
+    dynamic_cast<ServantRetentionPolicy_ptr> (_tao_objref);
+  
+  return ServantRetentionPolicy::_duplicate (proxy);
+}
+
+PortableServer::ServantRetentionPolicy_ptr
+PortableServer::ServantRetentionPolicy::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return ServantRetentionPolicy::_nil ();
+    }
+  
+  ServantRetentionPolicy_ptr proxy =
+    dynamic_cast<ServantRetentionPolicy_ptr> (_tao_objref);
+  
+  return ServantRetentionPolicy::_duplicate (proxy);
+}
+
+PortableServer::ServantRetentionPolicy_ptr
+PortableServer::ServantRetentionPolicy::_duplicate (ServantRetentionPolicy_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+CORBA::Boolean
+PortableServer::ServantRetentionPolicy::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/Policy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/PortableServer/ServantRetentionPolicy:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+    )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+const char* PortableServer::ServantRetentionPolicy::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/PortableServer/ServantRetentionPolicy:2.3";
+}
+
+CORBA::Boolean
+PortableServer::ServantRetentionPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/cdr_op_cs.cpp:51
+
+CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ServantRetentionPolicyValue &_tao_enumval)
+{
+  CORBA::ULong _tao_temp = _tao_enumval;
+  return strm << _tao_temp;
+}
+
+CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ServantRetentionPolicyValue &_tao_enumval)
+{
+  CORBA::ULong _tao_temp = 0;
+  CORBA::Boolean _tao_result = strm >> _tao_temp;
+  
+  if (_tao_result == 1)
+    {
+      _tao_enumval = static_cast<PortableServer::ServantRetentionPolicyValue> (_tao_temp);
+    }
+  
+  return _tao_result;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_root/root.cpp:1629
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Objref_Traits<
+        PortableServer::ServantRetentionPolicy
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::ServantRetentionPolicy
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::ServantRetentionPolicy
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Objref_Traits< \
+        PortableServer::ServantRetentionPolicy \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::ServantRetentionPolicy
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::ServantRetentionPolicy
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.h b/TAO/tao/PortableServer/ServantRetentionPolicyC.h
new file mode 100644
index 00000000000..7ff2c2fdb8c
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantRetentionPolicyC.h
@@ -0,0 +1,300 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:153
+
+#ifndef _TAO_IDL_ORIG_SERVANTRETENTIONPOLICYC_H_
+#define _TAO_IDL_ORIG_SERVANTRETENTIONPOLICYC_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "portableserver_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
+#include "tao/Environment.h"
+#include "tao/Object.h"
+#include "tao/Objref_VarOut_T.h"
+
+#include "tao/PolicyC.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_PortableServer_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_ch.cpp:62
+
+namespace TAO
+{
+  class Collocation_Proxy_Broker;
+  
+  template<typename T> class Narrow_Utils;
+  template<typename T> class AbstractBase_Narrow_Utils;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // 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
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServantRetentionPolicyValue;
+  
+  // TAO_IDL - Generated from
+  // be\be_interface.cpp:598
+
+#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;
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_interface/interface_ch.cpp:54
+
+#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;
+    
+    // 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 static_cast<ServantRetentionPolicy_ptr> (0);
+    }
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // 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
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::Policy_ptr copy (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void destroy (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_interface/interface_ch.cpp:208
+    
+    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:
+    // Abstract or local interface only.
+    ServantRetentionPolicy (void);
+    
+    virtual ~ServantRetentionPolicy (void);
+  
+  private:
+    // Private and unimplemented for concrete interfaces.
+    ServantRetentionPolicy (const ServantRetentionPolicy &);
+    
+    void operator= (const ServantRetentionPolicy &);
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServantRetentionPolicy;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:66
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:59
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+// Traits specializations.
+namespace TAO
+{
+
+#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY__TRAITS_CH_)
+#define _PORTABLESERVER_SERVANTRETENTIONPOLICY__TRAITS_CH_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ServantRetentionPolicy>
+  {
+    static ::PortableServer::ServantRetentionPolicy_ptr duplicate (
+        ::PortableServer::ServantRetentionPolicy_ptr
+      );
+    static void release (
+        ::PortableServer::ServantRetentionPolicy_ptr
+      );
+    static ::PortableServer::ServantRetentionPolicy_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::PortableServer::ServantRetentionPolicy_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_ch.cpp:51
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicyValue);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantRetentionPolicyValue &);
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicy_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicy_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantRetentionPolicy_ptr &);
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/cdr_op_ch.cpp:50
+
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicyValue &);
+TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &);
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:961
+
+#if defined (__ACE_INLINE__)
+#include "ServantRetentionPolicyC.inl"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.inl b/TAO/tao/PortableServer/ServantRetentionPolicyC.inl
new file mode 100644
index 00000000000..c944d806c1f
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantRetentionPolicyC.inl
@@ -0,0 +1,27 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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/ServantRetentionStrategy.cpp b/TAO/tao/PortableServer/ServantRetentionStrategy.cpp
new file mode 100644
index 00000000000..aba4cdd3ebb
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantRetentionStrategy.cpp
@@ -0,0 +1,27 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    ServantRetentionStrategy.cpp
+ *
+ *  $Id$
+ *
+ */
+//=============================================================================
+
+#include "ServantRetentionStrategy.h"
+
+ACE_RCSID (PortableServer,
+           ServantRetentionStrategy,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    ServantRetentionStrategy::~ServantRetentionStrategy (void)
+    {
+    }
+  }
+}
+
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategy.h b/TAO/tao/PortableServer/ServantRetentionStrategy.h
new file mode 100644
index 00000000000..c8afcc89cd4
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantRetentionStrategy.h
@@ -0,0 +1,157 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file ServantRetentionStrategy.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_SERVANTRETENTIONSTRATEGY_H
+#define TAO_SERVANTRETENTIONSTRATEGY_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "Policy_Strategy.h"
+#include "Servant_Location.h"
+#include "Servant_Upcall.h"
+#include "ServantRetentionPolicyC.h"
+#include "PortableServer.h"
+
+class TAO_Root_POA;
+class TAO_Active_Object_Map;
+struct TAO_Active_Object_Map_Entry;
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export ServantRetentionStrategy
+      : public virtual Policy_Strategy
+    {
+    public:
+      virtual ~ServantRetentionStrategy (void);
+
+      virtual CORBA::ULong waiting_servant_deactivation (void) const = 0;
+
+      virtual int is_servant_in_map (PortableServer::Servant servant,
+                                     int &wait_occurred_restart_call) = 0;
+
+      virtual TAO_SERVANT_LOCATION servant_present (
+        const PortableServer::ObjectId &system_id,
+        PortableServer::Servant &servant
+        ACE_ENV_ARG_DECL) = 0;
+
+      virtual PortableServer::Servant find_servant (
+        const PortableServer::ObjectId &system_id,
+        TAO::Portable_Server::Servant_Upcall &servant_upcall,
+        TAO::Portable_Server::POA_Current_Impl &poa_current_impl
+        ACE_ENV_ARG_DECL) = 0;
+
+      virtual PortableServer::ObjectId *activate_object (
+        PortableServer::Servant servant,
+        CORBA::Short priority,
+        int &wait_occurred_restart_call
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::ServantAlreadyActive,
+                           PortableServer::POA::WrongPolicy)) = 0;
+
+      virtual void activate_object_with_id (
+        const PortableServer::ObjectId &id,
+        PortableServer::Servant servant,
+        CORBA::Short priority,
+        int &wait_occurred_restart_call
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::ServantAlreadyActive,
+                           PortableServer::POA::ObjectAlreadyActive,
+                           PortableServer::POA::WrongPolicy)) = 0;
+
+      virtual void deactivate_object (const PortableServer::ObjectId &id
+                                      ACE_ENV_ARG_DECL) = 0;
+
+      virtual PortableServer::Servant find_servant (
+        const PortableServer::ObjectId &system_id
+        ACE_ENV_ARG_DECL) = 0;
+
+      virtual PortableServer::ObjectId *system_id_to_object_id (
+        const PortableServer::ObjectId &system_id
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::WrongAdapter,
+                           PortableServer::POA::WrongPolicy)) = 0;
+
+      virtual PortableServer::Servant user_id_to_servant (
+        const PortableServer::ObjectId &id
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::ObjectNotActive,
+                           PortableServer::POA::WrongPolicy)) = 0;
+
+      virtual CORBA::Object_ptr id_to_reference (
+        const PortableServer::ObjectId &id
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::ObjectNotActive,
+                           PortableServer::POA::WrongPolicy)) = 0;
+
+      virtual void deactivate_all_objects (ACE_ENV_SINGLE_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::WrongPolicy)) = 0;
+
+      virtual PortableServer::ObjectId *servant_to_user_id (
+        PortableServer::Servant servant
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::ServantNotActive,
+                           PortableServer::POA::WrongPolicy)) = 0;
+
+      virtual CORBA::Object_ptr servant_to_reference (
+        PortableServer::Servant servant
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::ServantNotActive,
+                           PortableServer::POA::WrongPolicy)) = 0;
+
+      virtual CORBA::Object_ptr create_reference (
+        const char *intf,
+        CORBA::Short priority
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::WrongPolicy)) = 0;
+
+      virtual CORBA::Object_ptr create_reference_with_id (
+        const PortableServer::ObjectId &oid,
+        const char *intf,
+        CORBA::Short priority
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
+
+      virtual int rebind_using_user_id_and_system_id (
+        PortableServer::Servant servant,
+        const PortableServer::ObjectId &user_id,
+        const PortableServer::ObjectId &system_id,
+        TAO::Portable_Server::Servant_Upcall &servant_upcall) = 0;
+
+      virtual int unbind_using_user_id (
+        const PortableServer::ObjectId &user_id) = 0;
+
+      virtual CORBA::Boolean servant_has_remaining_activations (
+        PortableServer::Servant servant) = 0;
+
+      virtual ::PortableServer::ServantRetentionPolicyValue type() const = 0;
+    };
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_SERVANTRETENTIONSTRATEGY_H */
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h b/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h
new file mode 100644
index 00000000000..ee5a233af0a
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactory.h
@@ -0,0 +1,48 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file ServantRetentionStrategyFactory.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORY_H
+#define TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORY_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/PortableServer/StrategyFactory.h"
+#include "tao/PortableServer/ServantRetentionPolicyC.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class ServantRetentionStrategy;
+
+    class TAO_PortableServer_Export ServantRetentionStrategyFactory
+       : public virtual StrategyFactory
+    {
+    public:
+      /// Create a new servant retention strategy
+      virtual ServantRetentionStrategy* create (
+        ::PortableServer::ServantRetentionPolicyValue value) = 0;
+
+      virtual void destroy (
+        ServantRetentionStrategy *strategy
+        ACE_ENV_ARG_DECL) = 0;
+    };
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORY_H */
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
new file mode 100644
index 00000000000..5e0b751c0f8
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
@@ -0,0 +1,113 @@
+// $Id$
+
+#include "ServantRetentionStrategyFactoryImpl.h"
+#include "ServantRetentionStrategy.h"
+#include "ace/Dynamic_Service.h"
+
+ACE_RCSID (PortableServer,
+           ServantRetentionStrategyFactoryImpl,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    ServantRetentionStrategyFactoryImpl::~ServantRetentionStrategyFactoryImpl (void)
+    {
+    }
+
+    ServantRetentionStrategy*
+    ServantRetentionStrategyFactoryImpl::create (
+      ::PortableServer::ServantRetentionPolicyValue value)
+    {
+      ServantRetentionStrategyFactory *strategy_factory = 0;
+
+      switch (value)
+      {
+        case ::PortableServer::RETAIN :
+        {
+          strategy_factory =
+            ACE_Dynamic_Service<ServantRetentionStrategyFactory>::instance ("ServantRetentionStrategyRetainFactory");
+
+          if (strategy_factory == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               ACE_TEXT ("(%P|%t) %p\n"),
+                               ACE_TEXT ("Unable to get ")
+                               ACE_TEXT ("ServantRetentionStrategyRetainFactory")),
+                               0);
+
+          break;
+        }
+        case ::PortableServer::NON_RETAIN :
+        {
+          strategy_factory =
+            ACE_Dynamic_Service<ServantRetentionStrategyFactory>::instance ("ServantRetentionStrategyNonRetainFactory");
+
+          if (strategy_factory == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               ACE_TEXT ("(%P|%t) %p\n"),
+                               ACE_TEXT ("Unable to get ")
+                               ACE_TEXT ("ServantRetentionStrategyNonRetainFactory")),
+                               0);
+
+          break;
+        }
+      }
+
+      return strategy_factory->create (value);
+    }
+
+    void
+    ServantRetentionStrategyFactoryImpl::destroy (
+      ServantRetentionStrategy *strategy
+      ACE_ENV_ARG_DECL)
+    {
+      switch (strategy->type ())
+      {
+        case ::PortableServer::RETAIN :
+        {
+          ServantRetentionStrategyFactory *servantretention_strategy_factory =
+            ACE_Dynamic_Service<ServantRetentionStrategyFactory>::instance ("ServantRetentionStrategyRetainFactory");
+
+          if (servantretention_strategy_factory != 0)
+            {
+              servantretention_strategy_factory->destroy (strategy ACE_ENV_ARG_PARAMETER);
+              ACE_CHECK;
+
+            }
+          break;
+        }
+        case ::PortableServer::NON_RETAIN :
+        {
+          ServantRetentionStrategyFactory *servantretention_strategy_factory =
+            ACE_Dynamic_Service<ServantRetentionStrategyFactory>::instance ("ServantRetentionStrategyNonRetainFactory");
+
+          if (servantretention_strategy_factory != 0)
+            {
+              servantretention_strategy_factory->destroy (strategy ACE_ENV_ARG_PARAMETER);
+              ACE_CHECK;
+            }
+          break;
+        }
+      }
+    }
+
+    ACE_STATIC_SVC_DEFINE (
+        ServantRetentionStrategyFactoryImpl,
+        ACE_TEXT ("ServantRetentionStrategyFactory"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (ServantRetentionStrategyFactoryImpl),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+
+    ACE_FACTORY_DEFINE (TAO_PortableServer, ServantRetentionStrategyFactoryImpl)
+
+    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+    template class ACE_Dynamic_Service<ServantRetentionStrategyFactoryImpl>;
+    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+    #pragma instantiate ACE_Dynamic_Service<ServantRetentionStrategyFactoryImpl>
+    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  }
+}
+
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h
new file mode 100644
index 00000000000..20207fc8565
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.h
@@ -0,0 +1,51 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file ServantRetentionStrategyFactoryImpl.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORYIMPL_H
+#define TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORYIMPL_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Service_Config.h"
+#include "tao/PortableServer/ServantRetentionStrategyFactory.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export ServantRetentionStrategyFactoryImpl
+       : public virtual ServantRetentionStrategyFactory
+    {
+    public:
+      virtual ~ServantRetentionStrategyFactoryImpl (void);
+
+      /// Create a new servant retention strategy
+      virtual ServantRetentionStrategy* create (
+        ::PortableServer::ServantRetentionPolicyValue value);
+
+      virtual void destroy (
+        ServantRetentionStrategy *strategy
+        ACE_ENV_ARG_DECL);
+    };
+
+    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ServantRetentionStrategyFactoryImpl)
+    ACE_FACTORY_DECLARE (TAO_PortableServer, ServantRetentionStrategyFactoryImpl)
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
new file mode 100644
index 00000000000..074a5f27361
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
@@ -0,0 +1,334 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    ServantRetentionStrategyNonRetain.cpp
+ *
+ *  $Id$
+ *
+ */
+//=============================================================================
+
+#include "ServantRetentionStrategyNonRetain.h"
+#include "Non_Servant_Upcall.h"
+#include "Servant_Upcall.h"
+#include "POA_Current_Impl.h"
+#include "Root_POA.h"
+#include "Servant_Base.h"
+#include "tao/debug.h"
+
+ACE_RCSID (PortableServer,
+           Servant_Retention_Strategy,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    ServantRetentionStrategyNonRetain::ServantRetentionStrategyNonRetain (void) :
+      poa_ (0)
+    {
+    }
+
+    ServantRetentionStrategyNonRetain::~ServantRetentionStrategyNonRetain (void)
+    {
+    }
+
+    void
+    ServantRetentionStrategyNonRetain::strategy_init (
+      TAO_Root_POA *poa
+      ACE_ENV_ARG_DECL_NOT_USED)
+    {
+      poa_ = poa;
+    }
+
+    void
+    ServantRetentionStrategyNonRetain::strategy_cleanup (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    {
+      poa_ = 0;
+    }
+
+    void
+    ServantRetentionStrategyNonRetain::deactivate_object (
+      const PortableServer::ObjectId &/*id*/
+      ACE_ENV_ARG_DECL)
+    {
+      // When using Non_Retain we don't have an active object map and we just
+      // can't deactivate any object
+      ACE_THROW (PortableServer::POA::WrongPolicy ());
+    }
+
+    PortableServer::Servant
+    ServantRetentionStrategyNonRetain::find_servant (
+      const PortableServer::ObjectId &/*system_id*/
+      ACE_ENV_ARG_DECL)
+    {
+      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
+                        0);
+    }
+
+    PortableServer::ObjectId *
+    ServantRetentionStrategyNonRetain::system_id_to_object_id (
+      const PortableServer::ObjectId &system_id
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongAdapter,
+                         PortableServer::POA::WrongPolicy))
+    {
+      // The system id is the id (and no conversion/transformation is
+      // needed).
+      CORBA::OctetSeq *id = 0;
+      ACE_NEW_THROW_EX (id,
+                        PortableServer::ObjectId (system_id),
+                        CORBA::NO_MEMORY ());
+      ACE_CHECK_RETURN (0);
+
+      return id;
+    }
+
+    PortableServer::Servant
+    ServantRetentionStrategyNonRetain::user_id_to_servant (
+      const PortableServer::ObjectId &/*id*/
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::ObjectNotActive,
+                         PortableServer::POA::WrongPolicy))
+    {
+      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
+                        0);
+    }
+
+    CORBA::Object_ptr
+    ServantRetentionStrategyNonRetain::id_to_reference (
+      const PortableServer::ObjectId &/*id*/
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::ObjectNotActive,
+                         PortableServer::POA::WrongPolicy))
+    {
+      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
+                        CORBA::Object::_nil ());
+    }
+
+    TAO_SERVANT_LOCATION
+    ServantRetentionStrategyNonRetain::servant_present (
+      const PortableServer::ObjectId &/*system_id*/,
+      PortableServer::Servant &/*servant*/
+      ACE_ENV_ARG_DECL_NOT_USED)
+    {
+      return TAO_SERVANT_NOT_FOUND;
+    }
+
+    PortableServer::Servant
+    ServantRetentionStrategyNonRetain::find_servant (
+      const PortableServer::ObjectId &system_id,
+      TAO::Portable_Server::Servant_Upcall &servant_upcall,
+      TAO::Portable_Server::POA_Current_Impl &poa_current_impl
+      ACE_ENV_ARG_DECL_NOT_USED)
+    {
+      // We have the NON_RETAIN policy, user id is the system id.
+
+      // Smartly copy all the data; <poa_current_impl.object_id_> does
+      // not own the data.
+      poa_current_impl.replace_object_id (system_id);
+
+      servant_upcall.user_id (&system_id);
+
+      return 0;
+    }
+
+    int
+    ServantRetentionStrategyNonRetain::is_servant_in_map (
+      PortableServer::Servant /*servant*/,
+      int &/*wait_occurred_restart_call*/)
+    {
+      return 0;
+    }
+
+    CORBA::ULong
+    ServantRetentionStrategyNonRetain::waiting_servant_deactivation (void) const
+    {
+      return 0;
+    }
+
+    void
+    ServantRetentionStrategyNonRetain::deactivate_all_objects (
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongPolicy))
+    {
+    }
+
+    PortableServer::ObjectId *
+    ServantRetentionStrategyNonRetain::servant_to_user_id (
+      PortableServer::Servant /*servant*/
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::ServantNotActive,
+                         PortableServer::POA::WrongPolicy))
+    {
+      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
+                        0);
+    }
+
+    CORBA::Object_ptr
+    ServantRetentionStrategyNonRetain::servant_to_reference (
+      PortableServer::Servant /*servant*/
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                      PortableServer::POA::ServantNotActive,
+                      PortableServer::POA::WrongPolicy))
+    {
+      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
+                        CORBA::Object::_nil ());
+    }
+
+    PortableServer::ObjectId *
+    ServantRetentionStrategyNonRetain::activate_object (
+      PortableServer::Servant /*servant*/,
+      CORBA::Short /*priority*/,
+      int &/*wait_occurred_restart_call*/
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::ServantAlreadyActive,
+                         PortableServer::POA::WrongPolicy))
+    {
+      ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
+                        0);
+    }
+
+    void
+    ServantRetentionStrategyNonRetain::activate_object_with_id (
+      const PortableServer::ObjectId &/*id*/,
+      PortableServer::Servant /*servant*/,
+      CORBA::Short /*priority*/,
+      int &/*wait_occurred_restart_call*/
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ServantAlreadyActive,
+                   PortableServer::POA::ObjectAlreadyActive,
+                   PortableServer::POA::WrongPolicy))
+    {
+      ACE_THROW (PortableServer::POA::WrongPolicy ());
+    }
+
+    CORBA::Object_ptr
+    ServantRetentionStrategyNonRetain::create_reference (
+      const char *intf,
+      CORBA::Short priority
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongPolicy))
+    {
+      // This operation creates an object reference that encapsulates a
+      // POA-generated Object Id value and the specified interface
+      // repository id. This operation does not cause an activation to
+      // take place. The resulting reference may be passed to clients, so
+      // that subsequent requests on those references will cause the
+      // appropriate servant manager to be invoked, if one is
+      // available. The generated Object Id value may be obtained by
+      // invoking POA::reference_to_id with the created reference.
+
+      PortableServer::ObjectId_var system_id;
+      PortableServer::ObjectId user_id;
+
+      // Otherwise, it is the NON_RETAIN policy.  Therefore, any ol'
+      // object id will do (even an empty one).
+      PortableServer::ObjectId *sys_id;
+      ACE_NEW_THROW_EX (sys_id,
+                        PortableServer::ObjectId,
+                        CORBA::NO_MEMORY ());
+      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+
+      system_id = sys_id;
+
+      // User id is the same as system id.
+      user_id = system_id.in ();
+
+      // Remember params for potentially invoking <key_to_object> later.
+      this->poa_->key_to_object_params_.set (system_id,
+                                             intf,
+                                             0,
+                                             1,
+                                             priority);
+
+      return this->poa_->invoke_key_to_object_helper_i (intf,
+                                                  user_id
+                                                  ACE_ENV_ARG_PARAMETER);
+    }
+
+    CORBA::Object_ptr
+    ServantRetentionStrategyNonRetain::create_reference_with_id (
+      const PortableServer::ObjectId &oid,
+      const char *intf,
+      CORBA::Short priority
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      // This operation creates an object reference that encapsulates the
+      // specified Object Id and interface repository Id values. This
+      // operation does not cause an activation to take place.  The
+      // resulting reference may be passed to clients, so that subsequent
+      // requests on those references will cause the object to be
+      // activated if necessary, or the default servant used, depending on
+      // the applicable policies.
+
+      PortableServer::Servant servant = 0;
+      PortableServer::ObjectId_var system_id;
+
+      // Otherwise, it is the NON_RETAIN policy.  Therefore, user id
+      // is the same as system id.
+      PortableServer::ObjectId *sys_id;
+      ACE_NEW_THROW_EX (sys_id,
+                        PortableServer::ObjectId (oid),
+                        CORBA::NO_MEMORY ());
+      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+
+      system_id = sys_id;
+
+      // Remember params for potentially invoking <key_to_object> later.
+      this->poa_->key_to_object_params_.set (system_id,
+                                       intf,
+                                       servant,
+                                       1,
+                                       priority);
+
+      return this->poa_->invoke_key_to_object_helper_i (intf,
+                                                  oid
+                                                  ACE_ENV_ARG_PARAMETER);
+    }
+
+    int
+    ServantRetentionStrategyNonRetain::rebind_using_user_id_and_system_id (
+      PortableServer::Servant /*servant*/,
+      const PortableServer::ObjectId &/*user_id*/,
+      const PortableServer::ObjectId &/*system_id*/,
+      TAO::Portable_Server::Servant_Upcall &/*servant_upcall*/)
+    {
+      return -1;
+    }
+
+    CORBA::Boolean
+    ServantRetentionStrategyNonRetain::servant_has_remaining_activations (
+      PortableServer::Servant /*servant*/)
+    {
+      return false;
+    }
+
+    int
+    ServantRetentionStrategyNonRetain::unbind_using_user_id (
+      const PortableServer::ObjectId &/*user_id*/)
+    {
+      return 0;
+    }
+
+    ::PortableServer::ServantRetentionPolicyValue
+    ServantRetentionStrategyNonRetain::type() const
+    {
+      return ::PortableServer::NON_RETAIN;
+    }
+
+  }
+}
+
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
new file mode 100644
index 00000000000..392e348d5c4
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
@@ -0,0 +1,164 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file ServantRetentionStrategyNonRetain.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_SERVANT_RETENTION_STRATEGY_NON_RETAIN_H
+#define TAO_SERVANT_RETENTION_STRATEGY_NON_RETAIN_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "Servant_Location.h"
+#include "ServantRetentionStrategy.h"
+
+class TAO_Root_POA;
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export ServantRetentionStrategyNonRetain
+       : public virtual ServantRetentionStrategy
+    {
+    public:
+      ServantRetentionStrategyNonRetain (void);
+
+      virtual ~ServantRetentionStrategyNonRetain (void);
+
+      virtual void strategy_init (TAO_Root_POA *poa ACE_ENV_ARG_DECL);
+
+      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
+
+      CORBA::ULong waiting_servant_deactivation (void) const;
+
+      virtual
+      PortableServer::ObjectId *
+      activate_object (PortableServer::Servant servant,
+                       CORBA::Short priority,
+                       int &wait_occurred_restart_call
+                            ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::ServantAlreadyActive,
+                         PortableServer::POA::WrongPolicy));
+
+      virtual
+      void
+      activate_object_with_id (const PortableServer::ObjectId &id,
+                               PortableServer::Servant servant,
+                               CORBA::Short priority,
+                               int &wait_occurred_restart_call
+                               ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ServantAlreadyActive,
+                   PortableServer::POA::ObjectAlreadyActive,
+                   PortableServer::POA::WrongPolicy));
+
+      virtual void deactivate_object (const PortableServer::ObjectId &id
+                                      ACE_ENV_ARG_DECL);
+
+      virtual PortableServer::Servant find_servant (
+        const PortableServer::ObjectId &system_id
+        ACE_ENV_ARG_DECL);
+
+      virtual int is_servant_in_map (PortableServer::Servant servant,
+                                      int &wait_occurred_restart_call);
+
+      virtual PortableServer::ObjectId *system_id_to_object_id (
+        const PortableServer::ObjectId &system_id
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::WrongAdapter,
+                           PortableServer::POA::WrongPolicy));
+
+      virtual
+      PortableServer::Servant
+      user_id_to_servant (const PortableServer::ObjectId &id
+                          ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::ObjectNotActive,
+                         PortableServer::POA::WrongPolicy));
+
+      CORBA::Object_ptr
+      id_to_reference (const PortableServer::ObjectId &id
+                       ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::ObjectNotActive,
+                         PortableServer::POA::WrongPolicy));
+
+      virtual TAO_SERVANT_LOCATION servant_present (
+        const PortableServer::ObjectId &system_id,
+        PortableServer::Servant &servant
+        ACE_ENV_ARG_DECL);
+
+      virtual PortableServer::Servant find_servant (
+        const PortableServer::ObjectId &system_id,
+        TAO::Portable_Server::Servant_Upcall &servant_upcall,
+        TAO::Portable_Server::POA_Current_Impl &poa_current_impl
+        ACE_ENV_ARG_DECL);
+
+      virtual void deactivate_all_objects (ACE_ENV_SINGLE_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongPolicy));
+
+      virtual PortableServer::ObjectId *servant_to_user_id (
+        PortableServer::Servant servant
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::ServantNotActive,
+                           PortableServer::POA::WrongPolicy));
+
+      virtual CORBA::Object_ptr servant_to_reference (
+        PortableServer::Servant servant
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::ServantNotActive,
+                           PortableServer::POA::WrongPolicy));
+
+      virtual CORBA::Object_ptr create_reference (
+        const char *intf,
+        CORBA::Short priority
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::WrongPolicy));
+
+      virtual CORBA::Object_ptr create_reference_with_id (
+        const PortableServer::ObjectId &oid,
+        const char *intf,
+        CORBA::Short priority
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException));
+
+      virtual int rebind_using_user_id_and_system_id (
+        PortableServer::Servant servant,
+        const PortableServer::ObjectId &user_id,
+        const PortableServer::ObjectId &system_id,
+        TAO::Portable_Server::Servant_Upcall &servant_upcall);
+
+      virtual CORBA::Boolean servant_has_remaining_activations (
+        PortableServer::Servant servant);
+
+      virtual int unbind_using_user_id (
+        const PortableServer::ObjectId &user_id);
+
+        virtual ::PortableServer::ServantRetentionPolicyValue type() const;
+
+    protected:
+      TAO_Root_POA *poa_;
+    };
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_SERVANT_RETENTION_STRATEGY_NON_RETAIN_H */
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
new file mode 100644
index 00000000000..d0e45565063
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
@@ -0,0 +1,79 @@
+// $Id$
+
+#include "ServantRetentionStrategyNonRetainFactoryImpl.h"
+#include "ServantRetentionStrategy.h"
+#include "ServantRetentionStrategyNonRetain.h"
+#include "ace/Dynamic_Service.h"
+
+ACE_RCSID (PortableServer,
+           ServantRetentionStrategyNonRetainFactoryImpl,
+           "$Id$")
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    ServantRetentionStrategyNonRetainFactoryImpl::~ServantRetentionStrategyNonRetainFactoryImpl (void)
+    {
+    }
+
+    ServantRetentionStrategy*
+    ServantRetentionStrategyNonRetainFactoryImpl::create (
+      ::PortableServer::ServantRetentionPolicyValue value)
+    {
+      ServantRetentionStrategy* strategy = 0;
+
+      switch (value)
+      {
+        case ::PortableServer::NON_RETAIN :
+        {
+          ACE_NEW_RETURN (strategy, ServantRetentionStrategyNonRetain, 0);
+          break;
+        }
+        case ::PortableServer::RETAIN :
+        {
+          ACE_ERROR ((LM_ERROR, "Incorrect type in ServantRetentionStrategyNonRetainFactoryImpl"));
+          break;
+        }
+      }
+
+      return strategy;
+    }
+
+    void
+    ServantRetentionStrategyNonRetainFactoryImpl::destroy (
+      ServantRetentionStrategy *strategy
+      ACE_ENV_ARG_DECL)
+    {
+      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+
+      delete strategy;
+    }
+
+    ACE_STATIC_SVC_DEFINE (
+        ServantRetentionStrategyNonRetainFactoryImpl,
+        ACE_TEXT ("ServantRetentionStrategyNonRetainFactory"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (ServantRetentionStrategyNonRetainFactoryImpl),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+
+    ACE_FACTORY_DEFINE (TAO_PortableServer, ServantRetentionStrategyNonRetainFactoryImpl)
+
+    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+    template class ACE_Dynamic_Service<ServantRetentionStrategyNonRetainFactoryImpl>;
+
+    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+    #pragma instantiate ACE_Dynamic_Service<ServantRetentionStrategyNonRetainFactoryImpl>
+
+    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h
new file mode 100644
index 00000000000..fdee98fb3e7
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h
@@ -0,0 +1,55 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file ServantRetentionStrategyNonRetainFactoryImpl.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYNONRETAIN_FACTORYIMPL_H
+#define TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYNONRETAIN_FACTORYIMPL_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Service_Config.h"
+#include "tao/PortableServer/ServantRetentionStrategyFactory.h"
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export ServantRetentionStrategyNonRetainFactoryImpl
+       : public virtual ServantRetentionStrategyFactory
+    {
+    public:
+      virtual ~ServantRetentionStrategyNonRetainFactoryImpl (void);
+
+      /// Create a new servant retention strategy
+      virtual ServantRetentionStrategy* create (
+        ::PortableServer::ServantRetentionPolicyValue value);
+
+      virtual void destroy (
+        ServantRetentionStrategy *strategy
+        ACE_ENV_ARG_DECL);
+    };
+
+    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ServantRetentionStrategyNonRetainFactoryImpl)
+    ACE_FACTORY_DECLARE (TAO_PortableServer, ServantRetentionStrategyNonRetainFactoryImpl)
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYNONRETAIN_FACTORYIMPL_H*/
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
new file mode 100644
index 00000000000..9783d534c6b
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
@@ -0,0 +1,1033 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    ServantRetentionStrategyRetain.cpp
+ *
+ *  $Id$
+ *
+ */
+//=============================================================================
+
+#include "tao/ORB_Core.h"
+#include "tao/debug.h"
+#include "ServantRetentionStrategyRetain.h"
+#include "Non_Servant_Upcall.h"
+#include "Servant_Upcall.h"
+#include "POA_Current_Impl.h"
+#include "Root_POA.h"
+#include "Active_Object_Map.h"
+#include "Active_Object_Map_Entry.h"
+
+ACE_RCSID (PortableServer,
+           Servant_Retention_Strategy,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    ServantRetentionStrategyRetain::ServantRetentionStrategyRetain (void) :
+      ServantRetentionStrategyNonRetain (),
+      active_object_map_ (0),
+      waiting_servant_deactivation_ (0)
+    {
+    }
+
+    ServantRetentionStrategyRetain::~ServantRetentionStrategyRetain ()
+    {
+    }
+
+    void
+    ServantRetentionStrategyRetain::strategy_init (
+      TAO_Root_POA *poa
+      ACE_ENV_ARG_DECL)
+    {
+      poa_ = poa;
+
+      // Create the active object map to be used
+      TAO_Active_Object_Map *active_object_map = 0;
+      ACE_NEW_THROW_EX (active_object_map,
+                        TAO_Active_Object_Map (!poa->system_id (),
+                                               !poa->allow_multiple_activations (),
+                                               poa->is_persistent (),
+                                               poa->orb_core().server_factory ()->active_object_map_creation_parameters ()
+                                               ACE_ENV_ARG_PARAMETER),
+                    CORBA::NO_MEMORY ());
+
+      // Give ownership of the new map to the auto pointer.  Note, that it
+      // is important for the auto pointer to take ownership before
+      // checking for exception since we may need to delete the new map.
+      auto_ptr<TAO_Active_Object_Map> new_active_object_map (active_object_map);
+
+      // Check for exception in construction of the active object map.
+      ACE_CHECK;
+
+      // Finally everything is fine.  Make sure to take ownership away
+      // from the auto pointer.
+      this->active_object_map_ = new_active_object_map.release ();
+    }
+
+    void
+    ServantRetentionStrategyRetain::strategy_cleanup(
+      ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    {
+      // Delete the active object map.
+      delete this->active_object_map_;
+      active_object_map_ = 0;
+    }
+
+    void
+    ServantRetentionStrategyRetain::deactivate_object (
+      const PortableServer::ObjectId &id
+      ACE_ENV_ARG_DECL)
+    {
+
+      TAO_Active_Object_Map_Entry *active_object_map_entry = 0;
+      int result = this->active_object_map_->
+        find_servant_and_system_id_using_user_id (id,
+                                                  active_object_map_entry);
+
+      // If there is no active object associated with the specified Object
+      // Id, the operation raises an ObjectNotActive exception.
+      if (result != 0)
+        {
+          ACE_THROW (PortableServer::POA::ObjectNotActive ());
+        }
+
+      this->deactivate_map_entry (active_object_map_entry
+                                  ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+
+    void
+    ServantRetentionStrategyRetain::deactivate_map_entry (
+      TAO_Active_Object_Map_Entry *active_object_map_entry
+      ACE_ENV_ARG_DECL)
+    {
+      // Decrement the reference count.
+      CORBA::UShort new_count = --active_object_map_entry->reference_count_;
+
+      if (new_count == 0)
+        {
+          this->poa_->cleanup_servant (active_object_map_entry->servant_,
+                                       active_object_map_entry->user_id_
+                                       ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+      else
+        {
+          // It should be noted that there may be a period of time between
+          // an object's deactivation and the etherealization (during
+          // which outstanding requests are being processed) in which
+          // arriving requests on that object should not be passed to its
+          // servant. During this period, requests targeted for such an
+          // object act as if the POA were in holding state until
+          // etherealize completes. If etherealize is called as a
+          // consequence of a deactivate call with a etherealize_objects
+          // parameter of TRUE, incoming requests are rejected.
+
+          // Else mark entry as closed...
+          active_object_map_entry->deactivated_ = 1;
+        }
+    }
+
+    int
+    ServantRetentionStrategyRetain::unbind_using_user_id (
+      const PortableServer::ObjectId &user_id)
+    {
+      return this->active_object_map_->
+        unbind_using_user_id (user_id);
+    }
+
+    PortableServer::Servant
+    ServantRetentionStrategyRetain::find_servant (
+      const PortableServer::ObjectId &system_id
+      ACE_ENV_ARG_DECL)
+    {
+      // Find user id from system id.
+      PortableServer::ObjectId_var user_id;
+      if (active_object_map_->
+          find_user_id_using_system_id (system_id,
+                                        user_id.out()) != 0)
+        {
+          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
+                            0);
+        }
+
+      // This operation returns the active servant associated with the
+      // specified system Object Id value.  If the Object Id value is
+      // not active in the POA, an ObjectNotActive exception is
+      // raised.
+      TAO_Active_Object_Map_Entry *entry = 0;
+      PortableServer::Servant servant = 0;
+      int result = -1;
+
+      result =
+        active_object_map_->
+          find_servant_using_system_id_and_user_id (system_id,
+                                                    user_id,
+                                                    servant,
+                                                    entry);
+
+      if (servant == 0)
+        {
+          ACE_THROW_RETURN (PortableServer::POA::ObjectNotActive (),
+                            0);
+        }
+
+      return servant;
+    }
+
+    PortableServer::ObjectId *
+    ServantRetentionStrategyRetain::system_id_to_object_id (
+      const PortableServer::ObjectId &system_id
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongAdapter,
+                         PortableServer::POA::WrongPolicy))
+    {
+      // The object denoted by the reference does not have to be
+      // active for this operation to succeed.
+      PortableServer::ObjectId_var user_id;
+      if (this->active_object_map_->
+          find_user_id_using_system_id (system_id,
+                                        user_id.out ()) != 0)
+        {
+          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
+                            0);
+        }
+
+      return user_id._retn ();
+    }
+
+    PortableServer::Servant
+    ServantRetentionStrategyRetain::user_id_to_servant (
+      const PortableServer::ObjectId &id
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::ObjectNotActive,
+                         PortableServer::POA::WrongPolicy))
+    {
+      // If the POA has the RETAIN policy and the specified ObjectId is in
+      // the Active Object Map, this operation returns the servant
+      // associated with that object in the Active Object Map.
+      PortableServer::Servant servant = 0;
+      int result = -1;
+
+      result =
+        this->active_object_map_->find_servant_using_user_id (id,
+                                                              servant);
+
+      if (servant == 0)
+        {
+          ACE_THROW_RETURN (PortableServer::POA::ObjectNotActive (),
+                            0);
+        }
+
+      return servant;
+    }
+
+    CORBA::Object_ptr
+    ServantRetentionStrategyRetain::id_to_reference (
+      const PortableServer::ObjectId &id
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::ObjectNotActive,
+                         PortableServer::POA::WrongPolicy))
+    {
+      // If an object with the specified Object Id value is currently
+      // active, a reference encapsulating the information used to
+      // activate the object is returned.
+      PortableServer::ObjectId_var system_id;
+      PortableServer::Servant servant;
+      CORBA::Short priority;
+
+      if (this->active_object_map_->
+          find_servant_and_system_id_using_user_id (id,
+                                                    servant,
+                                                    system_id.out (),
+                                                    priority) == 0)
+        {
+          // Remember params for potentially invoking <key_to_object> later.
+          this->poa_->key_to_object_params_.set (system_id,
+                                                 servant->_interface_repository_id (),
+                                                 servant,
+                                                 1,
+                                                 priority);
+
+          return this->poa_->invoke_key_to_object_helper_i (servant->_interface_repository_id (),
+                                                            id
+                                                            ACE_ENV_ARG_PARAMETER);
+        }
+      else
+        {
+          // If the Object Id value is not active in the POA, an
+          // ObjectNotActive exception is raised.
+          ACE_THROW_RETURN (PortableServer::POA::ObjectNotActive (),
+                            CORBA::Object::_nil ());
+        }
+    }
+
+    TAO_SERVANT_LOCATION
+    ServantRetentionStrategyRetain::servant_present (
+      const PortableServer::ObjectId &system_id,
+      PortableServer::Servant &servant
+      ACE_ENV_ARG_DECL)
+    {
+      // Find user id from system id.
+      PortableServer::ObjectId_var user_id;
+      if (this->active_object_map_->
+          find_user_id_using_system_id (system_id,
+                                        user_id.out()) != 0)
+        {
+          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
+                            TAO_SERVANT_NOT_FOUND);
+        }
+
+      TAO_Active_Object_Map_Entry *entry = 0;
+      int result = this->active_object_map_->
+        find_servant_using_system_id_and_user_id (system_id,
+                                                  user_id,
+                                                  servant,
+                                                  entry);
+      if (result == 0)
+        {
+          // Success
+          return TAO_SERVANT_FOUND;
+        }
+      else
+        {
+          return TAO_SERVANT_NOT_FOUND;
+        }
+    }
+
+    PortableServer::Servant
+    ServantRetentionStrategyRetain::find_servant (
+      const PortableServer::ObjectId &system_id,
+      TAO::Portable_Server::Servant_Upcall &servant_upcall,
+      TAO::Portable_Server::POA_Current_Impl &poa_current_impl
+      ACE_ENV_ARG_DECL)
+    {
+      PortableServer::ObjectId user_id;
+      // If we have the RETAIN policy, convert/transform from system id to
+      // user id.
+      if (this->active_object_map_->
+          find_user_id_using_system_id (system_id,
+                                        user_id) != 0)
+        {
+          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
+                            0);
+        }
+
+      poa_current_impl.object_id(user_id);
+      servant_upcall.user_id (&user_id);
+
+      // If the POA has the RETAIN policy, the POA looks in the Active
+      // Object Map to find if there is a servant associated with the
+      // Object Id value from the request. If such a servant exists, the
+      // POA invokes the appropriate method on the servant.
+      PortableServer::Servant servant = 0;
+      TAO_Active_Object_Map_Entry *active_object_map_entry = 0;
+      int result = this->active_object_map_->
+        find_servant_using_system_id_and_user_id (system_id,
+                                                  user_id,
+                                                  servant,
+                                                  active_object_map_entry);
+
+
+      if (result == 0)
+        {
+          servant_upcall.active_object_map_entry (active_object_map_entry);
+
+          // Increment the reference count.
+          servant_upcall.increment_servant_refcount ();
+        }
+
+      return servant;
+    }
+
+    int
+    ServantRetentionStrategyRetain::is_servant_in_map (
+      PortableServer::Servant servant,
+      int &wait_occurred_restart_call)
+    {
+      int deactivated = 0;
+      int servant_in_map =
+        this->active_object_map_->is_servant_in_map (servant,
+                                                      deactivated);
+
+      if (!servant_in_map)
+        {
+          return 0;
+        }
+      else
+        {
+          if (deactivated)
+            {
+              if (TAO_debug_level > 0)
+                ACE_DEBUG ((LM_DEBUG,
+                            ACE_TEXT ("(%t) TAO_Root_POA::is_servant_in_map: waiting for servant to deactivate\n")));
+
+              // We are going to wait on this condition variable; the POA
+              // state may change by the time we get the lock again.
+              // Therefore, indicate to the caller that all conditions
+              // need to be checked again.
+              wait_occurred_restart_call = 1;
+
+              ++this->waiting_servant_deactivation_;
+
+              if (this->poa_->object_adapter ().enable_locking ())
+                this->poa_->servant_deactivation_condition ().wait ();
+
+              --this->waiting_servant_deactivation_;
+
+              return 0;
+            }
+          else
+            {
+              return 1;
+            }
+        }
+    }
+
+    int
+    ServantRetentionStrategyRetain::is_user_id_in_map (
+      const PortableServer::ObjectId &id,
+      CORBA::Short priority,
+      int &priorities_match,
+      int &wait_occurred_restart_call)
+    {
+      int deactivated = 0;
+      int user_id_in_map =
+        this->active_object_map_->is_user_id_in_map (id,
+                                                      priority,
+                                                      priorities_match,
+                                                      deactivated);
+
+      if (!user_id_in_map)
+        {
+          return 0;
+        }
+      else
+        {
+          if (deactivated)
+            {
+              if (TAO_debug_level > 0)
+                ACE_DEBUG ((LM_DEBUG,
+                            ACE_TEXT ("(%t) TAO_Root_POA::is_user_id_in_map: waiting for servant to deactivate\n")));
+
+              // We are going to wait on this condition variable; the POA
+              // state may change by the time we get the lock again.
+              // Therefore, indicate to the caller that all conditions
+              // need to be checked again.
+              wait_occurred_restart_call = 1;
+
+              ++this->waiting_servant_deactivation_;
+
+              if (this->poa_->object_adapter ().enable_locking ())
+                this->poa_->servant_deactivation_condition ().wait ();
+
+              --this->waiting_servant_deactivation_;
+
+              return 0;
+            }
+          else
+            {
+              return 1;
+            }
+        }
+    }
+
+    CORBA::ULong
+    ServantRetentionStrategyRetain::waiting_servant_deactivation (void) const
+    {
+      return waiting_servant_deactivation_;
+    }
+
+    void
+    ServantRetentionStrategyRetain::deactivate_all_objects (
+      ACE_ENV_SINGLE_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongPolicy))
+    {
+      // If the etherealize_objects parameter is TRUE, the POA has the
+      // RETAIN policy, and a servant manager is registered with the POA,
+      // the etherealize operation on the servant manager will be called
+      // for each active object in the Active Object Map. The apparent
+      // destruction of the POA occurs before any calls to etherealize are
+      // made.  Thus, for example, an etherealize method that attempts to
+      // invoke operations on the POA will receive the OBJECT_NOT_EXIST
+      // exception.
+
+      // We must copy the map entries into a separate place since we
+      // cannot remove entries while iterating through the map.
+      ACE_Array_Base<TAO_Active_Object_Map_Entry *> map_entries
+        (this->active_object_map_->current_size ());
+
+      size_t counter = 0;
+      TAO_Active_Object_Map::user_id_map::iterator end
+        = this->active_object_map_->user_id_map_->end ();
+
+      for (TAO_Active_Object_Map::user_id_map::iterator iter
+             = this->active_object_map_->user_id_map_->begin ();
+           iter != end;
+           ++iter)
+        {
+          TAO_Active_Object_Map::user_id_map::value_type map_pair = *iter;
+          TAO_Active_Object_Map_Entry *active_object_map_entry = map_pair.second ();
+
+          if (!active_object_map_entry->deactivated_)
+            {
+              map_entries[counter] = active_object_map_entry;
+              ++counter;
+            }
+        }
+
+      for (size_t i = 0;
+           i < counter;
+           ++i)
+        {
+          this->deactivate_map_entry (map_entries[i]
+                                      ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK;
+        }
+    }
+
+    PortableServer::ObjectId *
+    ServantRetentionStrategyRetain::servant_to_user_id (
+      PortableServer::Servant servant
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::ServantNotActive,
+                         PortableServer::POA::WrongPolicy))
+    {
+      // This operation requires the RETAIN and either the UNIQUE_ID or
+      // IMPLICIT_ACTIVATION policies; if not present, the WrongPolicy
+      // exception is raised.
+      if (!((!this->poa_->allow_multiple_activations ()
+                || this->poa_->allow_implicit_activation ())))
+        {
+          ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
+                            0);
+        }
+
+      /**
+       * If the POA has both the RETAIN and the UNIQUE_ID policy and the
+       * specified servant is active, the Object Id associated with that
+       * servant is returned.
+       *
+       * If the POA has both the RETAIN and the IMPLICIT_ACTIVATION policy and
+       * either the POA has the MULTIPLE_ID policy or the specified servant is
+       * not active, the servant is activated using a POA-generated Object Id
+       * and the Interface Id associated with the servant, and that Object Id
+       * is returned.
+       *
+       */
+
+      // If the POA has the UNIQUE_ID policy and the specified servant is
+      // active, the Object Id associated with that servant is returned.
+      PortableServer::ObjectId_var user_id;
+      if (!this->poa_->allow_multiple_activations () &&
+          this->active_object_map_->
+          find_user_id_using_servant (servant,
+                                      user_id.out ()) != -1)
+        {
+          return user_id._retn ();
+        }
+
+      // If the POA has the IMPLICIT_ACTIVATION policy and either the POA
+      // has the MULTIPLE_ID policy or the specified servant is not
+      // active, the servant is activated using a POA-generated Object Id
+      // and the Interface Id associated with the servant, and that Object
+      // Id is returned.
+      if (this->poa_->allow_implicit_activation ())
+        {
+          // If we reach here, then we either have the MULTIPLE_ID policy
+          // or we have the UNIQUE_ID policy and we are not in the active
+          // object map.
+          PortableServer::ObjectId_var user_id;
+          if (this->active_object_map_->
+              bind_using_system_id_returning_user_id (servant,
+                                                      this->poa_->server_priority (),
+                                                      user_id.out ()) != 0)
+            {
+              ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
+                                0);
+            }
+
+          //
+          // Everything is finally ok
+          //
+
+          // ATTENTION: Trick locking here, see class header for details
+          Non_Servant_Upcall non_servant_upcall (*this->poa_);
+          ACE_UNUSED_ARG (non_servant_upcall);
+
+          // If this operation causes the object to be activated, _add_ref
+          // is invoked at least once on the Servant argument before
+          // returning. Otherwise, the POA does not increment or decrement
+          // the reference count of the Servant passed to this function.
+          servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
+
+          return user_id._retn ();
+        }
+
+      /*
+       * Otherwise, the ServantNotActive exception is raised.
+       */
+      ACE_THROW_RETURN (PortableServer::POA::ServantNotActive (),
+                        0);
+    }
+
+    PortableServer::ObjectId *
+    ServantRetentionStrategyRetain::servant_to_system_id_i (
+      PortableServer::Servant servant,
+      CORBA::Short &priority
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::ServantNotActive,
+                         PortableServer::POA::WrongPolicy))
+    {
+      // This operation requires the RETAIN and either the UNIQUE_ID or
+      // IMPLICIT_ACTIVATION policies; if not present, the WrongPolicy
+      // exception is raised.
+      if (!((!this->poa_->allow_multiple_activations ()
+                || this->poa_->allow_implicit_activation ())))
+        {
+          ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
+                            0);
+        }
+
+      // This operation has three possible behaviors.
+
+      // If the POA has the UNIQUE_ID policy and the specified servant is
+      // active, the Object Id associated with that servant is returned.
+      PortableServer::ObjectId_var system_id;
+      if (!this->poa_->allow_multiple_activations () &&
+          this->active_object_map_->
+          find_system_id_using_servant (servant,
+                                        system_id.out (),
+                                        priority) != -1)
+        {
+          return system_id._retn ();
+        }
+
+      // If the POA has the IMPLICIT_ACTIVATION policy and either the POA
+      // has the MULTIPLE_ID policy or the specified servant is not
+      // active, the servant is activated using a POA-generated Object Id
+      // and the Interface Id associated with the servant, and that Object
+      // Id is returned.
+      if (this->poa_->allow_implicit_activation ())
+        {
+          // If we reach here, then we either have the MULTIPLE_ID policy
+          // or we have the UNIQUE_ID policy and we are not in the active
+          // object map.
+          PortableServer::ObjectId_var system_id;
+          if (this->active_object_map_->
+              bind_using_system_id_returning_system_id (servant,
+                                                        priority,
+                                                        system_id.out ()) != 0)
+            {
+              ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
+                                0);
+            }
+
+          //
+          // Everything is finally ok
+          //
+
+          // ATTENTION: Trick locking here, see class header for details
+          Non_Servant_Upcall non_servant_upcall (*this->poa_);
+          ACE_UNUSED_ARG (non_servant_upcall);
+
+          // If this operation causes the object to be activated, _add_ref
+          // is invoked at least once on the Servant argument before
+          // returning. Otherwise, the POA does not increment or decrement
+          // the reference count of the Servant passed to this function.
+          servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_CHECK_RETURN (0);
+
+          return system_id._retn ();
+        }
+
+      // Otherwise, the ServantNotActive exception is raised.
+      ACE_THROW_RETURN (PortableServer::POA::ServantNotActive (),
+                        0);
+    }
+
+    CORBA::Object_ptr
+    ServantRetentionStrategyRetain::servant_to_reference (
+      PortableServer::Servant servant
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                      PortableServer::POA::ServantNotActive,
+                      PortableServer::POA::WrongPolicy))
+    {
+      // Note: The allocation of an Object Id value and installation in
+      // the Active Object Map caused by implicit activation may actually
+      // be deferred until an attempt is made to externalize the
+      // reference. The real requirement here is that a reference is
+      // produced that will behave appropriately (that is, yield a
+      // consistent Object Id value when asked politely).
+      CORBA::Short priority =
+        this->poa_->server_priority ();
+
+      PortableServer::ObjectId_var system_id =
+        this->servant_to_system_id_i (servant,
+                                      priority
+                                      ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (CORBA::Object::_nil ());
+
+      PortableServer::ObjectId user_id;
+
+      // This operation requires the RETAIN, therefore don't worry about
+      // the NON_RETAIN case.
+      if (this->active_object_map_->
+          find_user_id_using_system_id (system_id.in (),
+                                        user_id) != 0)
+        {
+          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
+                            CORBA::Object::_nil ());
+        }
+
+      // Remember params for potentially invoking <key_to_object> later.
+      this->poa_->key_to_object_params_.set (
+        system_id,
+        servant->_interface_repository_id (),
+        servant,
+        1,
+        priority);
+
+      // Ask the ORT to create the object.
+      // @@NOTE:There is a possible deadlock lurking here. We held the
+      // lock, and we are possibly trying to make a call into the
+      // application code. Think what would happen if the app calls us
+      // back. We need to get to this at some point.
+      return this->poa_->invoke_key_to_object_helper_i (
+              servant->_interface_repository_id (),
+              user_id
+              ACE_ENV_ARG_PARAMETER);
+    }
+
+    PortableServer::ObjectId *
+    ServantRetentionStrategyRetain::activate_object (
+      PortableServer::Servant servant,
+      CORBA::Short priority,
+      int &wait_occurred_restart_call
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::ServantAlreadyActive,
+                         PortableServer::POA::WrongPolicy))
+    {
+      if (!this->poa_->has_system_id ())
+        {
+          ACE_THROW_RETURN (PortableServer::POA::WrongPolicy (),
+                            0);
+        }
+
+      bool may_activate =
+        this->poa_->is_servant_activation_allowed (servant, wait_occurred_restart_call);
+
+      if (!may_activate)
+        {
+          if (wait_occurred_restart_call)
+            {
+              return 0;
+            }
+          else
+            {
+              ACE_THROW_RETURN (PortableServer::POA::ServantAlreadyActive (),
+                                0);
+            }
+        }
+
+      // Otherwise, the activate_object operation generates an Object Id
+      // and enters the Object Id and the specified servant in the Active
+      // Object Map. The Object Id is returned.
+      PortableServer::ObjectId_var user_id;
+      if (this->active_object_map_->
+          bind_using_system_id_returning_user_id (servant,
+                                                  priority,
+                                                  user_id.out ()) != 0)
+        {
+          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
+                            0);
+        }
+
+      //
+      // Everything is finally ok
+      //
+
+      // ATTENTION: Trick locking here, see class header for details
+      Non_Servant_Upcall non_servant_upcall (*this->poa_);
+      ACE_UNUSED_ARG (non_servant_upcall);
+
+      // The implementation of activate_object will invoke _add_ref at
+      // least once on the Servant argument before returning. When the POA
+      // no longer needs the Servant, it will invoke _remove_ref on it the
+      // same number of times.
+      servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      return user_id._retn ();
+    }
+
+    void
+    ServantRetentionStrategyRetain::activate_object_with_id (
+      const PortableServer::ObjectId &id,
+      PortableServer::Servant servant,
+      CORBA::Short priority,
+      int &wait_occurred_restart_call
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ServantAlreadyActive,
+                   PortableServer::POA::ObjectAlreadyActive,
+                   PortableServer::POA::WrongPolicy))
+    {
+      // If the POA has the SYSTEM_ID policy and it detects that the
+      // Object Id value was not generated by the system or for this POA,
+      // the activate_object_with_id operation may raise the BAD_PARAM
+      // system exception.  An ORB is not required to detect all such
+      // invalid Object Id values, but a portable application must not
+      // invoke activate_object_with_id on a POA that has the SYSTEM_ID
+      // policy with an Object Id value that was not previously generated
+      // by the system for that POA, or, if the POA also has the
+      // PERSISTENT policy, for a previous instantiation of the same POA.
+      if (this->poa_->has_system_id () &&
+          !this->poa_->is_poa_generated_id (id))
+        {
+          ACE_THROW (CORBA::BAD_PARAM ());
+        }
+
+      // If the CORBA object denoted by the Object Id value is already
+      // active in this POA (there is a servant bound to it in the Active
+      // Object Map), the ObjectAlreadyActive exception is raised.
+      int priorities_match = 1;
+      int result =
+        this->is_user_id_in_map (id,
+                                 priority,
+                                 priorities_match,
+                                 wait_occurred_restart_call);
+
+    // @johnny the implementation is not complete, this does the spec also say
+    // If the POA has the UNIQUE_ID policy and the servant is already
+    // in the Active Object Map, the ServantAlreadyActive exception is raised.
+      if (result)
+        {
+          ACE_THROW (PortableServer::POA::ObjectAlreadyActive ());
+        }
+      else if (wait_occurred_restart_call)
+        {
+          // We ended up waiting on a condition variable, the POA state
+          // may have changed while we are waiting.  Therefore, we need to
+          // restart this call.
+          return;
+        }
+
+      // If the activate_object_with_id_and_priority operation is invoked
+      // with a different priority to an earlier invocation of one of the
+      // create reference with priority operations, for the same object,
+      // then the ORB shall raise a BAD_INV_ORDER system exception (with a
+      // Standard Minor Exception Code of 1). If the priority value is the
+      // same then the ORB shall return SUCCESS.
+      if (!priorities_match)
+        {
+          ACE_THROW (CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 1,
+                                           CORBA::COMPLETED_NO));
+        }
+
+      bool may_activate =
+        this->poa_->is_servant_activation_allowed (servant, wait_occurred_restart_call);
+
+      if (!may_activate)
+        {
+          if (wait_occurred_restart_call)
+            {
+              return;
+            }
+          else
+            {
+              ACE_THROW (PortableServer::POA::ServantAlreadyActive ());
+            }
+        }
+
+      // Otherwise, the activate_object_with_id operation enters an
+      // association between the specified Object Id and the specified
+      // servant in the Active Object Map.
+      if (this->active_object_map_->bind_using_user_id (servant,
+                                                         id,
+                                                         priority) != 0)
+        {
+          ACE_THROW (CORBA::OBJ_ADAPTER ());
+        }
+
+      //
+      // Everything is finally ok
+      //
+
+      // ATTENTION: Trick locking here, see class header for details
+      Non_Servant_Upcall non_servant_upcall (*this->poa_);
+      ACE_UNUSED_ARG (non_servant_upcall);
+
+      // The implementation of activate_object_with_id will invoke
+      // _add_ref at least once on the Servant argument before
+      // returning. When the POA no longer needs the Servant, it will
+      // invoke _remove_ref on it the same number of times.
+      servant->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+
+    CORBA::Object_ptr
+    ServantRetentionStrategyRetain::create_reference (
+      const char *intf,
+      CORBA::Short priority
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongPolicy))
+    {
+      // This operation creates an object reference that encapsulates a
+      // POA-generated Object Id value and the specified interface
+      // repository id. This operation does not cause an activation to
+      // take place. The resulting reference may be passed to clients, so
+      // that subsequent requests on those references will cause the
+      // appropriate servant manager to be invoked, if one is
+      // available. The generated Object Id value may be obtained by
+      // invoking POA::reference_to_id with the created reference.
+
+      PortableServer::ObjectId_var system_id;
+      PortableServer::ObjectId user_id;
+
+      if (this->active_object_map_->
+          bind_using_system_id_returning_system_id (0,
+                                                    priority,
+                                                    system_id.out ()) != 0)
+        {
+          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
+                            CORBA::Object::_nil ());
+        }
+
+      // Find user id from system id.
+      if (this->active_object_map_->
+          find_user_id_using_system_id (system_id.in (),
+                                        user_id) != 0)
+        {
+          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
+                            CORBA::Object::_nil ());
+        }
+
+      // Remember params for potentially invoking <key_to_object> later.
+      this->poa_->key_to_object_params_.set (system_id,
+                                       intf,
+                                       0,
+                                       1,
+                                       priority);
+
+      return this->poa_->invoke_key_to_object_helper_i (intf,
+                                                        user_id
+                                                        ACE_ENV_ARG_PARAMETER);
+
+    }
+
+    CORBA::Object_ptr
+    ServantRetentionStrategyRetain::create_reference_with_id (
+      const PortableServer::ObjectId &oid,
+      const char *intf,
+      CORBA::Short priority
+      ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      // This operation creates an object reference that encapsulates the
+      // specified Object Id and interface repository Id values. This
+      // operation does not cause an activation to take place.  The
+      // resulting reference may be passed to clients, so that subsequent
+      // requests on those references will cause the object to be
+      // activated if necessary, or the default servant used, depending on
+      // the applicable policies.
+
+      PortableServer::Servant servant = 0;
+      PortableServer::ObjectId_var system_id;
+
+      // @@ We need something that can find the system id using
+      // appropriate strategy, at the same time, return the servant if
+      // one is available.  Before we have that function,
+      // <create_reference_with_id_i> basically generates broken
+      // collocated object when DIRECT collocation strategy is used.
+
+      if (this->active_object_map_->
+          find_system_id_using_user_id (oid,
+                                        priority,
+                                        system_id.out ()) != 0)
+        {
+          ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
+                            CORBA::Object::_nil ());
+        }
+
+      // Remember params for potentially invoking <key_to_object> later.
+      this->poa_->key_to_object_params_.set (system_id,
+                                       intf,
+                                       servant,
+                                       1,
+                                       priority);
+
+      return this->poa_->invoke_key_to_object_helper_i (intf,
+                                                  oid
+                                                  ACE_ENV_ARG_PARAMETER);
+    }
+
+    int
+    ServantRetentionStrategyRetain::rebind_using_user_id_and_system_id (
+      PortableServer::Servant servant,
+      const PortableServer::ObjectId &user_id,
+      const PortableServer::ObjectId &system_id,
+      TAO::Portable_Server::Servant_Upcall &servant_upcall)
+    {
+      TAO_Active_Object_Map_Entry *entry = 0;
+      int result = this->active_object_map_->
+        rebind_using_user_id_and_system_id (servant,
+                                            user_id,
+                                            system_id,
+                                            entry);
+      servant_upcall.active_object_map_entry(entry);
+
+      return result;
+    }
+
+    CORBA::Boolean
+    ServantRetentionStrategyRetain::servant_has_remaining_activations (
+      PortableServer::Servant servant)
+    {
+      return this->active_object_map_->remaining_activations (servant);
+    }
+
+    ::PortableServer::ServantRetentionPolicyValue
+    ServantRetentionStrategyRetain::type() const
+    {
+      return ::PortableServer::RETAIN;
+    }
+
+  }
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class auto_ptr<TAO_Active_Object_Map>;
+
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
+template class ACE_Auto_Basic_Ptr<TAO_Active_Object_Map>;
+#  endif  /* ACE_LACKS_AUTO_PTR */
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate auto_ptr<TAO_Active_Object_Map>
+
+#  if defined (ACE_LACKS_AUTO_PTR) \
+      || !(defined (ACE_HAS_STANDARD_CPP_LIBRARY) \
+           && (ACE_HAS_STANDARD_CPP_LIBRARY != 0))
+#    pragma instantiate ACE_Auto_Basic_Ptr<TAO_Active_Object_Map>
+#  endif  /* ACE_LACKS_AUTO_PTR */
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
new file mode 100644
index 00000000000..15a9f425752
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
@@ -0,0 +1,189 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file ServantRetentionStrategyRetain.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_SERVANT_RETENTION_STRATEGY_RETAIN_H
+#define TAO_SERVANT_RETENTION_STRATEGY_RETAIN_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ServantRetentionStrategyNonRetain.h"
+
+class TAO_Root_POA;
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export ServantRetentionStrategyRetain
+       : public virtual ServantRetentionStrategyNonRetain
+    {
+    public:
+      ServantRetentionStrategyRetain (void);
+
+      virtual ~ServantRetentionStrategyRetain (void);
+
+      CORBA::ULong waiting_servant_deactivation (void) const;
+
+      virtual void strategy_init (TAO_Root_POA *poa ACE_ENV_ARG_DECL);
+
+      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
+
+      virtual int is_servant_in_map (PortableServer::Servant servant,
+                                     int &wait_occurred_restart_call);
+
+      virtual
+      PortableServer::ObjectId *
+      activate_object (PortableServer::Servant servant,
+                       CORBA::Short priority,
+                       int &wait_occurred_restart_call
+                            ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::ServantAlreadyActive,
+                         PortableServer::POA::WrongPolicy));
+
+      virtual
+      void
+      activate_object_with_id (const PortableServer::ObjectId &id,
+                               PortableServer::Servant servant,
+                               CORBA::Short priority,
+                               int &wait_occurred_restart_call
+                               ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                   PortableServer::POA::ServantAlreadyActive,
+                   PortableServer::POA::ObjectAlreadyActive,
+                   PortableServer::POA::WrongPolicy));
+
+      void deactivate_object (const PortableServer::ObjectId &id
+                              ACE_ENV_ARG_DECL);
+
+      virtual PortableServer::Servant find_servant (
+        const PortableServer::ObjectId &system_id
+        ACE_ENV_ARG_DECL);
+
+      virtual PortableServer::ObjectId * system_id_to_object_id (
+        const PortableServer::ObjectId &system_id
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::WrongAdapter,
+                           PortableServer::POA::WrongPolicy));
+
+      virtual
+      PortableServer::Servant
+      user_id_to_servant (const PortableServer::ObjectId &id
+                     ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::ObjectNotActive,
+                         PortableServer::POA::WrongPolicy));
+
+      CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &id
+                                         ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::ObjectNotActive,
+                         PortableServer::POA::WrongPolicy));
+
+      virtual
+      TAO_SERVANT_LOCATION
+      servant_present (const PortableServer::ObjectId &system_id,
+                       PortableServer::Servant &servant
+                       ACE_ENV_ARG_DECL);
+
+      virtual PortableServer::Servant find_servant (
+        const PortableServer::ObjectId &system_id,
+        TAO::Portable_Server::Servant_Upcall &servant_upcall,
+        TAO::Portable_Server::POA_Current_Impl &poa_current_impl
+        ACE_ENV_ARG_DECL);
+
+      virtual void deactivate_all_objects (ACE_ENV_SINGLE_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::WrongPolicy));
+
+      virtual PortableServer::ObjectId *servant_to_user_id (
+        PortableServer::Servant servant
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::ServantNotActive,
+                           PortableServer::POA::WrongPolicy));
+
+      virtual
+      CORBA::Object_ptr
+      servant_to_reference (PortableServer::Servant servant
+                            ACE_ENV_ARG_DECL)
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                      PortableServer::POA::ServantNotActive,
+                      PortableServer::POA::WrongPolicy));
+
+      virtual
+      CORBA::Object_ptr create_reference (
+        const char *intf,
+        CORBA::Short priority
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException,
+                           PortableServer::POA::WrongPolicy));
+
+      virtual
+      CORBA::Object_ptr create_reference_with_id (
+        const PortableServer::ObjectId &oid,
+        const char *intf,
+        CORBA::Short priority
+        ACE_ENV_ARG_DECL)
+          ACE_THROW_SPEC ((CORBA::SystemException));
+
+      virtual ::PortableServer::ServantRetentionPolicyValue type() const;
+
+    protected:
+      int
+      is_user_id_in_map (const PortableServer::ObjectId &id,
+                         CORBA::Short priority,
+                         int &priorities_match,
+                         int &wait_occurred_restart_call);
+
+      void
+      deactivate_map_entry (TAO_Active_Object_Map_Entry *active_object_map_entry
+                            ACE_ENV_ARG_DECL);
+
+      PortableServer::ObjectId *servant_to_system_id_i (
+          PortableServer::Servant p_servant,
+          CORBA::Short &priority
+          ACE_ENV_ARG_DECL
+        )
+        ACE_THROW_SPEC ((CORBA::SystemException,
+                         PortableServer::POA::ServantNotActive,
+                         PortableServer::POA::WrongPolicy));
+
+      virtual
+      int rebind_using_user_id_and_system_id (
+        PortableServer::Servant servant,
+        const PortableServer::ObjectId &user_id,
+        const PortableServer::ObjectId &system_id,
+        TAO::Portable_Server::Servant_Upcall &servant_upcall);
+
+      virtual
+      CORBA::Boolean servant_has_remaining_activations (
+        PortableServer::Servant servant);
+
+      virtual int unbind_using_user_id (
+        const PortableServer::ObjectId &user_id);
+
+    private:
+      TAO_Active_Object_Map *active_object_map_;
+      CORBA::ULong waiting_servant_deactivation_;
+    };
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_SERVANT_RETENTION_STRATEGY_RETAIN_H */
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
new file mode 100644
index 00000000000..496ce4b519a
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
@@ -0,0 +1,72 @@
+// $Id$
+
+#include "ServantRetentionStrategyRetainFactoryImpl.h"
+#include "ServantRetentionStrategy.h"
+#include "ServantRetentionStrategyRetain.h"
+#include "ace/Dynamic_Service.h"
+
+ACE_RCSID (PortableServer,
+           ServantRetentionStrategyRetainFactoryImpl,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    ServantRetentionStrategyRetainFactoryImpl::~ServantRetentionStrategyRetainFactoryImpl (void)
+    {
+    }
+
+    ServantRetentionStrategy*
+    ServantRetentionStrategyRetainFactoryImpl::create (
+      ::PortableServer::ServantRetentionPolicyValue value)
+    {
+      ServantRetentionStrategy* strategy = 0;
+
+      switch (value)
+      {
+        case ::PortableServer::RETAIN :
+        {
+          ACE_NEW_RETURN (strategy, ServantRetentionStrategyRetain, 0);
+          break;
+        }
+        case ::PortableServer::NON_RETAIN :
+        {
+          ACE_ERROR ((LM_ERROR, "Incorrect type in ServantRetentionStrategyNonRetainFactoryImpl"));
+          break;
+        }
+      }
+
+      return strategy;
+    }
+
+    void
+    ServantRetentionStrategyRetainFactoryImpl::destroy (
+      ServantRetentionStrategy *strategy
+      ACE_ENV_ARG_DECL)
+    {
+      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+
+      delete strategy;
+    }
+
+    ACE_STATIC_SVC_DEFINE (
+        ServantRetentionStrategyRetainFactoryImpl,
+        ACE_TEXT ("ServantRetentionStrategyRetainFactory"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (ServantRetentionStrategyRetainFactoryImpl),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+
+    ACE_FACTORY_DEFINE (TAO_PortableServer, ServantRetentionStrategyRetainFactoryImpl)
+
+    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+    template class ACE_Dynamic_Service<ServantRetentionStrategyRetainFactoryImpl>;
+    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+    #pragma instantiate ACE_Dynamic_Service<ServantRetentionStrategyRetainFactoryImpl>
+    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  }
+}
+
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h
new file mode 100644
index 00000000000..e1bbb881f55
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h
@@ -0,0 +1,51 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file ServantRetentionStrategyRetainFactoryImpl.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYRETAIN_FACTORYIMPL_H
+#define TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYRETAIN_FACTORYIMPL_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Service_Config.h"
+#include "tao/PortableServer/ServantRetentionStrategyFactory.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export ServantRetentionStrategyRetainFactoryImpl
+       : public virtual ServantRetentionStrategyFactory
+    {
+    public:
+      virtual ~ServantRetentionStrategyRetainFactoryImpl (void);
+
+      /// Create a new servant retention strategy
+      virtual ServantRetentionStrategy* create (
+        ::PortableServer::ServantRetentionPolicyValue value);
+
+      virtual void destroy (
+        ServantRetentionStrategy *strategy
+        ACE_ENV_ARG_DECL);
+    };
+
+    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ServantRetentionStrategyRetainFactoryImpl)
+    ACE_FACTORY_DECLARE (TAO_PortableServer, ServantRetentionStrategyRetainFactoryImpl)
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_SERVANTRETENTIONSTRATEGYRETAIN_FACTORYIMPL_H*/
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index ddb5aad1963..75bd7654c92 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -1,8 +1,9 @@
 // $Id$
 
-#include "tao/PortableServer/Servant_Base.h"
-#include "tao/PortableServer/POA.h"
-#include "tao/PortableServer/Operation_Table.h"
+#include "Servant_Base.h"
+#include "Root_POA.h"
+#include "Operation_Table.h"
+#include "POA_Current_Impl.h"
 
 #include "tao/Timeprobe.h"
 #include "tao/ORB_Core.h"
@@ -15,12 +16,10 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/OS_NS_string.h"
 
-
 ACE_RCSID (PortableServer,
            Servant_Base,
            "$Id$")
 
-
 #if !defined (__ACE_INLINE__)
 # include "Servant_Base.i"
 #endif /* ! __ACE_INLINE__ */
@@ -144,8 +143,8 @@ TAO_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = 0;
 
-  TAO_POA_Current_Impl *poa_current_impl =
-    static_cast<TAO_POA_Current_Impl *>
+  TAO::Portable_Server::POA_Current_Impl *poa_current_impl =
+    static_cast<TAO::Portable_Server::POA_Current_Impl *>
                     (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
 
   CORBA::ORB_ptr servant_orb = 0;
diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h
index 88a7ed0f428..0095b24f1c0 100644
--- a/TAO/tao/PortableServer/Servant_Base.h
+++ b/TAO/tao/PortableServer/Servant_Base.h
@@ -15,15 +15,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "PortableServerC.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Abstract_Servant_Base.h"
-
+#include "PS_ForwardC.h"
 #include "ace/Atomic_Op.h"
+#include "tao/Abstract_Servant_Base.h"
 
 class TAO_Operation_Table;
 
@@ -39,10 +39,6 @@ class TAO_PortableServer_Export TAO_ServantBase
   : public virtual TAO_Abstract_ServantBase
 {
 public:
-  friend class TAO_POA;
-  friend class TAO_Object_Adapter;
-  friend class TAO_Local_ServantBase;
-
   /// Destructor.
   virtual ~TAO_ServantBase (void);
 
@@ -98,11 +94,11 @@ public:
                      TAO::Collocation_Strategy st,
                      const unsigned int length = 0);
 
-protected:
-
   /// Get this interface's repository id (TAO specific).
   virtual const char *_interface_repository_id (void) const = 0;
 
+protected:
+
   /// Default constructor, only derived classes can be created.
   TAO_ServantBase (void);
 
diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Servant_Dispatcher.cpp
index c131dc1fc3b..f90cb97c96a 100644
--- a/TAO/tao/PortableServer/Servant_Dispatcher.cpp
+++ b/TAO/tao/PortableServer/Servant_Dispatcher.cpp
@@ -2,7 +2,9 @@
 
 #include "Servant_Dispatcher.h"
 
-ACE_RCSID(tao, Default_Acceptor_Filter, "$Id$")
+ACE_RCSID(PortableServer,
+          Servant_Dispatcher,
+          "$Id$")
 
 TAO_Servant_Dispatcher::~TAO_Servant_Dispatcher (void)
 {
diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.h b/TAO/tao/PortableServer/Servant_Dispatcher.h
index 1209f796541..77491395e7e 100644
--- a/TAO/tao/PortableServer/Servant_Dispatcher.h
+++ b/TAO/tao/PortableServer/Servant_Dispatcher.h
@@ -14,18 +14,19 @@
 #define TAO_SERVANT_DISPATCHER_H
 #include /**/ "ace/pre.h"
 
-#include "ace/SString.h"
 #include "portableserver_export.h"
-#include "Object_Adapter.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/SStringfwd.h"
+#include "Servant_Upcall.h"
+
 // Forward references.
 class TAO_POA_Manager;
 class TAO_POA_Policy_Set;
-class TAO_POA;
+class TAO_Root_POA;
 class ACE_Lock;
 class TAO_ORB_Core;
 class TAO_ServerRequest;
@@ -34,7 +35,6 @@ class TAO_ServerRequest;
  * @class TAO_Servant_Dispatcher
  *
  * @brief Interface for POA servant dispatching strategies.
- *
  */
 class TAO_PortableServer_Export TAO_Servant_Dispatcher
 {
@@ -43,36 +43,32 @@ public:
 
   /// Pre_invoke remote request.
   virtual void pre_invoke_remote_request (
-      TAO_POA &poa,
+      TAO_Root_POA &poa,
       CORBA::Short servant_priority,
-      //TAO_Service_Context &request_service_context,
-      //TAO_Service_Context &reply_service_context,
 			TAO_ServerRequest &req,
-      TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
+      TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
       ACE_ENV_ARG_DECL
     ) = 0;
 
   /// Pre_invoke collocated request.
-  virtual void pre_invoke_collocated_request (TAO_POA &poa,
+  virtual void pre_invoke_collocated_request (TAO_Root_POA &poa,
                                               CORBA::Short servant_priority,
-                                              TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
+                                              TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
                                               ACE_ENV_ARG_DECL) = 0;
 
   /// Post_invoke request.
-  virtual void post_invoke (TAO_POA &poa,
-                            TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State &pre_invoke_state) = 0;
+  virtual void post_invoke (TAO_Root_POA &poa,
+                            TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state) = 0;
 
   /// Factory method for creating new POA's.
-  virtual TAO_POA *create_POA (const ACE_CString &name,
-                               TAO_POA_Manager &poa_manager,
-                               const TAO_POA_Policy_Set &policies,
-                               TAO_POA *parent,
-                               ACE_Lock &lock,
-                               TAO_SYNCH_MUTEX &thread_lock,
-                               TAO_ORB_Core &orb_core,
-                               TAO_Object_Adapter *object_adapter
-                               ACE_ENV_ARG_DECL) = 0;
-
+  virtual TAO_Root_POA *create_Root_POA (const ACE_CString &name,
+                                         TAO_POA_Manager &poa_manager,
+                                         const TAO_POA_Policy_Set &policies,
+                                         ACE_Lock &lock,
+                                         TAO_SYNCH_MUTEX &thread_lock,
+                                         TAO_ORB_Core &orb_core,
+                                         TAO_Object_Adapter *object_adapter
+                                         ACE_ENV_ARG_DECL) = 0;
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp
new file mode 100644
index 00000000000..05ed0876e55
--- /dev/null
+++ b/TAO/tao/PortableServer/Servant_Upcall.cpp
@@ -0,0 +1,470 @@
+// $Id$
+
+#include "Object_Adapter.h"
+#include "Servant_Upcall.h"
+#include "Root_POA.h"
+#include "Default_Servant_Dispatcher.h"
+#include "Collocated_Object_Proxy_Broker.h"
+#include "Active_Object_Map_Entry.h"
+#include "ForwardRequestC.h"
+
+// -- TAO Include --
+#include "tao/ORB.h"
+#include "tao/ORB_Core.h"
+#include "tao/debug.h"
+
+#if !defined (__ACE_INLINE__)
+# include "Servant_Upcall.inl"
+#endif /* __ACE_INLINE__ */
+
+#include "ace/OS_NS_string.h"
+
+ACE_RCSID (PortableServer,
+           Servant_Upcall,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    Servant_Upcall::Servant_Upcall (TAO_ORB_Core *oc)
+      : object_adapter_ (0),
+        poa_ (0),
+        servant_ (0),
+        state_ (INITIAL_STAGE),
+        system_id_ (),
+        user_id_ (0),
+        current_context_ (),
+#if (TAO_HAS_MINIMUM_POA == 0)
+        cookie_ (0),
+        operation_ (0),
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+        active_object_map_entry_ (0)
+    {
+      TAO_Adapter *adapter = oc->poa_adapter ();
+      TAO_Object_Adapter *object_adapter =
+        dynamic_cast<TAO_Object_Adapter *>(adapter);
+      this->object_adapter_ = object_adapter;
+    }
+
+    int
+    Servant_Upcall::prepare_for_upcall (
+      const TAO::ObjectKey &key,
+      const char *operation,
+      CORBA::Object_out forward_to
+      ACE_ENV_ARG_DECL)
+    {
+      while (1)
+        {
+          int wait_occurred_restart_call = 0;
+
+          int result =
+            this->prepare_for_upcall_i (key,
+                                        operation,
+                                        forward_to,
+                                        wait_occurred_restart_call
+                                        ACE_ENV_ARG_PARAMETER);
+          ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
+
+          if (result == TAO_Adapter::DS_FAILED &&
+              wait_occurred_restart_call)
+            {
+              // We ended up waiting on a condition variable.  The POA
+              // state may have changed while we are waiting.  Therefore,
+              // we need to call prepare_for_upcall_i() again.  We also
+              // need to cleanup the state of the upcall object before
+              // continuing.
+              this->upcall_cleanup ();
+              continue;
+            }
+          else
+            {
+              return result;
+            }
+        }
+    }
+
+    int
+    Servant_Upcall::prepare_for_upcall_i (
+      const TAO::ObjectKey &key,
+      const char *operation,
+      CORBA::Object_out forward_to,
+      int &wait_occurred_restart_call
+      ACE_ENV_ARG_DECL)
+    {
+      // Acquire the object adapter lock first.
+      int result = this->object_adapter_->lock ().acquire ();
+      if (result == -1)
+        // Locking error.
+        ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
+                          TAO_Adapter::DS_FAILED);
+
+      // We have acquired the object adapater lock.  Record this for later
+      // use.
+      this->state_ = OBJECT_ADAPTER_LOCK_ACQUIRED;
+
+      // Check if a non-servant upcall is in progress.  If a non-servant
+      // upcall is in progress, wait for it to complete.  Unless of
+      // course, the thread making the non-servant upcall is this thread.
+      this->object_adapter_->wait_for_non_servant_upcalls_to_complete (
+        ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
+
+      // Locate the POA.
+      this->object_adapter_->locate_poa (key,
+                                         this->system_id_,
+                                         this->poa_
+                                         ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
+
+      // Check the state of the POA.
+      this->poa_->check_state (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
+
+      // Setup current for this request.
+      this->current_context_.setup (this->poa_,
+                                    key);
+
+      // Increase <poa->outstanding_requests_> for the duration of finding
+      // the POA, finding the servant, and making the upcall.
+      this->poa_->increment_outstanding_requests ();
+
+      // We have setup the POA Current.  Record this for later use.
+      this->state_ = POA_CURRENT_SETUP;
+
+      ACE_TRY
+        {
+          // Lookup the servant.
+          this->servant_ =
+            this->poa_->locate_servant_i (operation,
+                                          this->system_id_,
+                                          *this,
+                                          this->current_context_,
+                                          wait_occurred_restart_call
+                                          ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          if (wait_occurred_restart_call)
+            return TAO_Adapter::DS_FAILED;
+        }
+#if (TAO_HAS_MINIMUM_CORBA == 0)
+      ACE_CATCH (PortableServer::ForwardRequest, forward_request)
+        {
+          forward_to =
+            CORBA::Object::_duplicate (forward_request.forward_reference.in ());
+          return TAO_Adapter::DS_FORWARD;
+        }
+#else
+      ACE_CATCHANY
+        {
+          ACE_UNUSED_ARG (forward_to);
+          ACE_RE_THROW;
+        }
+#endif /* TAO_HAS_MINIMUM_CORBA */
+      ACE_ENDTRY;
+
+      // Now that we know the servant.
+      this->current_context_.servant (this->servant_);
+
+      // For servants from Servant Locators, there is no active object map
+      // entry.
+      if (this->active_object_map_entry ())
+        this->current_context_.priority (this->active_object_map_entry ()->priority_);
+
+      if (this->state_ != OBJECT_ADAPTER_LOCK_RELEASED)
+        {
+          // Release the object adapter lock.
+          this->object_adapter_->lock ().release ();
+
+          // We have release the object adapter lock.  Record this for
+          // later use.
+          this->state_ = OBJECT_ADAPTER_LOCK_RELEASED;
+        }
+
+      // Serialize servants (if appropriate).
+      this->single_threaded_poa_setup (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (TAO_Adapter::DS_FAILED);
+
+      // We have acquired the servant lock.  Record this for later use.
+      this->state_ = SERVANT_LOCK_ACQUIRED;
+
+      // After this point, <this->servant_> is ready for dispatching.
+      return TAO_Adapter::DS_OK;
+    }
+
+    void
+    Servant_Upcall::pre_invoke_remote_request (
+      TAO_ServerRequest &req
+      ACE_ENV_ARG_DECL)
+    {
+      this->object_adapter_->servant_dispatcher_->pre_invoke_remote_request (
+        this->poa (),
+        this->priority (),
+        req,
+        this->pre_invoke_state_
+        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+
+    void
+    Servant_Upcall::pre_invoke_collocated_request (
+      ACE_ENV_SINGLE_ARG_DECL)
+    {
+      this->object_adapter_->servant_dispatcher_->pre_invoke_collocated_request (
+        this->poa (),
+        this->priority (),
+        this->pre_invoke_state_
+        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
+    }
+
+    void
+    Servant_Upcall::post_invoke (void)
+    {
+      this->object_adapter_->servant_dispatcher_->post_invoke (
+        this->poa (),
+        this->pre_invoke_state_);
+    }
+
+    Servant_Upcall::Pre_Invoke_State::Pre_Invoke_State (void)
+      : state_ (NO_ACTION_REQUIRED),
+        original_native_priority_ (0),
+        original_CORBA_priority_ (0)
+    {
+    }
+
+    TAO_Root_POA *
+    Servant_Upcall::lookup_POA (const TAO::ObjectKey &key
+                                                    ACE_ENV_ARG_DECL)
+    {
+      // Acquire the object adapter lock first.
+      int result = this->object_adapter_->lock ().acquire ();
+      if (result == -1)
+        // Locking error.
+        ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
+                          0);
+
+      // We have acquired the object adapater lock.  Record this for later
+      // use.
+      this->state_ = OBJECT_ADAPTER_LOCK_ACQUIRED;
+
+      // Check if a non-servant upcall is in progress.  If a non-servant
+      // upcall is in progress, wait for it to complete.  Unless of
+      // course, the thread making the non-servant upcall is this thread.
+      this->object_adapter_->wait_for_non_servant_upcalls_to_complete (
+        ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      // Locate the POA.
+      this->object_adapter_->locate_poa (key,
+                                         this->system_id_,
+                                         this->poa_
+                                         ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (0);
+
+      return this->poa_;
+    }
+
+    Servant_Upcall::~Servant_Upcall (void)
+    {
+      this->upcall_cleanup ();
+    }
+
+    void
+    Servant_Upcall::upcall_cleanup (void)
+    {
+      this->post_invoke ();
+
+      switch (this->state_)
+        {
+        case SERVANT_LOCK_ACQUIRED:
+          // Unlock servant (if appropriate).
+          this->single_threaded_poa_cleanup ();
+
+          /* FALLTHRU */
+
+        case OBJECT_ADAPTER_LOCK_RELEASED:
+          // Cleanup servant locator related state.  Note that because
+          // this operation does not change any Object Adapter related
+          // state, it is ok to call it outside the lock.
+          this->post_invoke_servant_cleanup ();
+
+          // Since the object adapter lock was released, we must acquire
+          // it.
+          //
+          // Note that errors are ignored here since we cannot do much
+          // with it.
+          this->object_adapter_->lock ().acquire ();
+
+          // Check if a non-servant upcall is in progress.  If a
+          // non-servant upcall is in progress, wait for it to complete.
+          // Unless of course, the thread making the non-servant upcall is
+          // this thread.
+          this->object_adapter_->wait_for_non_servant_upcalls_to_complete ();
+
+          // Cleanup servant related state.
+          this->servant_cleanup ();
+
+          /* FALLTHRU */
+
+        case POA_CURRENT_SETUP:
+          // Cleanup POA related state.
+          this->poa_cleanup ();
+
+          // Teardown current for this request.
+          this->current_context_.teardown ();
+
+          /* FALLTHRU */
+
+        case OBJECT_ADAPTER_LOCK_ACQUIRED:
+          // Finally, since the object adapter lock was acquired, we must
+          // release it.
+          this->object_adapter_->lock ().release ();
+
+          /* FALLTHRU */
+
+        case INITIAL_STAGE:
+        default:
+          // @@ Keep compiler happy, the states above are the only
+          //    possible ones.
+          break;
+        }
+    }
+
+    void
+    Servant_Upcall::post_invoke_servant_cleanup (void)
+    {
+      this->poa_->post_invoke_servant_cleanup (this->current_context_.object_id (),
+                                               *this);
+    }
+
+    void
+    Servant_Upcall::single_threaded_poa_setup (ACE_ENV_SINGLE_ARG_DECL)
+    {
+#if (TAO_HAS_MINIMUM_POA == 0)
+      // Serialize servants (if necessary).
+      //
+      // Note that this lock must be acquired *after* the object adapter
+      // lock has been released.  This is necessary since we cannot block
+      // waiting for the servant lock while holding the object adapter
+      // lock.  Otherwise, the thread that wants to release this lock will
+      // not be able to do so since it can't acquire the object adapterx
+      // lock.
+        int result = this->poa_->enter();
+
+        if (result == -1)
+          // Locking error.
+          ACE_THROW (CORBA::OBJ_ADAPTER ());
+#else
+        ACE_ENV_ARG_NOT_USED; // FUZZ: ignore check_for_ace_check
+#endif /* !TAO_HAS_MINIMUM_POA == 0 */
+    }
+
+    void
+    Servant_Upcall::single_threaded_poa_cleanup (void)
+    {
+      int result = 0;
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+      // Since the servant lock was acquired, we must release it.
+      result = this->poa_->exit ();
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+      ACE_UNUSED_ARG (result);
+    }
+
+    void
+    Servant_Upcall::increment_servant_refcount (void)
+    {
+      // Cleanup servant related stuff.
+      if (this->active_object_map_entry_ != 0)
+        ++this->active_object_map_entry_->reference_count_;
+    }
+
+    void
+    Servant_Upcall::servant_cleanup (void)
+    {
+      // Cleanup servant related stuff.
+      if (this->active_object_map_entry_ != 0)
+        {
+          // Decrement the reference count.
+          CORBA::UShort new_count =
+            --this->active_object_map_entry_->reference_count_;
+
+          if (new_count == 0)
+            {
+              ACE_DECLARE_NEW_CORBA_ENV;
+              ACE_TRY
+                {
+                  this->poa_->cleanup_servant (
+                    this->active_object_map_entry_->servant_,
+                    this->active_object_map_entry_->user_id_
+                    ACE_ENV_ARG_PARAMETER);
+
+                  ACE_TRY_CHECK;
+                }
+              ACE_CATCHALL
+                {
+                  // Ignore errors from servant cleanup ....
+                }
+              ACE_ENDTRY;
+
+              if (this->poa_->waiting_servant_deactivation() > 0 &&
+                  this->object_adapter_->enable_locking_)
+                {
+                  // Wakeup all waiting threads.
+                  this->poa_->servant_deactivation_condition_.broadcast ();
+                }
+            }
+        }
+    }
+
+    void
+    Servant_Upcall::poa_cleanup (void)
+    {
+      // Decrease <poa->outstanding_requests_> now that the upcall
+      // is complete.
+      //
+      // Note that the object adapter lock is acquired before
+      // <POA::outstanding_requests_> is decreased.
+      CORBA::ULong outstanding_requests =
+        this->poa_->decrement_outstanding_requests ();
+
+      // Check if all pending requests are over.
+      if (outstanding_requests == 0)
+        {
+          // If locking is enabled and some thread is waiting in POA::destroy.
+          if (this->object_adapter_->enable_locking_ &&
+              this->poa_->wait_for_completion_pending_)
+            {
+              // Wakeup all waiting threads.
+              this->poa_->outstanding_requests_condition_.broadcast ();
+            }
+
+          // Note that there is no need to check for
+          // <non_servant_upcall_in_progress> since it is not possible for
+          // non-servant upcalls to be in progress at this point.
+          if (this->poa_->waiting_destruction_)
+            {
+              ACE_DECLARE_NEW_CORBA_ENV;
+
+              ACE_TRY
+                {
+                  this->poa_->complete_destruction_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+                  ACE_TRY_CHECK;
+                }
+              ACE_CATCHANY
+                {
+                  // Ignore exceptions
+                  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                                       "TAO_POA::~complete_destruction_i");
+                }
+              ACE_ENDTRY;
+              ACE_CHECK;
+
+              this->poa_ = 0;
+            }
+        }
+    }
+  }
+}
diff --git a/TAO/tao/PortableServer/Servant_Upcall.h b/TAO/tao/PortableServer/Servant_Upcall.h
new file mode 100644
index 00000000000..45e4c4bd46b
--- /dev/null
+++ b/TAO/tao/PortableServer/Servant_Upcall.h
@@ -0,0 +1,236 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Servant_Upcall.h
+ *
+ *  $Id$
+ *
+ *  @author Irfan Pyarali
+ */
+//=============================================================================
+
+#ifndef TAO_SERVANT_UPCALL_H
+#define TAO_SERVANT_UPCALL_H
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/PortableServer/POA_Current_Impl.h"
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+// Forward declaration
+class TAO_Root_POA;
+class TAO_ServerRequest;
+class TAO_Object_Adapter;
+struct TAO_Active_Object_Map_Entry;
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    /**
+     * @class Servant_Upcall
+     *
+     * @brief This class finds out the POA and the servant to perform an
+     * upcall.  It can only be instantiated without the object
+     * adapter's lock held.
+     */
+    class TAO_PortableServer_Export Servant_Upcall
+    {
+    public:
+      friend class TAO_RT_Collocation_Resolver;
+
+      /**
+       * @class Pre_Invoke_State
+       *
+       * @brief This struct keeps track of state related to pre- and
+       * post-invoke operations.
+       */
+      class Pre_Invoke_State
+      {
+      public:
+        /// Constructor.
+        Pre_Invoke_State (void);
+
+        enum State
+        {
+          NO_ACTION_REQUIRED,
+          PRIORITY_RESET_REQUIRED
+        };
+
+        /// Indicates whether the priority of the thread needs to be
+        /// reset back to its original value.
+        State state_;
+
+        /// Original native priority of the thread.
+        CORBA::Short original_native_priority_;
+
+        /// Original CORBA priority of the thread.
+        CORBA::Short original_CORBA_priority_;
+      };
+
+      /// Constructor.
+      Servant_Upcall (TAO_ORB_Core *orb_core);
+
+      /// Destructor.
+      ~Servant_Upcall (void);
+
+      /// Locate POA and servant.
+      int prepare_for_upcall (const TAO::ObjectKey &key,
+                              const char *operation,
+                              CORBA::Object_out forward_to
+                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+      /// Helper.
+      int prepare_for_upcall_i (const TAO::ObjectKey &key,
+                                const char *operation,
+                                CORBA::Object_out forward_to,
+                                int &wait_occurred_restart_call
+                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+      /// Run pre_invoke for a remote request.
+      void pre_invoke_remote_request (TAO_ServerRequest &req
+                                      ACE_ENV_ARG_DECL);
+
+      /// Run pre_invoke for a collocated request.
+      void pre_invoke_collocated_request (ACE_ENV_SINGLE_ARG_DECL);
+
+      /// Run post_invoke for a request.
+      void post_invoke (void);
+
+      /// Locate POA.
+      TAO_Root_POA *lookup_POA (const TAO::ObjectKey &key
+                           ACE_ENV_ARG_DECL);
+
+      /// POA accessor.
+      TAO_Root_POA &poa (void) const;
+
+      /// Object Adapter accessor.
+      TAO_Object_Adapter &object_adapter (void) const;
+
+      /// System ID accessor.
+      const PortableServer::ObjectId &id (void) const;
+
+      /// User ID accessors.  This is the same value returned by
+      /// PortableServer::Current::get_object_id().
+      void user_id (const PortableServer::ObjectId *);
+      const PortableServer::ObjectId &user_id (void) const;
+
+      /// Servant accessor.
+      PortableServer::Servant servant (void) const;
+
+  #if (TAO_HAS_MINIMUM_POA == 0)
+
+      /// Get the Servant Locator's cookie
+      void* locator_cookie (void) const;
+
+      /// Set the Servant Locator's cookie
+      void locator_cookie (void* cookie);
+
+      /// Get the operation name.
+      const char *operation (void) const;
+
+      /// Set the operation name.
+      void operation (const char *);
+
+  #endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+      /// Set the active_object_map_entry.
+      void active_object_map_entry (TAO_Active_Object_Map_Entry *entry);
+
+      /// Get the active_object_map_entry.
+      TAO_Active_Object_Map_Entry *active_object_map_entry (void) const;
+
+      /// Get the priority for the current upcall.
+      CORBA::Short priority (void) const;
+
+      enum State
+      {
+        INITIAL_STAGE,
+        OBJECT_ADAPTER_LOCK_ACQUIRED,
+        POA_CURRENT_SETUP,
+        OBJECT_ADAPTER_LOCK_RELEASED,
+        SERVANT_LOCK_ACQUIRED
+      };
+
+      /// Get the state.
+      State state (void) const;
+
+      /// Set the state.
+      void state (State);
+
+      /// Increment the refcount
+      void increment_servant_refcount (void);
+
+    protected:
+
+      void post_invoke_servant_cleanup (void);
+      void single_threaded_poa_setup (ACE_ENV_SINGLE_ARG_DECL);
+      void single_threaded_poa_cleanup (void);
+      void servant_cleanup (void);
+      void poa_cleanup (void);
+
+      /// Clean-up / reset state of this Servant_Upcall object.
+      void upcall_cleanup (void);
+
+    protected:
+
+      TAO_Object_Adapter *object_adapter_;
+
+      TAO_Root_POA *poa_;
+
+      PortableServer::Servant servant_;
+
+      State state_;
+
+      PortableServer::ObjectId system_id_;
+
+      const PortableServer::ObjectId *user_id_;
+
+      POA_Current_Impl current_context_;
+
+  #if (TAO_HAS_MINIMUM_POA == 0)
+
+      /// Servant Locator's cookie
+      void* cookie_;
+
+      /// Operation name for this current.
+      const char *operation_;
+
+  #endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+      /// Pointer to the entry in the TAO_Active_Object_Map corresponding
+      /// to the servant for this request.
+      TAO_Active_Object_Map_Entry *active_object_map_entry_;
+
+      /// Preinvoke data for the upcall.
+      Pre_Invoke_State pre_invoke_state_;
+
+    private:
+      Servant_Upcall (const Servant_Upcall &);
+      void operator= (const Servant_Upcall &);
+    };
+  }
+}
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__ACE_INLINE__)
+# include "Servant_Upcall.inl"
+#endif /* __ACE_INLINE__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_SERVANT_UPCALL_H */
diff --git a/TAO/tao/PortableServer/Servant_Upcall.inl b/TAO/tao/PortableServer/Servant_Upcall.inl
new file mode 100644
index 00000000000..07b5c49384b
--- /dev/null
+++ b/TAO/tao/PortableServer/Servant_Upcall.inl
@@ -0,0 +1,105 @@
+// -*- C++ -*-
+//
+// $Id$
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    ACE_INLINE TAO_Root_POA &
+    Servant_Upcall::poa (void) const
+    {
+      return *this->poa_;
+    }
+
+    ACE_INLINE PortableServer::Servant
+    Servant_Upcall::servant (void) const
+    {
+      return this->servant_;
+    }
+
+    ACE_INLINE TAO_Object_Adapter &
+    Servant_Upcall::object_adapter (void) const
+    {
+      return *this->object_adapter_;
+    }
+
+    ACE_INLINE const PortableServer::ObjectId &
+    Servant_Upcall::id (void) const
+    {
+      return this->system_id_;
+    }
+
+    ACE_INLINE void
+    Servant_Upcall::user_id (
+      const PortableServer::ObjectId *id)
+    {
+      this->user_id_ = id;
+    }
+
+    ACE_INLINE const PortableServer::ObjectId &
+    Servant_Upcall::user_id (void) const
+    {
+      return *(this->user_id_);
+    }
+
+    #if (TAO_HAS_MINIMUM_POA == 0)
+
+    ACE_INLINE void*
+    Servant_Upcall::locator_cookie (void) const
+    {
+      return this->cookie_;
+    }
+
+    ACE_INLINE void
+    Servant_Upcall::locator_cookie (void* cookie)
+    {
+      this->cookie_ = cookie;
+    }
+
+    ACE_INLINE const char *
+    Servant_Upcall::operation (void) const
+    {
+      return this->operation_;
+    }
+
+    ACE_INLINE void
+    Servant_Upcall::operation (const char *name)
+    {
+      this->operation_ = name;
+    }
+
+    #endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+    ACE_INLINE void
+    Servant_Upcall::active_object_map_entry (TAO_Active_Object_Map_Entry *entry)
+    {
+      this->active_object_map_entry_ = entry;
+    }
+
+    ACE_INLINE TAO_Active_Object_Map_Entry *
+    Servant_Upcall::active_object_map_entry (void) const
+    {
+      return this->active_object_map_entry_;
+    }
+
+    ACE_INLINE CORBA::Short
+    Servant_Upcall::priority (void) const
+    {
+      return this->current_context_.priority ();
+    }
+
+    ACE_INLINE Servant_Upcall::State
+    Servant_Upcall::state (void) const
+    {
+      return this->state_;
+    }
+
+    ACE_INLINE void
+    Servant_Upcall::state (Servant_Upcall::State state)
+    {
+      this->state_ = state;
+    }
+  }
+}
+
diff --git a/TAO/tao/PortableServer/ServerInterceptorAdapter.cpp b/TAO/tao/PortableServer/ServerInterceptorAdapter.cpp
index a35030c245e..f51119658fc 100644
--- a/TAO/tao/PortableServer/ServerInterceptorAdapter.cpp
+++ b/TAO/tao/PortableServer/ServerInterceptorAdapter.cpp
@@ -13,7 +13,7 @@ ACE_RCSID (PortableServer,
 #endif /* __ACE_INLINE__ */
 
 #include "ServerRequestInfo.h"
-#include "tao/PortableServer/PICurrent_Guard.h"
+#include "PICurrent_Guard.h"
 
 
 TAO_ServerRequestInterceptor_Adapter::~TAO_ServerRequestInterceptor_Adapter (void)
diff --git a/TAO/tao/PortableServer/ServerInterceptorAdapter.h b/TAO/tao/PortableServer/ServerInterceptorAdapter.h
index 9d918cb6611..3ba1051a2ee 100644
--- a/TAO/tao/PortableServer/ServerInterceptorAdapter.h
+++ b/TAO/tao/PortableServer/ServerInterceptorAdapter.h
@@ -31,7 +31,7 @@
 
 #include "portableserver_export.h"
 
-#include "tao/PortableInterceptorC.h"
+#include "tao/Basic_Types.h"
 #include "tao/Interceptor_List.h"
 
 class TAO_ServerRequestInfo;
@@ -48,7 +48,6 @@ class TAO_PortableServer_Export TAO_ServerRequestInterceptor_Adapter
 {
 
 public:
-
   TAO_ServerRequestInterceptor_Adapter (
     TAO_ServerRequestInterceptor_List::TYPE &interceptors,
     size_t &stack_size);
@@ -61,9 +60,6 @@ public:
    * Each of these methods corresponds to a client side interception
    * point.
    *
-   * @todo
-   * The "receive_request_service_contexts()" and "send_other()"
-   * PortableInterceptor interception points are missing.
    */
   //@{
 #if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
diff --git a/TAO/tao/PortableServer/ServerRequestInfo.cpp b/TAO/tao/PortableServer/ServerRequestInfo.cpp
index 9ca8fb1a055..4e6dbc4bda3 100644
--- a/TAO/tao/PortableServer/ServerRequestInfo.cpp
+++ b/TAO/tao/PortableServer/ServerRequestInfo.cpp
@@ -2,12 +2,12 @@
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
-ACE_RCSID (TAO_PortableServer,
+ACE_RCSID (PortableServer,
            ServerRequestInfo,
            "$Id$")
 
-#include "POA.h"
-#include "POA_Policy_Set.h"
+#include "Root_POA.h"
+#include "Servant_Upcall.h"
 
 #include "tao/TAO_Server_Request.h"
 #include "tao/ORB_Core.h"
@@ -22,7 +22,7 @@ ACE_RCSID (TAO_PortableServer,
 
 TAO_ServerRequestInfo::TAO_ServerRequestInfo (
   TAO_ServerRequest &server_request,
-  TAO_Object_Adapter::Servant_Upcall *servant_upcall)
+  TAO::Portable_Server::Servant_Upcall *servant_upcall)
   : server_request_ (server_request),
     servant_upcall_ (servant_upcall),
     caught_exception_ (0),
@@ -272,7 +272,7 @@ TAO_ServerRequestInfo::sending_exception (ACE_ENV_SINGLE_ARG_DECL)
                     CORBA::Any,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
@@ -340,7 +340,7 @@ TAO_ServerRequestInfo::adapter_name (ACE_ENV_SINGLE_ARG_DECL)
                     0);
 }
 
-CORBA::OctetSeq *
+PortableInterceptor::ObjectId *
 TAO_ServerRequestInfo::object_id (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -349,18 +349,18 @@ TAO_ServerRequestInfo::object_id (ACE_ENV_SINGLE_ARG_DECL)
       const PortableServer::ObjectId &id =
         this->servant_upcall_->user_id ();
 
-      CORBA::OctetSeq *tmp = 0;
+      PortableInterceptor::ObjectId *tmp = 0;
 
       ACE_NEW_THROW_EX (tmp,
-                        CORBA::OctetSeq,
+                        PortableInterceptor::ObjectId,
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
       ACE_CHECK_RETURN (0);
 
-      CORBA::OctetSeq_var obj_id = tmp;
+      PortableInterceptor::ObjectId_var obj_id = tmp;
 
       // @@ It would be nice to avoid this copy.  However, we can't be
       //    sure if the octet sequence will out live the POA from
@@ -414,34 +414,21 @@ TAO_ServerRequestInfo::get_server_policy (CORBA::PolicyType type
 {
   if (this->servant_upcall_ != 0)
     {
-      TAO_POA_Policy_Set &policies =
-        this->servant_upcall_->poa ().policies ();
-
-      // @@ This brain damaged implementation exists due to the fact
-      //    neither TAO_POA nor TAO_POA_Policy_Set exposes any methods
-      //    useful for retrieving a given Policy in the POA's
-      //    PolicyList.  So, I use the lame interfaces for now.
-      //          -Ossama
-      const CORBA::ULong num_policies = policies.num_policies ();
-      for (CORBA::ULong i = 0; i < num_policies; ++i)
-        {
-          // @@ This incurs at least two locks per loop iteration due
-          //    to the reference counting found within the policy
-          //    object reference!!!
-          CORBA::Policy_var policy = policies.get_policy_by_index (i);
+      CORBA::Policy_var policy =
+        this->servant_upcall_->poa ().get_policy (type ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
-          const CORBA::PolicyType ptype =
-            policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-          if (ptype == type)
-            return policy._retn ();
+      if (!CORBA::is_nil (policy.in ()))
+        {
+          return policy._retn ();
+        }
+      else
+        {
+          // No policy matching the given PolicyType was found.
+          ACE_THROW_RETURN (CORBA::INV_POLICY (CORBA::OMGVMCID | 3,
+                                               CORBA::COMPLETED_NO),
+                            CORBA::Policy::_nil ());
         }
-
-      // No policy matching the given PolicyType was found.
-      ACE_THROW_RETURN (CORBA::INV_POLICY (CORBA::OMGVMCID | 3,
-                                           CORBA::COMPLETED_NO),
-                        CORBA::Policy::_nil ());
     }
 
   // @@ Technically, we shouldn't be throwing this exception since
diff --git a/TAO/tao/PortableServer/ServerRequestInfo.h b/TAO/tao/PortableServer/ServerRequestInfo.h
index 7b78ccd404d..eabc646c982 100644
--- a/TAO/tao/PortableServer/ServerRequestInfo.h
+++ b/TAO/tao/PortableServer/ServerRequestInfo.h
@@ -29,22 +29,26 @@
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
-#include "Object_Adapter.h"
-
 #include "tao/PortableInterceptorC.h"
 #include "tao/LocalObject.h"
-#include "tao/StringSeqC.h"
 #include "tao/OctetSeqC.h"
-#include "tao/Service_Context.h"
 #include "tao/TAO_Server_Request.h"
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
+class TAO_ServerRequest;
+class TAO_Service_Context;
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class Servant_Upcall;
+  }
+}
 
 /**
  * @class TAO_ServerRequestInfo
@@ -60,7 +64,7 @@ public:
 
   /// Constructor.
   TAO_ServerRequestInfo (TAO_ServerRequest &server_request,
-                         TAO_Object_Adapter::Servant_Upcall *servant_upcall);
+                         TAO::Portable_Server::Servant_Upcall *servant_upcall);
 
   /// Return an ID unique to the current request.  This request ID may
   /// or may not be the same as the GIOP request ID.
@@ -166,7 +170,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Return the ObjectId for the target object.
-  virtual CORBA::OctetSeq * object_id (
+  virtual PortableInterceptor::ObjectId * object_id (
       ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -271,25 +275,23 @@ protected:
 
   /// Pointer to the Servant_Upcall object that contains the object
   /// ID, among other things.
-  TAO_Object_Adapter::Servant_Upcall *servant_upcall_;
+  TAO::Portable_Server::Servant_Upcall *servant_upcall_;
 
   /// Pointer to the caught exception.
   CORBA::Exception *caught_exception_;
 
   /// Reply status for the current request.
   PortableInterceptor::ReplyStatus reply_status_;
-
 };
 
 # if defined (__ACE_INLINE__)
 #  include "ServerRequestInfo.inl"
 # endif  /* __ACE_INLINE__ */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/StrategyFactory.cpp b/TAO/tao/PortableServer/StrategyFactory.cpp
new file mode 100644
index 00000000000..3f1fd83a956
--- /dev/null
+++ b/TAO/tao/PortableServer/StrategyFactory.cpp
@@ -0,0 +1,29 @@
+// $Id$
+
+#include "StrategyFactory.h"
+#include "ace/Dynamic_Service.h"
+
+ACE_RCSID (PortableServer,
+           StrategyFactory,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    StrategyFactory::~StrategyFactory (void)
+    {
+    }
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Dynamic_Service<StrategyFactory>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Dynamic_Service<StrategyFactory>
+
+#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+
+  } /* namespace Portable_Server */
+} /* namespace TAO */
diff --git a/TAO/tao/PortableServer/StrategyFactory.h b/TAO/tao/PortableServer/StrategyFactory.h
new file mode 100644
index 00000000000..26fb66183bd
--- /dev/null
+++ b/TAO/tao/PortableServer/StrategyFactory.h
@@ -0,0 +1,38 @@
+// -*- C++ -*-
+//=============================================================================
+/**
+ *  @file StrategyFactory.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_STRATEGYFACTORY_H
+#define TAO_PORTABLESERVER_STRATEGYFACTORY_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Service_Object.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export StrategyFactory :
+      public virtual ACE_Service_Object
+    {
+    public:
+      virtual ~StrategyFactory (void);
+    };
+  } /* namespace Portable_Server */
+} /* namespace TAO */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_STRATEGYFACTORY_H */
diff --git a/TAO/tao/PortableServer/ThreadPolicy.cpp b/TAO/tao/PortableServer/ThreadPolicy.cpp
new file mode 100644
index 00000000000..e054478a936
--- /dev/null
+++ b/TAO/tao/PortableServer/ThreadPolicy.cpp
@@ -0,0 +1,67 @@
+#include "ThreadPolicy.h"
+#include "PortableServer.h"
+
+ACE_RCSID (PortableServer,
+           ThreadPolicy,
+           "$Id$")
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    ThreadPolicy::ThreadPolicy (::PortableServer::ThreadPolicyValue value)
+      : value_ (value)
+    {
+    }
+
+    CORBA::Policy_ptr
+    ThreadPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      ThreadPolicy *copy = 0;
+      ACE_NEW_THROW_EX (copy,
+                        ThreadPolicy (this->value_),
+                        CORBA::NO_MEMORY ());
+      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+
+      return copy;
+    }
+
+    void
+    ThreadPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+    }
+
+    ::PortableServer::ThreadPolicyValue
+    ThreadPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      return value_;
+    }
+
+    CORBA::PolicyType
+    ThreadPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+      ACE_THROW_SPEC ((CORBA::SystemException))
+    {
+      return ::PortableServer::THREAD_POLICY_ID;
+    }
+
+    TAO_Cached_Policy_Type
+    ThreadPolicy::_tao_cached_type (void) const
+    {
+      return TAO_CACHED_POLICY_THREAD;
+    }
+
+    TAO_Policy_Scope
+    ThreadPolicy::_tao_scope (void) const
+    {
+      return TAO_POLICY_POA_SCOPE;
+    }
+
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ThreadPolicy.h b/TAO/tao/PortableServer/ThreadPolicy.h
new file mode 100644
index 00000000000..dc9673f59a7
--- /dev/null
+++ b/TAO/tao/PortableServer/ThreadPolicy.h
@@ -0,0 +1,77 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file ThreadPolicy.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_THREADPOLICY_H
+#define TAO_PORTABLESERVER_THREADPOLICY_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ThreadPolicyC.h"
+#include "tao/LocalObject.h"
+
+// This is to remove "inherits via dominance" warnings from MSVC.
+// MSVC is being a little too paranoid.
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export ThreadPolicy
+      : public virtual ::PortableServer::ThreadPolicy,
+        public virtual TAO_Local_RefCounted_Object
+    {
+    public:
+      ThreadPolicy (::PortableServer::ThreadPolicyValue value);
+
+      CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      ::PortableServer::ThreadPolicyValue value (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+        ACE_THROW_SPEC ((CORBA::SystemException));
+
+      /// Return the cached policy type for this policy.
+      TAO_Cached_Policy_Type _tao_cached_type (void) const;
+
+      /// Returns the scope at which this policy can be applied. See orbconf.h.
+      TAO_Policy_Scope _tao_scope (void) const;
+
+    private:
+      ::PortableServer::ThreadPolicyValue value_;
+    };
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_THREADPOLICY_H */
diff --git a/TAO/tao/PortableServer/ThreadPolicy.pidl b/TAO/tao/PortableServer/ThreadPolicy.pidl
new file mode 100644
index 00000000000..b20ec71d065
--- /dev/null
+++ b/TAO/tao/PortableServer/ThreadPolicy.pidl
@@ -0,0 +1,41 @@
+/**
+ * @file ThreadPolicy.pidl
+ *
+ * $Id$
+ *
+ * @brief Pre-compiled IDL source for the PortableServer module.
+ *
+ * tao_idl.exe \
+ *     -o orig -Gp -Gd -Ge 1 -GT -Sc -GA -I$(TAO_ROOT)
+ *          -Wb,export_macro=TAO_PortableServer_Export \
+ *          -Wb,export_include="portableserver_export.h" \
+ *          -Wb,pre_include="ace/pre.h" \
+ *          -Wb,post_include="ace/post.h" \
+ *          ThreadPolicy.pidl
+ */
+
+#ifndef _PORTABLESERVER_THREAD_POLICY_IDL_
+#define _PORTABLESERVER_THREAD_POLICY_IDL_
+
+#include <tao/Policy.pidl>
+
+#pragma prefix "omg.org"
+
+module PortableServer
+{
+# pragma version PortableServer 2.3
+
+  enum ThreadPolicyValue
+  {
+    ORB_CTRL_MODEL,
+    SINGLE_THREAD_MODEL
+/*    ,MAIN_THREAD_MODEL*/
+  };
+
+  local interface ThreadPolicy : CORBA::Policy
+  {
+    readonly attribute ThreadPolicyValue value;
+  };
+};
+
+#endif // _PORTABLESERVER_THREAD_POLICY_IDL_
diff --git a/TAO/tao/PortableServer/ThreadPolicyA.cpp b/TAO/tao/PortableServer/ThreadPolicyA.cpp
new file mode 100644
index 00000000000..c7b31261f44
--- /dev/null
+++ b/TAO/tao/PortableServer/ThreadPolicyA.cpp
@@ -0,0 +1,253 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+
+#include "ThreadPolicyC.h"
+#include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
+#include "tao/Any_Impl_T.h"
+#include "tao/Any_Basic_Impl_T.h"
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+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 (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 (0x65000000),  // name = ThreadPolicyValue
+  2, // member count
+  15,
+  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 (0x44454c00),  // name = SINGLE_THREAD_MODEL
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ThreadPolicyValue (
+    CORBA::tk_enum,
+    sizeof (_oc_PortableServer_ThreadPolicyValue),
+    (char *) &_oc_PortableServer_ThreadPolicyValue,
+    0,
+    0
+  );
+
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_ThreadPolicyValue =
+    &_tc_TAO_tc_PortableServer_ThreadPolicyValue;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+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 (0x322e3300),  // repository ID = IDL:omg.org/PortableServer/ThreadPolicy:2.3
+    13,
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x0),  // name = ThreadPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_PortableServer_ThreadPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_PortableServer_ThreadPolicy),
+    (char *) &_oc_PortableServer_ThreadPolicy,
+    0,
+    0
+  );
+
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr _tc_ThreadPolicy =
+    &_tc_TAO_tc_PortableServer_ThreadPolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ThreadPolicyValue _tao_elem
+  )
+{
+  TAO::Any_Basic_Impl_T<PortableServer::ThreadPolicyValue>::insert (
+      _tao_any,
+      PortableServer::_tc_ThreadPolicyValue,
+      _tao_elem
+    );
+}
+
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ThreadPolicyValue &_tao_elem
+  )
+{
+  return
+    TAO::Any_Basic_Impl_T<PortableServer::ThreadPolicyValue>::extract (
+        _tao_any,
+        PortableServer::_tc_ThreadPolicyValue,
+        _tao_elem 
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+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 false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<PortableServer::ThreadPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ThreadPolicy_ptr _tao_elem
+  )
+{
+  PortableServer::ThreadPolicy_ptr _tao_objptr =
+    PortableServer::ThreadPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    PortableServer::ThreadPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<PortableServer::ThreadPolicy>::insert (
+      _tao_any,
+      PortableServer::ThreadPolicy::_tao_any_destructor,
+      PortableServer::_tc_ThreadPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    PortableServer::ThreadPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<PortableServer::ThreadPolicy>::extract (
+        _tao_any,
+        PortableServer::ThreadPolicy::_tao_any_destructor,
+        PortableServer::_tc_ThreadPolicy,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        PortableServer::ThreadPolicyValue
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        PortableServer::ThreadPolicy
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        PortableServer::ThreadPolicyValue \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        PortableServer::ThreadPolicy \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ThreadPolicyC.cpp b/TAO/tao/PortableServer/ThreadPolicyC.cpp
new file mode 100644
index 00000000000..be20856a29a
--- /dev/null
+++ b/TAO/tao/PortableServer/ThreadPolicyC.cpp
@@ -0,0 +1,259 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:302
+
+
+#include "ThreadPolicyC.h"
+#include "tao/CDR.h"
+#include "ace/OS_NS_string.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if !defined (__ACE_INLINE__)
+#include "ThreadPolicyC.inl"
+#endif /* !defined INLINE */
+
+// TAO_IDL - Generated from
+// be\be_visitor_arg_traits.cpp:66
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+// Arg traits specializations.
+namespace TAO
+{
+}
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/interface_cs.cpp:60
+
+// Traits specializations for PortableServer::ThreadPolicy.
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+PortableServer::ThreadPolicy_ptr
+TAO::Objref_Traits<PortableServer::ThreadPolicy>::duplicate (
+    PortableServer::ThreadPolicy_ptr p
+  )
+{
+  return PortableServer::ThreadPolicy::_duplicate (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+void
+TAO::Objref_Traits<PortableServer::ThreadPolicy>::release (
+    PortableServer::ThreadPolicy_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+PortableServer::ThreadPolicy_ptr
+TAO::Objref_Traits<PortableServer::ThreadPolicy>::nil (void)
+{
+  return PortableServer::ThreadPolicy::_nil ();
+}
+
+ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
+CORBA::Boolean
+TAO::Objref_Traits<PortableServer::ThreadPolicy>::marshal (
+    PortableServer::ThreadPolicy_ptr p,
+    TAO_OutputCDR & cdr
+  )
+{
+  return CORBA::Object::marshal (p, cdr);
+}
+
+PortableServer::ThreadPolicy::ThreadPolicy (void)
+{}
+
+PortableServer::ThreadPolicy::~ThreadPolicy (void)
+{}
+
+void 
+PortableServer::ThreadPolicy::_tao_any_destructor (void *_tao_void_pointer)
+{
+  ThreadPolicy *_tao_tmp_pointer =
+    static_cast<ThreadPolicy *> (_tao_void_pointer);
+  CORBA::release (_tao_tmp_pointer);
+}
+
+PortableServer::ThreadPolicy_ptr
+PortableServer::ThreadPolicy::_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return ThreadPolicy::_nil ();
+    }
+  
+  ThreadPolicy_ptr proxy =
+    dynamic_cast<ThreadPolicy_ptr> (_tao_objref);
+  
+  return ThreadPolicy::_duplicate (proxy);
+}
+
+PortableServer::ThreadPolicy_ptr
+PortableServer::ThreadPolicy::_unchecked_narrow (
+    CORBA::Object_ptr _tao_objref
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return ThreadPolicy::_nil ();
+    }
+  
+  ThreadPolicy_ptr proxy =
+    dynamic_cast<ThreadPolicy_ptr> (_tao_objref);
+  
+  return ThreadPolicy::_duplicate (proxy);
+}
+
+PortableServer::ThreadPolicy_ptr
+PortableServer::ThreadPolicy::_duplicate (ThreadPolicy_ptr obj)
+{
+  if (! CORBA::is_nil (obj))
+    {
+      obj->_add_ref ();
+    }
+  
+  return obj;
+}
+
+CORBA::Boolean
+PortableServer::ThreadPolicy::_is_a (
+    const char *value
+    ACE_ENV_ARG_DECL_NOT_USED
+  )
+{
+  if (
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/Policy:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/PortableServer/ThreadPolicy:2.3"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/LocalObject:1.0"
+        ) ||
+      !ACE_OS::strcmp (
+          value,
+          "IDL:omg.org/CORBA/Object:1.0"
+        )
+    )
+    {
+      return 1; // success using local knowledge
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+const char* PortableServer::ThreadPolicy::_interface_repository_id (void) const
+{
+  return "IDL:omg.org/PortableServer/ThreadPolicy:2.3";
+}
+
+CORBA::Boolean
+PortableServer::ThreadPolicy::marshal (TAO_OutputCDR &)
+{
+  return 0;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/cdr_op_cs.cpp:51
+
+CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ThreadPolicyValue &_tao_enumval)
+{
+  CORBA::ULong _tao_temp = _tao_enumval;
+  return strm << _tao_temp;
+}
+
+CORBA::Boolean operator>> (TAO_InputCDR &strm, PortableServer::ThreadPolicyValue &_tao_enumval)
+{
+  CORBA::ULong _tao_temp = 0;
+  CORBA::Boolean _tao_result = strm >> _tao_temp;
+  
+  if (_tao_result == 1)
+    {
+      _tao_enumval = static_cast<PortableServer::ThreadPolicyValue> (_tao_temp);
+    }
+  
+  return _tao_result;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_root/root.cpp:1629
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Objref_Traits<
+        PortableServer::ThreadPolicy
+      >;
+
+  template class
+    TAO_Objref_Var_T<
+        PortableServer::ThreadPolicy
+      >;
+  
+  template class
+    TAO_Objref_Out_T<
+        PortableServer::ThreadPolicy
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Objref_Traits< \
+        PortableServer::ThreadPolicy \
+      >
+
+# pragma instantiate \
+    TAO_Objref_Var_T< \
+        PortableServer::ThreadPolicy
+      >
+  
+# pragma instantiate \
+    TAO_Objref_Out_T< \
+        PortableServer::ThreadPolicy
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ThreadPolicyC.h b/TAO/tao/PortableServer/ThreadPolicyC.h
new file mode 100644
index 00000000000..6160f35e73d
--- /dev/null
+++ b/TAO/tao/PortableServer/ThreadPolicyC.h
@@ -0,0 +1,300 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:153
+
+#ifndef _TAO_IDL_ORIG_THREADPOLICYC_H_
+#define _TAO_IDL_ORIG_THREADPOLICYC_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "portableserver_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
+#include "tao/Environment.h"
+#include "tao/Object.h"
+#include "tao/Objref_VarOut_T.h"
+
+#include "tao/PolicyC.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_PortableServer_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_PortableServer_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_ch.cpp:62
+
+namespace TAO
+{
+  class Collocation_Proxy_Broker;
+  
+  template<typename T> class Narrow_Utils;
+  template<typename T> class AbstractBase_Narrow_Utils;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // 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
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadPolicyValue;
+  
+  // TAO_IDL - Generated from
+  // be\be_interface.cpp:598
+
+#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;
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_interface/interface_ch.cpp:54
+
+#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;
+    
+    // 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 static_cast<ThreadPolicy_ptr> (0);
+    }
+    
+    static void _tao_any_destructor (void *);
+    
+    // TAO_IDL - Generated from
+    // 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
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual ::CORBA::Policy_ptr copy (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/operation_ch.cpp:46
+    
+    virtual void destroy (
+        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+      )
+      ACE_THROW_SPEC ((
+        CORBA::SystemException
+      )) = 0;
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_interface/interface_ch.cpp:208
+    
+    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:
+    // Abstract or local interface only.
+    ThreadPolicy (void);
+    
+    virtual ~ThreadPolicy (void);
+  
+  private:
+    // Private and unimplemented for concrete interfaces.
+    ThreadPolicy (const ThreadPolicy &);
+    
+    void operator= (const ThreadPolicy &);
+  };
+
+#endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadPolicy;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:66
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:59
+
+// Traits specializations.
+#if (TAO_HAS_MINIMUM_POA == 0)
+namespace TAO
+{
+
+#if !defined (_PORTABLESERVER_THREADPOLICY__TRAITS_CH_)
+#define _PORTABLESERVER_THREADPOLICY__TRAITS_CH_
+  
+  ACE_TEMPLATE_SPECIALIZATION
+  struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ThreadPolicy>
+  {
+    static ::PortableServer::ThreadPolicy_ptr duplicate (
+        ::PortableServer::ThreadPolicy_ptr
+      );
+    static void release (
+        ::PortableServer::ThreadPolicy_ptr
+      );
+    static ::PortableServer::ThreadPolicy_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::PortableServer::ThreadPolicy_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_ch.cpp:51
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicyValue);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicyValue &);
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicy_ptr); // copying
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicy_ptr *); // non-copying
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicy_ptr &);
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/cdr_op_ch.cpp:50
+
+TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &);
+TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &);
+
+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:961
+
+#if defined (__ACE_INLINE__)
+#include "ThreadPolicyC.inl"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/PortableServer/ThreadPolicyC.inl b/TAO/tao/PortableServer/ThreadPolicyC.inl
new file mode 100644
index 00000000000..c944d806c1f
--- /dev/null
+++ b/TAO/tao/PortableServer/ThreadPolicyC.inl
@@ -0,0 +1,27 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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/ThreadStrategy.cpp b/TAO/tao/PortableServer/ThreadStrategy.cpp
new file mode 100644
index 00000000000..37507e617c6
--- /dev/null
+++ b/TAO/tao/PortableServer/ThreadStrategy.cpp
@@ -0,0 +1,31 @@
+// $Id$
+
+#include "ThreadStrategy.h"
+
+ACE_RCSID (PortableServer,
+           ThreadStrategy,
+           "$Id$")
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    ThreadStrategy::~ThreadStrategy()
+    {
+    }
+
+    void
+    ThreadStrategy::strategy_init (TAO_Root_POA * /*poa*/ ACE_ENV_ARG_DECL_NOT_USED)
+    {
+    }
+
+    void
+    ThreadStrategy::strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+    {
+    }
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ThreadStrategy.h b/TAO/tao/PortableServer/ThreadStrategy.h
new file mode 100644
index 00000000000..d8107641188
--- /dev/null
+++ b/TAO/tao/PortableServer/ThreadStrategy.h
@@ -0,0 +1,52 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file ThreadStrategy.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_THREAD_STRATEGY_H
+#define TAO_THREAD_STRATEGY_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "Policy_Strategy.h"
+#include "ThreadPolicyC.h"
+
+#include "tao/orbconf.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export ThreadStrategy :
+       public virtual Policy_Strategy
+    {
+    public:
+      virtual ~ThreadStrategy (void);
+
+      virtual int enter () = 0;
+
+      virtual int exit () = 0;
+
+      virtual void strategy_init (TAO_Root_POA *poa ACE_ENV_ARG_DECL);
+
+      virtual void strategy_cleanup(ACE_ENV_SINGLE_ARG_DECL);
+
+      virtual ::PortableServer::ThreadPolicyValue type() const = 0;
+    };
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_THREAD_STRATEGY_H */
diff --git a/TAO/tao/PortableServer/ThreadStrategyFactory.h b/TAO/tao/PortableServer/ThreadStrategyFactory.h
new file mode 100644
index 00000000000..14954e94429
--- /dev/null
+++ b/TAO/tao/PortableServer/ThreadStrategyFactory.h
@@ -0,0 +1,49 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file ThreadStrategyFactory.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORY_H
+#define TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORY_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/PortableServer/StrategyFactory.h"
+#include "tao/PortableServer/ThreadPolicyC.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class ThreadStrategy;
+
+    class TAO_PortableServer_Export ThreadStrategyFactory
+       : public virtual StrategyFactory
+    {
+    public:
+      /// Create a new servant retention strategy
+      virtual ThreadStrategy *create (
+        ::PortableServer::ThreadPolicyValue value) = 0;
+
+      /// Cleanup the given strategy instance
+      virtual void destroy (
+        ThreadStrategy *strategy
+        ACE_ENV_ARG_DECL) = 0;
+    };
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORY_H */
diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
new file mode 100644
index 00000000000..4d2dd1d8519
--- /dev/null
+++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
@@ -0,0 +1,109 @@
+// $Id$
+
+#include "ThreadStrategyFactoryImpl.h"
+#include "ThreadStrategy.h"
+#include "ace/Dynamic_Service.h"
+
+ACE_RCSID (PortableServer,
+           ThreadStrategyFactoryImpl,
+           "$Id$")
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    ThreadStrategyFactoryImpl::~ThreadStrategyFactoryImpl (void)
+    {
+    }
+
+    ThreadStrategy*
+    ThreadStrategyFactoryImpl::create (
+      ::PortableServer::ThreadPolicyValue value)
+    {
+      ThreadStrategy* strategy = 0;
+
+      switch (value)
+      {
+        case ::PortableServer::SINGLE_THREAD_MODEL :
+        {
+          ThreadStrategyFactory *strategy_factory =
+            ACE_Dynamic_Service<ThreadStrategyFactory>::instance ("ThreadStrategySingleFactory");
+
+          if (strategy_factory != 0)
+            strategy = strategy_factory->create (value);
+          else
+            ACE_ERROR ((LM_ERROR,
+                        ACE_TEXT ("(%P|%t) %p\n"),
+                        ACE_TEXT ("Unable to get ")
+                        ACE_TEXT ("ThreadStrategySingleFactory")));
+
+          break;
+        }
+        case ::PortableServer::ORB_CTRL_MODEL :
+        {
+          strategy =
+            ACE_Dynamic_Service<ThreadStrategy>::instance ("ThreadStrategyORBControl");
+
+          if (strategy == 0)
+            ACE_ERROR ((LM_ERROR,
+                        ACE_TEXT ("(%P|%t) %p\n"),
+                        ACE_TEXT ("Unable to get ")
+                        ACE_TEXT ("ThreadStrategyORBControl")));
+
+          break;
+        }
+      }
+
+      return strategy;
+    }
+
+    void
+    ThreadStrategyFactoryImpl::destroy (
+      ThreadStrategy *strategy
+      ACE_ENV_ARG_DECL)
+    {
+      switch (strategy->type ())
+      {
+        case ::PortableServer::SINGLE_THREAD_MODEL :
+        {
+          ThreadStrategyFactory *strategy_factory =
+            ACE_Dynamic_Service<ThreadStrategyFactory>::instance ("ThreadStrategySingleFactory");
+
+          if (strategy_factory != 0)
+            {
+              strategy_factory->destroy (strategy ACE_ENV_ARG_PARAMETER);
+              ACE_CHECK;
+            }
+          break;
+        }
+        case ::PortableServer::ORB_CTRL_MODEL :
+        {
+          // Noop
+          break;
+        }
+      }
+    }
+
+    ACE_STATIC_SVC_DEFINE (
+        ThreadStrategyFactoryImpl,
+        ACE_TEXT ("ThreadStrategyFactory"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (ThreadStrategyFactoryImpl),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+
+    ACE_FACTORY_DEFINE (TAO_PortableServer, ThreadStrategyFactoryImpl)
+
+    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+    template class ACE_Dynamic_Service<ThreadStrategyFactoryImpl>;
+
+    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+    #pragma instantiate ACE_Dynamic_Service<ThreadStrategyFactoryImpl>
+
+    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  }
+}
+
diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h
new file mode 100644
index 00000000000..c035aa24987
--- /dev/null
+++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h
@@ -0,0 +1,51 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file ThreadStrategyFactoryImpl.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORYIMPL_H
+#define TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORYIMPL_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Service_Config.h"
+#include "tao/PortableServer/ThreadStrategyFactory.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export ThreadStrategyFactoryImpl
+       : public virtual ThreadStrategyFactory
+    {
+    public:
+      virtual ~ThreadStrategyFactoryImpl (void);
+
+      /// Create a new servant retention strategy
+      virtual ThreadStrategy* create (
+        ::PortableServer::ThreadPolicyValue value);
+
+      virtual void destroy (
+        ThreadStrategy *strategy
+        ACE_ENV_ARG_DECL);
+    };
+
+    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategyFactoryImpl)
+    ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategyFactoryImpl)
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORYIMPL_H */
diff --git a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
new file mode 100644
index 00000000000..ee82855edf1
--- /dev/null
+++ b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
@@ -0,0 +1,56 @@
+// $Id$
+
+#include "ThreadStrategyORBControl.h"
+
+ACE_RCSID (PortableServer,
+           ThreadStrategyORBControl,
+           "$Id$")
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    ThreadStrategyORBControl::~ThreadStrategyORBControl()
+    {
+    }
+
+    int
+    ThreadStrategyORBControl::enter ()
+    {
+      return 0;
+    }
+
+    int
+    ThreadStrategyORBControl::exit ()
+    {
+      return 0;
+    }
+
+    ::PortableServer::ThreadPolicyValue
+    ThreadStrategyORBControl::type() const
+    {
+      return ::PortableServer::ORB_CTRL_MODEL;
+    }
+
+    ACE_FACTORY_DEFINE (TAO_PortableServer, ThreadStrategyORBControl)
+
+    ACE_STATIC_SVC_DEFINE (
+        ThreadStrategyORBControl,
+        ACE_TEXT ("ThreadStrategyORBControl"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (ThreadStrategyORBControl),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+
+    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+    template class ACE_Dynamic_Service<ThreadStrategyORBControl>;
+    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+    #pragma instantiate ACE_Dynamic_Service<ThreadStrategyORBControl>
+    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ThreadStrategyORBControl.h b/TAO/tao/PortableServer/ThreadStrategyORBControl.h
new file mode 100644
index 00000000000..b5761aed682
--- /dev/null
+++ b/TAO/tao/PortableServer/ThreadStrategyORBControl.h
@@ -0,0 +1,50 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file ThreadStrategyORBControl.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_THREADSTRATEGYORBCONTROL_H
+#define TAO_THREADSTRATEGYORBCONTROL_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ThreadStrategy.h"
+#include "ace/Service_Config.h"
+#include "tao/orbconf.h"
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export ThreadStrategyORBControl
+       : public virtual ThreadStrategy
+    {
+    public:
+      virtual ~ThreadStrategyORBControl (void);
+
+      virtual int enter ();
+
+      virtual int exit ();
+
+      virtual ::PortableServer::ThreadPolicyValue type() const;
+    };
+
+    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategyORBControl)
+    ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategyORBControl)
+  }
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_THREADSTRATEGYORBCONTROL_H */
diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.cpp b/TAO/tao/PortableServer/ThreadStrategySingle.cpp
new file mode 100644
index 00000000000..6798ef8cf07
--- /dev/null
+++ b/TAO/tao/PortableServer/ThreadStrategySingle.cpp
@@ -0,0 +1,57 @@
+// $Id$
+
+#include "ThreadStrategySingle.h"
+#include "ace/Dynamic_Service.h"
+
+ACE_RCSID (PortableServer,
+           ThreadStrategySingle,
+           "$Id$")
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    ThreadStrategySingle::~ThreadStrategySingle()
+    {
+    }
+
+    int
+    ThreadStrategySingle::enter ()
+    {
+      return lock_.acquire();
+    }
+
+    int
+    ThreadStrategySingle::exit ()
+    {
+      return lock_.release();
+    }
+
+    ::PortableServer::ThreadPolicyValue
+    ThreadStrategySingle::type() const
+    {
+      return ::PortableServer::SINGLE_THREAD_MODEL;
+    }
+
+    ACE_FACTORY_DEFINE (TAO_PortableServer, ThreadStrategySingle)
+
+    ACE_STATIC_SVC_DEFINE (
+        ThreadStrategySingle,
+        ACE_TEXT ("ThreadStrategySingle"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (ThreadStrategySingle),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+
+    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+    template class ACE_Dynamic_Service<ThreadStrategySingle>;
+    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+    #pragma instantiate ACE_Dynamic_Service<ThreadStrategySingle>
+    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ThreadStrategySingle.h b/TAO/tao/PortableServer/ThreadStrategySingle.h
new file mode 100644
index 00000000000..579f09db2be
--- /dev/null
+++ b/TAO/tao/PortableServer/ThreadStrategySingle.h
@@ -0,0 +1,63 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file ThreadStrategySingle.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_THREADSTRATEGYSINGLE_H
+#define TAO_THREADSTRATEGYSINGLE_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ThreadStrategy.h"
+#include "ace/Service_Config.h"
+
+// Locking
+#include "ace/Synch_Traits.h"
+#include "ace/Thread_Mutex.h"
+#include "ace/Recursive_Thread_Mutex.h"
+#include "ace/Null_Mutex.h"
+
+#include "tao/orbconf.h"
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export ThreadStrategySingle :
+       public virtual ThreadStrategy
+    {
+    public:
+      virtual ~ThreadStrategySingle (void);
+
+      virtual int enter ();
+
+      virtual int exit ();
+
+      virtual ::PortableServer::ThreadPolicyValue type() const;
+    private:
+      TAO_SYNCH_RECURSIVE_MUTEX lock_;
+    };
+
+    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategySingle)
+    ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategySingle)
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_THREADSTRATEGYSINGLE_H */
diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
new file mode 100644
index 00000000000..9043697e93f
--- /dev/null
+++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
@@ -0,0 +1,79 @@
+// $Id$
+
+#include "ThreadStrategySingleFactoryImpl.h"
+#include "ThreadStrategy.h"
+#include "ThreadStrategySingle.h"
+#include "ace/Dynamic_Service.h"
+
+ACE_RCSID (PortableServer,
+           ThreadStrategyFactoryImpl,
+           "$Id$")
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    ThreadStrategySingleFactoryImpl::~ThreadStrategySingleFactoryImpl (void)
+    {
+    }
+
+    ThreadStrategy*
+    ThreadStrategySingleFactoryImpl::create (
+      ::PortableServer::ThreadPolicyValue value)
+    {
+      ThreadStrategy* strategy = 0;
+
+      switch (value)
+      {
+        case ::PortableServer::SINGLE_THREAD_MODEL :
+        {
+          ACE_NEW_RETURN (strategy, ThreadStrategySingle, 0);
+          break;
+        }
+        case ::PortableServer::ORB_CTRL_MODEL :
+        {
+          ACE_ERROR ((LM_ERROR, "Incorrect type in ThreadStrategySingleFactoryImpl"));
+          break;
+        }
+      }
+
+      return strategy;
+    }
+
+    void
+    ThreadStrategySingleFactoryImpl::destroy (
+      ThreadStrategy *strategy
+      ACE_ENV_ARG_DECL)
+    {
+      strategy->strategy_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
+
+      delete strategy;
+    }
+
+    ACE_STATIC_SVC_DEFINE (
+        ThreadStrategySingleFactoryImpl,
+        ACE_TEXT ("ThreadStrategySingleFactory"),
+        ACE_SVC_OBJ_T,
+        &ACE_SVC_NAME (ThreadStrategySingleFactoryImpl),
+        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
+        0
+      )
+
+    ACE_FACTORY_DEFINE (TAO_PortableServer, ThreadStrategySingleFactoryImpl)
+
+    #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+    template class ACE_Dynamic_Service<ThreadStrategySingleFactoryImpl>;
+
+    #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+    #pragma instantiate ACE_Dynamic_Service<ThreadStrategySingleFactoryImpl>
+
+    #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h
new file mode 100644
index 00000000000..6cc6642391c
--- /dev/null
+++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h
@@ -0,0 +1,55 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file ThreadStrategySingleFactoryImpl.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_PORTABLESERVER_THREADPOLICYSINGLESTRATEGYFACTORYIMPL_H
+#define TAO_PORTABLESERVER_THREADPOLICYSINGLESTRATEGYFACTORYIMPL_H
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Service_Config.h"
+#include "tao/PortableServer/ThreadStrategyFactory.h"
+
+#if (TAO_HAS_MINIMUM_POA == 0)
+
+namespace TAO
+{
+  namespace Portable_Server
+  {
+    class TAO_PortableServer_Export ThreadStrategySingleFactoryImpl
+       : public virtual ThreadStrategyFactory
+    {
+    public:
+      virtual ~ThreadStrategySingleFactoryImpl (void);
+
+      /// Create a new thread strategy
+      virtual ThreadStrategy* create (
+        ::PortableServer::ThreadPolicyValue value);
+
+      virtual void destroy (
+        ThreadStrategy *strategy
+        ACE_ENV_ARG_DECL);
+    };
+
+    ACE_STATIC_SVC_DECLARE_EXPORT (TAO_PortableServer, ThreadStrategySingleFactoryImpl)
+    ACE_FACTORY_DECLARE (TAO_PortableServer, ThreadStrategySingleFactoryImpl)
+  }
+}
+
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
+#include /**/ "ace/post.h"
+#endif /* TAO_PORTABLESERVER_THREADPOLICYSINGLESTRATEGYFACTORYIMPL_H*/
diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.h b/TAO/tao/PortableServer/Upcall_Wrapper.h
index 23d2deeffc8..1ac32dc06ee 100644
--- a/TAO/tao/PortableServer/Upcall_Wrapper.h
+++ b/TAO/tao/PortableServer/Upcall_Wrapper.h
@@ -6,7 +6,8 @@
  *
  *  $Id$
  *
- *  @author Jeff Parsons and Carlos O'Ryan
+ *  @author Jeff Parsons
+ *  @author Carlos O'Ryan
  */
 //=============================================================================
 
@@ -16,14 +17,14 @@
 #include /**/ "ace/pre.h"
 
 #include "portableserver_export.h"
-#include "tao/PortableServer/ServerRequestInfo.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/ServerInterceptorAdapter.h"
+#include "ServerInterceptorAdapter.h"
 #include "tao/SArgument_T.h"
+#include "tao/TAO_Server_Request.h"
 
 /**
  * @class TAO_Upcall_Wrapper
diff --git a/TAO/tao/PortableServer/diffs/AdapterActivator.diff b/TAO/tao/PortableServer/diffs/AdapterActivator.diff
new file mode 100644
index 00000000000..3c81a5f2fa3
--- /dev/null
+++ b/TAO/tao/PortableServer/diffs/AdapterActivator.diff
@@ -0,0 +1,54 @@
+--- orig/AdapterActivatorC.h	2004-11-17 09:21:58.954374400 +0100
++++ AdapterActivatorC.h	2004-11-17 09:22:10.591107200 +0100
+@@ -73,6 +73,8 @@
+ // TAO_IDL - Generated from 
+ // be\be_visitor_root/root_ch.cpp:63
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ namespace TAO
+ {
+   class Collocation_Proxy_Broker;
+@@ -227,6 +229,8 @@
+ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::AdapterActivator_ptr *); // non-copying
+ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::AdapterActivator_ptr &);
+ 
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
++
+ // TAO_IDL - Generated from
+ // be\be_codegen.cpp:958
+ 
+--- orig/AdapterActivatorC.cpp	2004-11-17 09:21:58.954374400 +0100
++++ AdapterActivatorC.cpp	2004-11-17 09:22:10.731308800 +0100
+@@ -45,6 +45,8 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_arg_traits.cpp:64
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ // Arg traits specializations.
+ namespace TAO
+ {
+@@ -234,3 +236,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+--- orig/AdapterActivatorA.cpp	2004-11-17 09:21:58.974403200 +0100
++++ AdapterActivatorA.cpp	2004-11-17 09:22:10.841467200 +0100
+@@ -32,6 +32,8 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/typecode_defn.cpp:295
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ static const CORBA::Long _oc_PortableServer_AdapterActivator[] =
+ {
+     TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -154,3 +156,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/diffs/ForwardRequest.diff b/TAO/tao/PortableServer/diffs/ForwardRequest.diff
new file mode 100644
index 00000000000..03b758513c6
--- /dev/null
+++ b/TAO/tao/PortableServer/diffs/ForwardRequest.diff
@@ -0,0 +1,54 @@
+--- orig/ForwardRequestC.h	2005-01-27 13:51:06.723408000 +0100
++++ ForwardRequestC.h	2005-01-27 13:53:01.788864000 +0100
+@@ -66,6 +66,8 @@
+ #pragma option push -w-rvl -w-rch -w-ccc -w-inl
+ #endif /* __BORLANDC__ */
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ // TAO_IDL - Generated from
+ // be\be_visitor_module/module_ch.cpp:48
+ 
+@@ -158,6 +160,8 @@
+ // TAO_IDL - Generated from
+ // be\be_codegen.cpp:958
+ 
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
++
+ #if defined (__ACE_INLINE__)
+ #include "ForwardRequestC.inl"
+ #endif /* defined INLINE */
+--- orig/ForwardRequestC.cpp	2005-01-27 13:51:06.723408000 +0100
++++ ForwardRequestC.cpp	2005-01-27 13:52:38.184923200 +0100
+@@ -43,6 +43,8 @@
+ #include "ForwardRequestC.inl"
+ #endif /* !defined INLINE */
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ // TAO_IDL - Generated from
+ // be\be_visitor_arg_traits.cpp:64
+ 
+@@ -294,3 +296,5 @@
+ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+--- orig/ForwardRequestA.cpp	2005-01-27 13:51:06.723408000 +0100
++++ ForwardRequestA.cpp	2005-01-27 13:52:23.373625600 +0100
+@@ -29,6 +29,8 @@
+ #include "tao/Typecode.h"
+ #include "tao/Any_Dual_Impl_T.h"
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ // TAO_IDL - Generated from 
+ // be\be_visitor_exception/any_op_cs.cpp:50
+ 
+@@ -129,3 +131,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/diffs/ImR_Locator.diff b/TAO/tao/PortableServer/diffs/ImR_Locator.diff
deleted file mode 100644
index 72f87b6e23f..00000000000
--- a/TAO/tao/PortableServer/diffs/ImR_Locator.diff
+++ /dev/null
@@ -1,586 +0,0 @@
---- orig/ImR_LocatorC.h	2003-04-25 17:36:28.000000000 -0500
-+++ ./ImR_LocatorC.h	2003-04-25 17:38:32.000000000 -0500
-@@ -30,17 +30,15 @@
- 
- #ifndef _TAO_IDL_ORIG_IMR_LOCATORC_H_
- #define _TAO_IDL_ORIG_IMR_LOCATORC_H_
--
- #include "ace/pre.h"
--
--#include "tao/corba.h"
-+#include "portableserver_export.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
- 
--#include "portableserver_export.h"
-+
- 
- #include "ImplRepoC.h"
- 
-@@ -72,31 +70,31 @@
- 
- TAO_NAMESPACE  ImplementationRepository
- {
--  
-+
-   // TAO_IDL - Generated from
-   // be/be_interface.cpp:570
- 
- #if !defined (_IMPLEMENTATIONREPOSITORY_LOCATOR__ODDS_N_ENDS_CH_)
- #define _IMPLEMENTATIONREPOSITORY_LOCATOR__ODDS_N_ENDS_CH_
--  
-+
-   class Locator;
-   typedef Locator *Locator_ptr;
-   struct tao_Locator_life;
--  
-+
-   typedef
-     TAO_Objref_Var_T<
-         Locator,
-         tao_Locator_life
-       >
-     Locator_var;
--  
-+
-   typedef
-     TAO_Objref_Out_T<
-         Locator,
-         tao_Locator_life
-       >
-     Locator_out;
--  
-+
-   struct TAO_PortableServer_Export tao_Locator_life
-   {
-     static Locator_ptr tao_duplicate (Locator_ptr);
-@@ -107,7 +105,7 @@
-         TAO_OutputCDR &
-       );
-   };
--  
-+
-   struct TAO_PortableServer_Export tao_Locator_cast
-   {
-     static Locator_ptr tao_narrow (
-@@ -118,18 +116,18 @@
-   };
- 
- #endif /* end #if !defined */
--  
-+
-   // TAO_IDL - Generated from
-   // be/be_visitor_interface/interface_ch.cpp:50
- 
- #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
-   {
-@@ -137,30 +135,30 @@
-     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
--    
-+
-     virtual void activate_server_in_location (
-         const char * server,
-         const char * location
-@@ -171,10 +169,10 @@
-         , ImplementationRepository::NotFound
-         , ImplementationRepository::CannotActivate
-       ));
--    
-+
-     // TAO_IDL - Generated from
-     // be/be_visitor_operation/operation_ch.cpp:46
--    
-+
-     virtual void remove_server_in_location (
-         const char * server,
-         const char * location
-@@ -184,10 +182,10 @@
-         CORBA::SystemException
-         , ImplementationRepository::NotFound
-       ));
--    
-+
-     // TAO_IDL - Generated from
-     // be/be_visitor_operation/operation_ch.cpp:46
--    
-+
-     virtual void shutdown_server_in_location (
-         const char * server,
-         const char * location
-@@ -197,10 +195,10 @@
-         CORBA::SystemException
-         , ImplementationRepository::NotFound
-       ));
--    
-+
-     // TAO_IDL - Generated from
-     // be/be_visitor_operation/operation_ch.cpp:46
--    
-+
-     virtual void server_is_shutting_down_in_location (
-         const char * server,
-         const char * location
-@@ -210,10 +208,10 @@
-         CORBA::SystemException
-         , ImplementationRepository::NotFound
-       ));
--    
-+
-     // TAO_IDL - Generated from
-     // be/be_visitor_operation/operation_ch.cpp:46
--    
-+
-     virtual CORBA::ULong register_activator (
-         const char * location,
-         CORBA::Object_ptr object_ref
-@@ -223,10 +221,10 @@
-         CORBA::SystemException
-         , ImplementationRepository::AlreadyRegistered
-       ));
--    
-+
-     // TAO_IDL - Generated from
-     // be/be_visitor_operation/operation_ch.cpp:46
--    
-+
-     virtual CORBA::ULong unregister_activator (
-         const char * location,
-         CORBA::Object_ptr object_ref
-@@ -236,70 +234,70 @@
-         CORBA::SystemException
-         , ImplementationRepository::NotFound
-       ));
--    
-+
-     // TAO_IDL - Generated from
-     // be/be_visitor_interface/interface_ch.cpp:207
--    
-+
-     virtual CORBA::Boolean _is_a (
-         const char *type_id
-         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-       );
--    
-+
-     virtual void *_tao_QueryInterface (ptr_arith_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_;
--  
-+
-   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,
-@@ -311,10 +309,10 @@
-         , 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,
-@@ -325,10 +323,10 @@
-         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,
-@@ -339,10 +337,10 @@
-         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,
-@@ -353,10 +351,10 @@
-         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,
-@@ -367,10 +365,10 @@
-         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,
-@@ -381,23 +379,23 @@
-         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,
-@@ -405,12 +403,12 @@
-   {
-   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,
-@@ -422,10 +420,10 @@
-         , 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,
-@@ -436,10 +434,10 @@
-         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,
-@@ -450,10 +448,10 @@
-         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,
-@@ -464,10 +462,10 @@
-         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,
-@@ -478,10 +476,10 @@
-         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,
-@@ -493,23 +491,23 @@
-         , 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 
-+  // 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 
-+  //                 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:
-@@ -518,56 +516,56 @@
-         Locator *object
-         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-       ) = 0;
--    
-+
-   protected:
-     _TAO_Locator_Proxy_Broker (void);
--    
-+
-   };
--  
-+
-   //
--  //              End Base Proxy Broker Declaration 
-+  //              End Base Proxy Broker Declaration
-   ///////////////////////////////////////////////////////////////////////
--  
--    
-+
-+
-   ///////////////////////////////////////////////////////////////////////
--  //                 Remote 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: 
-+  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 
-+  //              End Remote Proxy Broker Declaration
-   ///////////////////////////////////////////////////////////////////////
- 
- #endif /* end #if !defined */
--  
-+
-   // TAO_IDL - Generated from
-   // be/be_visitor_typecode/typecode_decl.cpp:44
--  
-+
-   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Locator;
- 
- // TAO_IDL - Generated from
-@@ -627,4 +625,3 @@
- 
- #include "ace/post.h"
- #endif /* ifndef */
--
---- orig/ImR_LocatorC.i	2003-04-25 17:36:27.000000000 -0500
-+++ ./ImR_LocatorC.i	2003-04-25 17:30:46.000000000 -0500
-@@ -69,12 +69,12 @@
- // TAO_IDL - Generated from
- // be/be_visitor_interface/cdr_op_ci.cpp:72
- 
--TAO_PortableServer_Export CORBA::Boolean operator<< (
-+TAO_Export CORBA::Boolean operator<< (
-     TAO_OutputCDR &,
-     const ImplementationRepository::Locator_ptr
-   );
- 
--TAO_PortableServer_Export CORBA::Boolean operator>> (
-+TAO_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
-     ImplementationRepository::Locator_ptr &
-   );
diff --git a/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff b/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff
new file mode 100644
index 00000000000..9fb17abb8fd
--- /dev/null
+++ b/TAO/tao/PortableServer/diffs/ImplicitActivationPolicy.diff
@@ -0,0 +1,67 @@
+--- orig/ImplicitActivationPolicyC.h	2004-11-17 09:22:00.456534400 +0100
++++ ImplicitActivationPolicyC.h	2004-11-17 09:22:11.171942400 +0100
+@@ -96,6 +96,7 @@
+     NO_IMPLICIT_ACTIVATION
+   };
+   
++#if (TAO_HAS_MINIMUM_POA == 0)
+   typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out;
+   
+   // TAO_IDL - Generated from
+@@ -223,11 +224,13 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_module/module_ch.cpp:66
+ 
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+ } // module PortableServer
+ 
+ // TAO_IDL - Generated from
+ // be\be_visitor_traits.cpp:59
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
+ // Traits specializations.
+ namespace TAO
+ {
+@@ -273,6 +276,8 @@
+ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &);
+ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicyValue &);
+ 
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
++
+ // TAO_IDL - Generated from
+ // be\be_codegen.cpp:958
+ 
+--- orig/ImplicitActivationPolicyC.cpp	2004-11-17 09:22:00.456534400 +0100
++++ ImplicitActivationPolicyC.cpp	2004-11-17 09:22:11.332172800 +0100
+@@ -45,6 +45,8 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_arg_traits.cpp:64
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ // Arg traits specializations.
+ namespace TAO
+ {
+@@ -260,3 +262,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+--- orig/ImplicitActivationPolicyA.cpp	2004-11-17 09:22:00.476563200 +0100
++++ ImplicitActivationPolicyA.cpp	2004-11-17 09:22:11.392259200 +0100
+@@ -33,6 +33,8 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/typecode_defn.cpp:295
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicyValue[] =
+ {
+   TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -259,3 +261,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/diffs/POAManager.diff b/TAO/tao/PortableServer/diffs/POAManager.diff
new file mode 100644
index 00000000000..2618d3e92a0
--- /dev/null
+++ b/TAO/tao/PortableServer/diffs/POAManager.diff
@@ -0,0 +1,20 @@
+--- orig/POAManagerC.h	2004-11-17 09:22:01.508046400 +0100
++++ POAManagerC.h	2004-11-17 09:22:11.702705600 +0100
+@@ -221,6 +221,8 @@
+     // TAO_IDL - Generated from
+     // be\be_visitor_operation/operation_ch.cpp:46
+     
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+     virtual void hold_requests (
+         ::CORBA::Boolean wait_for_completion
+         ACE_ENV_ARG_DECL_WITH_DEFAULTS
+@@ -255,6 +257,8 @@
+         ::PortableServer::POAManager::AdapterInactive
+       )) = 0;
+     
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
++
+     // TAO_IDL - Generated from
+     // be\be_visitor_operation/operation_ch.cpp:46
+     
diff --git a/TAO/tao/PortableServer/diffs/PS_Forward.diff b/TAO/tao/PortableServer/diffs/PS_Forward.diff
new file mode 100644
index 00000000000..546b8559e00
--- /dev/null
+++ b/TAO/tao/PortableServer/diffs/PS_Forward.diff
@@ -0,0 +1,28 @@
+--- orig/PS_ForwardC.h	2004-11-17 09:22:02.980163200 +0100
++++ PS_ForwardC.h	2004-11-17 09:22:12.273526400 +0100
+@@ -68,11 +68,25 @@
+ #pragma option push -w-rvl -w-rch -w-ccc -w-inl
+ #endif /* __BORLANDC__ */
+
++class TAO_ServantBase;
++class TAO_ServantBase_var;
++class TAO_RefCountServantBase;
++class TAO_Local_ServantBase;
++class TAO_Root_POA;
++class TAO_DynamicImplementation;
++
+ // TAO_IDL - Generated from
+ // be\be_visitor_module/module_ch.cpp:48
+
+ namespace PortableServer
+ {
++   typedef TAO_ServantBase ServantBase;
++   typedef TAO_ServantBase_var ServantBase_var;
++   typedef TAO_RefCountServantBase RefCountServantBase;
++   typedef ServantBase *Servant;
++
++   typedef TAO_Local_ServantBase LocalServantBase;
++   typedef TAO_DynamicImplementation DynamicImplementation;
+
+   // TAO_IDL - Generated from
+   // be\be_visitor_typedef/typedef_ch.cpp:435
diff --git a/TAO/tao/PortableServer/diffs/PortableServer.diff b/TAO/tao/PortableServer/diffs/PortableServer.diff
index 56aea45a11d..153959fae6d 100644
--- a/TAO/tao/PortableServer/diffs/PortableServer.diff
+++ b/TAO/tao/PortableServer/diffs/PortableServer.diff
@@ -1,753 +1,303 @@
---- orig/PortableServerC.h	Tue Feb  5 16:29:50 2002
-+++ PortableServerC.h	Wed Feb  6 19:07:49 2002
-@@ -23,14 +23,17 @@
- #define _TAO_IDL_ORIG_PORTABLESERVERC_H_
+--- orig/PortableServerC.h	2005-02-13 15:33:37.043569600 +0100
++++ PortableServerC.h	2005-02-15 09:40:51.890892800 +0100
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
  
- #include "ace/pre.h"
--#include "tao/corba.h"
-+#include "tao/corbafwd.h"
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -36,6 +36,10 @@
  
+ #include "ace/config-all.h"
+ 
++#ifndef TAO_PORTABLESERVER_SAFE_INCLUDE
++#error "You should not include PortableServerC.h directly, use PortableServer.h"
++#endif /* !TAO_PORTABLESERVER_SAFE_INCLUDE */
++
  #if !defined (ACE_LACKS_PRAGMA_ONCE)
  # pragma once
  #endif /* ACE_LACKS_PRAGMA_ONCE */
+@@ -480,6 +484,8 @@
+     // TAO_IDL - Generated from
+     // be\be_visitor_exception/exception_ch.cpp:51
  
- #include "portableserver_export.h"
--#include "CurrentC.h"
-+#include "tao/CurrentC.h"
-+#include "tao/Sequence.h"
-+#include "tao/Exception.h"
-+#include "tao/PolicyC.h"
- 
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
-@@ -55,8 +58,23 @@
- #pragma option push -w-rvl -w-rch -w-ccc -w-inl
- #endif /* __BORLANDC__ */
- 
-+class TAO_ServantBase;
-+class TAO_ServantBase_var;
-+class TAO_RefCountServantBase;
-+class TAO_Local_ServantBase;
-+class TAO_DynamicImplementation;
-+class TAO_POA;
-+
- TAO_NAMESPACE  PortableServer
- {
-+  typedef TAO_ServantBase ServantBase;
-+  typedef TAO_ServantBase_var ServantBase_var;
-+  typedef TAO_RefCountServantBase RefCountServantBase;
-+  typedef ServantBase *Servant;
-+
-+  typedef TAO_Local_ServantBase LocalServantBase;
-+  typedef TAO_DynamicImplementation DynamicImplementation;
-+
-   class POA;
-   
- #if !defined (_PORTABLESERVER_POA___PTR_CH_)
-@@ -422,6 +440,7 @@
-   
-   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ObjectId;
-   
-+#if (TAO_HAS_MINIMUM_CORBA == 0)
-   
- #if !defined (_PORTABLESERVER_FORWARDREQUEST_CH_)
- #define _PORTABLESERVER_FORWARDREQUEST_CH_
-@@ -468,6 +487,9 @@
-   
- #endif /* end #if !defined */
-   
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
-+#if (TAO_HAS_MINIMUM_POA == 0)
-   
- #if !defined (_PORTABLESERVER_NOTAGROUPOBJECT_CH_)
- #define _PORTABLESERVER_NOTAGROUPOBJECT_CH_
-@@ -673,6 +695,8 @@
-   
-   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IDs;
-   
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
-   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong THREAD_POLICY_ID;
-   
-   TAO_NAMESPACE_STORAGE_CLASS const CORBA::ULong LIFESPAN_POLICY_ID;
-@@ -693,6 +717,8 @@
-     SINGLE_THREAD_MODEL
-   };
-   
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
-   typedef ThreadPolicyValue &ThreadPolicyValue_out;
-   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadPolicyValue;
-   
-@@ -833,6 +859,8 @@
-   
- #endif /* end #if !defined */
-   
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
-   enum LifespanPolicyValue
-   {
-     TRANSIENT,
-@@ -1277,6 +1305,8 @@
-     NO_IMPLICIT_ACTIVATION
-   };
-   
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
-   typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out;
-   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ImplicitActivationPolicyValue;
-   
-@@ -1417,12 +1447,16 @@
-   
- #endif /* end #if !defined */
-   
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
-   enum ServantRetentionPolicyValue
-   {
-     RETAIN,
-     NON_RETAIN
-   };
-   
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
-   typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out;
-   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServantRetentionPolicyValue;
-   
-@@ -1563,6 +1597,8 @@
-   
- #endif /* end #if !defined */
-   
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
-   enum RequestProcessingPolicyValue
-   {
-     USE_ACTIVE_OBJECT_MAP_ONLY,
-@@ -1570,6 +1606,8 @@
-     USE_SERVANT_MANAGER
-   };
-   
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
-   typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_out;
-   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RequestProcessingPolicyValue;
-   
-@@ -1710,6 +1748,7 @@
-   
+ #if !defined (_PORTABLESERVER_POA_NOSERVANT_CH_)
+ #define _PORTABLESERVER_POA_NOSERVANT_CH_
+     
+@@ -527,6 +533,8 @@
+ 
  #endif /* end #if !defined */
-   
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-   
- #if !defined (_PORTABLESERVER_POAMANAGER___PTR_CH_)
- #define _PORTABLESERVER_POAMANAGER___PTR_CH_
-@@ -1877,6 +1916,8 @@
-         , PortableServer::POAManager::AdapterInactive
-       )) = 0;
      
-+#if (TAO_HAS_MINIMUM_POA == 0)
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
-     virtual void hold_requests (
-         CORBA::Boolean wait_for_completion
-         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-@@ -1905,6 +1946,8 @@
-         , PortableServer::POAManager::AdapterInactive
-       )) = 0;
+     // TAO_IDL - Generated from
+     // be\be_visitor_exception/exception_ch.cpp:51
+ 
+@@ -870,6 +878,7 @@
+     // TAO_IDL - Generated from
+     // be\be_visitor_operation/operation_ch.cpp:46
      
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
-     virtual ::PortableServer::POAManager::State get_state (
-         
-         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-@@ -1930,6 +1973,7 @@
-   
- #endif /* end #if !defined */
-   
 +#if (TAO_HAS_MINIMUM_POA == 0)
-   
- #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_)
- #define _PORTABLESERVER_ADAPTERACTIVATOR___PTR_CH_
-@@ -2314,10 +2358,16 @@
-         PortableServer::POA_ptr adapter
+     virtual ::PortableServer::ThreadPolicy_ptr create_thread_policy (
+         ::PortableServer::ThreadPolicyValue value
          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-       )
-+#if (TAO_HAS_MINIMUM_CORBA == 0)
+@@ -877,6 +886,7 @@
        ACE_THROW_SPEC ((
          CORBA::SystemException
-         , PortableServer::ForwardRequest
        )) = 0;
-+#else
-+      ACE_THROW_SPEC ((
-+        CORBA::SystemException
-+      )) = 0;
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
++#endif /* TAO_HAS_MINIMUM_POA == 0 */
      
-     virtual void etherealize (
-         const PortableServer::ObjectId & oid,
-@@ -2435,6 +2485,9 @@
-     : public virtual PortableServer::ServantManager
-   {
-   public:
-+
-+    typedef void *Cookie;
-+
-   #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
-     typedef ServantLocator_ptr _ptr_type;
-     typedef ServantLocator_var _var_type;
-@@ -2467,10 +2520,16 @@
-         PortableServer::ServantLocator::Cookie & the_cookie
+     // TAO_IDL - Generated from
+     // be\be_visitor_operation/operation_ch.cpp:46
+@@ -914,6 +924,7 @@
+     // TAO_IDL - Generated from
+     // be\be_visitor_operation/operation_ch.cpp:46
+     
++#if (TAO_HAS_MINIMUM_POA == 0)
+     virtual ::PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (
+         ::PortableServer::ImplicitActivationPolicyValue value
          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-       )
-+#if (TAO_HAS_MINIMUM_CORBA == 0)
+@@ -921,10 +932,12 @@
        ACE_THROW_SPEC ((
          CORBA::SystemException
-         , PortableServer::ForwardRequest
        )) = 0;
-+#else
-+      ACE_THROW_SPEC ((
-+        CORBA::SystemException
-+      )) = 0;
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-     
-     virtual void postinvoke (
-         const PortableServer::ObjectId & oid,
-@@ -2580,6 +2639,7 @@
-   
- #endif /* end #if !defined */
-   
 +#endif /* TAO_HAS_MINIMUM_POA == 0 */
-   
- #if !defined (_PORTABLESERVER_POA_CH_)
- #define _PORTABLESERVER_POA_CH_
-@@ -2613,6 +2673,10 @@
-         return (POA_ptr)0;
-       }
      
-+    virtual TAO_POA* _tao_poa_downcast(void)
-+      {
-+        return 0;
-+      }
-     
- #if !defined (_PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_)
- #define _PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_
-@@ -2728,6 +2792,7 @@
- 
- #endif /* end #if !defined */
+     // TAO_IDL - Generated from
+     // be\be_visitor_operation/operation_ch.cpp:46
      
 +#if (TAO_HAS_MINIMUM_POA == 0)
-     
- #if !defined (_PORTABLESERVER_POA_NOSERVANT_CH_)
- #define _PORTABLESERVER_POA_NOSERVANT_CH_
-@@ -2765,6 +2830,7 @@
- 
- #endif /* end #if !defined */
-     
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-     
- #if !defined (_PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_)
- #define _PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_
-@@ -2839,7 +2905,6 @@
- 
- #endif /* end #if !defined */
-     
--    
- #if !defined (_PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_)
- #define _PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_
-     
-@@ -3018,6 +3083,8 @@
-         CORBA::SystemException
-       )) = 0;
-     
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
-     virtual ::PortableServer::ThreadPolicy_ptr create_thread_policy (
-         PortableServer::ThreadPolicyValue value
+     virtual ::PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (
+         ::PortableServer::ServantRetentionPolicyValue value
          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-@@ -3026,6 +3093,8 @@
+@@ -932,10 +945,12 @@
+       ACE_THROW_SPEC ((
          CORBA::SystemException
        )) = 0;
-     
 +#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
-     virtual ::PortableServer::LifespanPolicy_ptr create_lifespan_policy (
-         PortableServer::LifespanPolicyValue value
-         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-@@ -3050,6 +3119,8 @@
-         CORBA::SystemException
-       )) = 0;
+     
+     // TAO_IDL - Generated from
+     // be\be_visitor_operation/operation_ch.cpp:46
      
 +#if (TAO_HAS_MINIMUM_POA == 0)
-+
-     virtual ::PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (
-         PortableServer::ImplicitActivationPolicyValue value
+     virtual ::PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (
+         ::PortableServer::RequestProcessingPolicyValue value
          ACE_ENV_ARG_DECL_WITH_DEFAULTS
-@@ -3074,6 +3145,8 @@
+@@ -943,6 +958,7 @@
+       ACE_THROW_SPEC ((
          CORBA::SystemException
        )) = 0;
-     
 +#endif /* TAO_HAS_MINIMUM_POA == 0 */
+     
+     // TAO_IDL - Generated from
+     // be\be_visitor_operation/operation_ch.cpp:46
+@@ -987,6 +1003,8 @@
+     // TAO_IDL - Generated from
+     // be\be_visitor_operation/operation_ch.cpp:46
+     
++#if (TAO_HAS_MINIMUM_POA == 0)
 +
-     virtual char * the_name (
-         
+     virtual ::PortableServer::AdapterActivator_ptr the_activator (
          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-@@ -3106,6 +3179,7 @@
+       )
+@@ -1004,10 +1022,12 @@
+       ACE_THROW_SPEC ((
          CORBA::SystemException
        )) = 0;
++#endif /* TAO_HAS_MINIMUM_POA == 0 */
+     
+     // TAO_IDL - Generated from
+     // be\be_visitor_operation/operation_ch.cpp:46
      
 +#if (TAO_HAS_MINIMUM_POA == 0)
-     virtual ::PortableServer::AdapterActivator_ptr the_activator (
-         
+     virtual ::PortableServer::ServantManager_ptr get_servant_manager (
          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-@@ -3159,6 +3233,8 @@
-         , PortableServer::POA::WrongPolicy
+       )
+@@ -1027,10 +1047,13 @@
+         CORBA::SystemException,
+         ::PortableServer::POA::WrongPolicy
        )) = 0;
-     
 +#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
-     virtual ::PortableServer::ObjectId * activate_object (
-         PortableServer::Servant p_servant
-         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-@@ -3279,6 +3355,8 @@
-         CORBA::SystemException
-       )) = 0;
+     
+     // TAO_IDL - Generated from
+     // be\be_visitor_operation/operation_ch.cpp:46
      
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
-     virtual ::PortableServer::ObjectId * create_id_for_reference (
-         CORBA::Object_ptr the_ref
-         ACE_ENV_ARG_DECL_WITH_DEFAULTS
-@@ -3317,6 +3395,8 @@
-         , PortableServer::NotAGroupObject
+     virtual ::PortableServer::Servant get_servant (
+         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
+       )
+@@ -1052,6 +1075,8 @@
+         ::PortableServer::POA::WrongPolicy
        )) = 0;
      
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
-     virtual void *_tao_QueryInterface (ptr_arith_t type);
-     
-     virtual const char* _interface_repository_id (void) const;
-@@ -3519,6 +3599,10 @@
- #endif /* end #if !defined */
-   
-   
-+  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_NAMESPACE_CLOSE // module PortableServer
- 
-@@ -3526,10 +3610,18 @@
- 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 *&);
-+
-+#if (TAO_HAS_MINIMUM_CORBA == 0)
-+
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::ForwardRequest &); // copying version
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ForwardRequest*); // noncopying version
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ForwardRequest *&); // deprecated
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ForwardRequest *&);
-+
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::NotAGroupObject &); // copying version
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::NotAGroupObject*); // noncopying version
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::NotAGroupObject *&); // deprecated
-@@ -3540,12 +3632,18 @@
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::IDs *&);
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicyValue);
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicyValue &);
-+
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicyValue);
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::LifespanPolicyValue &);
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicyValue);
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdUniquenessPolicyValue &);
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicyValue);
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdAssignmentPolicyValue &);
-+
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicyValue);
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicyValue &);
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicyValue);
-@@ -3553,6 +3651,8 @@
- TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicyValue);
- TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicyValue &);
- 
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
- #ifndef __ACE_INLINE__
- 
- 
-@@ -3570,9 +3670,15 @@
- 
- #endif /* _TAO_CDR_OP_PortableServer_ObjectId_H_ */
- 
-+#if (TAO_HAS_MINIMUM_CORBA == 0)
-+
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ForwardRequest &);
- TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ForwardRequest &);
- 
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::NotAGroupObject &);
- TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::NotAGroupObject &);
- 
-@@ -3593,18 +3699,26 @@
- 
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &); // 
- TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &);
-+
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::LifespanPolicyValue &); // 
- TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::LifespanPolicyValue &);
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdUniquenessPolicyValue &); // 
- TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdUniquenessPolicyValue &);
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::IdAssignmentPolicyValue &); // 
- TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdAssignmentPolicyValue &);
-+
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ImplicitActivationPolicyValue &); // 
- TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ImplicitActivationPolicyValue &);
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicyValue &); // 
- TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &);
- TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicyValue &); // 
- TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicyValue &);
-+
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
- 
- #endif /* __ACE_INLINE__ */
- 
---- orig/PortableServerC.i	Tue Feb  5 16:29:50 2002
-+++ PortableServerC.i	Tue Feb  5 17:04:22 2002
-@@ -627,6 +627,8 @@
- // Inline operations for exception PortableServer::ForwardRequest
- // *************************************************************
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // *************************************************************
- // Inline operations for exception PortableServer::NotAGroupObject
- // *************************************************************
-@@ -1025,6 +1027,10 @@
- 
- #endif /* end #if !defined */
- 
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
-+
-+#if (TAO_HAS_MINIMUM_POA == 0)
- 
- #if !defined (_PORTABLESERVER_THREADPOLICY___CI_)
- #define _PORTABLESERVER_THREADPOLICY___CI_
-@@ -1054,6 +1060,8 @@
- #endif /* end #if !defined */
- 
+     // TAO_IDL - Generated from
+     // be\be_visitor_operation/operation_ch.cpp:46
+     
+@@ -1313,11 +1338,15 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_exception/any_op_ch.cpp:52
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY___CI_)
- #define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY___CI_
- 
-@@ -1074,6 +1082,8 @@
- 
- #endif /* end #if !defined */
- 
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
- // *************************************************************
- // Inline operations for exception PortableServer::POAManager::AdapterInactive
- // *************************************************************
-@@ -1113,6 +1123,8 @@
- 
- #endif /* end #if !defined */
- 
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
- // *************************************************************
- // Inline operations for exception PortableServer::POA::AdapterAlreadyExists
- // *************************************************************
-@@ -1186,6 +1198,8 @@
- 
- #endif /* _TAO_CDR_OP_PortableServer_ObjectId_I_ */
- 
-+#if (TAO_HAS_MINIMUM_CORBA == 0)
-+
- ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ForwardRequest &_tao_aggregate)
- {
-   // first marshal the repository ID
-@@ -1214,6 +1228,10 @@
-     return 0;
- }
+ TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POA::NoServant &); // copying version
+ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POA::NoServant*); // noncopying version
+ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POA::NoServant *&); // deprecated
+ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POA::NoServant *&);
  
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::NotAGroupObject &_tao_aggregate)
- {
-   // first marshal the repository ID
-@@ -1243,6 +1261,10 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_exception/any_op_ch.cpp:52
  
- #endif /* _TAO_CDR_OP_PortableServer_IDs_I_ */
- 
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ThreadPolicyValue &_tao_enumval)
- {
-   CORBA::ULong _tao_temp = _tao_enumval;
-@@ -1262,6 +1284,8 @@
-   return _tao_result;
- }
+@@ -1385,4 +1414,3 @@
  
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
- ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::LifespanPolicyValue &_tao_enumval)
- {
-   CORBA::ULong _tao_temp = _tao_enumval;
-@@ -1319,6 +1343,8 @@
-   return _tao_result;
- }
+ #endif /* ifndef */
  
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ImplicitActivationPolicyValue &_tao_enumval)
+-
+--- orig/PortableServerC.cpp	2005-02-13 15:33:37.043569600 +0100
++++ PortableServerC.cpp	2005-02-15 09:48:26.875128000 +0100
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -29,7 +29,7 @@
+ // be\be_codegen.cpp:302
+ 
+ 
+-#include "PortableServerC.h"
++#include "PortableServer.h"
+ #include "tao/CDR.h"
+ #include "tao/ORB_Core.h"
+ #include "tao/Typecode.h"
+@@ -50,7 +50,6 @@
+ // Arg traits specializations.
+ namespace TAO
  {
-   CORBA::ULong _tao_temp = _tao_enumval;
-@@ -1375,4 +1401,4 @@
+-
+ #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_)
+ #define _PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_
    
-   return _tao_result;
+@@ -69,7 +68,6 @@
+ #endif /* end #if !defined */
  }
--
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
---- orig/PortableServerC.cpp	Tue Feb  5 16:29:50 2002
-+++ PortableServerC.cpp	Tue Feb  5 17:15:19 2002
-@@ -31,6 +31,8 @@
- #include "tao/ClientInterceptorAdapter.h"
- #endif  /* TAO_HAS_INTERCEPTORS == 1 */
- 
-+#include "POA.h"
-+
- #if defined (__BORLANDC__)
- #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
- #endif /* __BORLANDC__ */
-@@ -39,6 +41,29 @@
- #include "PortableServerC.i"
- #endif /* !defined INLINE */
- 
-+char *
-+PortableServer::ObjectId_to_string (const PortableServer::ObjectId &id)
-+{
-+  return TAO_POA::ObjectId_to_string (id);
-+}
-+
-+CORBA::WChar *
-+PortableServer::ObjectId_to_wstring (const PortableServer::ObjectId &id)
-+{
-+  return TAO_POA::ObjectId_to_wstring (id);
-+}
-+
-+PortableServer::ObjectId *
-+PortableServer::string_to_ObjectId (const char *id)
-+{
-+  return TAO_POA::string_to_ObjectId (id);
-+}
-+
-+PortableServer::ObjectId *
-+PortableServer::wstring_to_ObjectId (const CORBA::WChar *id)
-+{
-+  return TAO_POA::wstring_to_ObjectId (id);
-+}
- 
- #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
- 
-@@ -268,6 +293,8 @@
- TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_ObjectId, &_tc_TAO_tc_PortableServer_ObjectId)
- TAO_NAMESPACE_END
  
-+#if (TAO_HAS_MINIMUM_CORBA == 0)
-+
- // Default constructor.
- PortableServer::ForwardRequest::ForwardRequest (void)
-   : CORBA_UserException ("IDL:omg.org/PortableServer/ForwardRequest:1.0")
-@@ -438,6 +465,10 @@
-   return ::PortableServer::_tc_ForwardRequest;
- }
+-
+ // TAO_IDL - Generated from 
+ // be\be_visitor_sequence/sequence_cs.cpp:65
  
-+#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-+
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- // Default constructor.
- PortableServer::NotAGroupObject::NotAGroupObject (void)
-   : CORBA_UserException ("IDL:omg.org/PortableServer/NotAGroupObject:1.0")
-@@ -733,6 +764,8 @@
- TAO_NAMESPACE_DEFINE (::CORBA::TypeCode_ptr, _tc_IDs, &_tc_TAO_tc_PortableServer_IDs)
- TAO_NAMESPACE_END
+@@ -599,6 +597,8 @@
+ // TAO_IDL - Generated from 
+ // be\be_visitor_exception/exception_cs.cpp:63
  
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
- TAO_NAMESPACE_TYPE (const CORBA::ULong)
- TAO_NAMESPACE_BEGIN (PortableServer)
- TAO_NAMESPACE_DEFINE (const CORBA::ULong, THREAD_POLICY_ID, 16U)
-@@ -761,6 +794,9 @@
- TAO_NAMESPACE_BEGIN (PortableServer)
- TAO_NAMESPACE_DEFINE (const CORBA::ULong, REQUEST_PROCESSING_POLICY_ID, 22U)
- TAO_NAMESPACE_END
-+
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- static const CORBA::Long _oc_PortableServer_ThreadPolicyValue[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -1124,6 +1160,8 @@
-   return "IDL:omg.org/PortableServer/ThreadPolicy:1.0";
- }
+ PortableServer::POA::NoServant::NoServant (void)
+   : CORBA::UserException (
+         "IDL:omg.org/PortableServer/POA/NoServant:2.3",
+@@ -728,6 +728,8 @@
+ ::CORBA::TypeCode_ptr PortableServer::POA::_tc_NoServant =
+   &_tc_TAO_tc_PortableServer_POA_NoServant;
  
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
- static const CORBA::Long _oc_PortableServer_LifespanPolicyValue[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -2207,6 +2245,8 @@
-   return "IDL:omg.org/PortableServer/IdAssignmentPolicy:1.0";
+ // TAO_IDL - Generated from 
+ // be\be_visitor_exception/exception_cs.cpp:63
+ 
+--- orig/PortableServerA.cpp	2005-02-13 15:33:37.063598400 +0100
++++ PortableServerA.cpp	2005-02-13 19:56:05.000000000 +0100
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -25,7 +25,7 @@
+ // Information about TAO is available at:
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+ 
+-#include "PortableServerC.h"
++#include "PortableServer.h"
+ #include "tao/Typecode.h"
+ #include "tao/CDR.h"
+ #include "tao/Any.h"
+@@ -73,6 +73,8 @@
+     &_tc_TAO_tc_PortableServer_POAList;
  }
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- static const CORBA::Long _oc_PortableServer_ImplicitActivationPolicyValue[] =
- {
-   TAO_ENCAP_BYTE_ORDER, // byte order
-@@ -3318,6 +3358,8 @@
-   return "IDL:omg.org/PortableServer/RequestProcessingPolicy:1.0";
- }
- 
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
- int PortableServer::POAManager::_tao_class_id = 0;
- 
- PortableServer::POAManager_ptr
-@@ -3697,6 +3739,7 @@
-   ACE_THROW (CORBA::MARSHAL ());
- }
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/typecode_defn.cpp:295
  
-+#if (TAO_HAS_MINIMUM_POA == 0)
- int PortableServer::AdapterActivator::_tao_class_id = 0;
- 
- PortableServer::AdapterActivator_ptr
-@@ -4925,6 +4968,8 @@
-   return "IDL:omg.org/PortableServer/ServantLocator:2.3";
+@@ -179,6 +181,8 @@
+       );
  }
  
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
- int PortableServer::POA::_tao_class_id = 0;
+ // TAO_IDL - Generated from
+ // be\be_visitor_interface/any_op_cs.cpp:50
  
- PortableServer::POA_ptr
-@@ -5470,6 +5515,8 @@
-   this->index = _tao_index;
- }
+@@ -467,6 +471,8 @@
+ // TAO_IDL - Generated from 
+ // be\be_visitor_exception/any_op_cs.cpp:50
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- // Default constructor.
- PortableServer::POA::NoServant::NoServant (void)
-   : CORBA_UserException ("IDL:omg.org/PortableServer/POA/NoServant:1.0")
-@@ -5548,6 +5595,8 @@
-   ACE_THROW (CORBA::MARSHAL ());
- }
- 
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
- // Default constructor.
- PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (void)
-   : CORBA_UserException ("IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:1.0")
-@@ -6498,6 +6547,8 @@
-   return 0;
- }
- 
-+#if (TAO_HAS_MINIMUM_CORBA == 0)
-+
- void operator<<= (CORBA::Any &_tao_any, const PortableServer::ForwardRequest &_tao_elem) // copying
- {
-   TAO_OutputCDR stream;
-@@ -6588,6 +6639,10 @@
-   return 0;
+ ACE_TEMPLATE_SPECIALIZATION
+ CORBA::Boolean
+ TAO::Any_Dual_Impl_T<PortableServer::POA::NoServant>::marshal_value (TAO_OutputCDR &)
+@@ -536,6 +542,8 @@
+       );
  }
  
 +#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
-+#if (TAO_HAS_MINIMUM_POA == 0)
-+
- void operator<<= (CORBA::Any &_tao_any, const PortableServer::NotAGroupObject &_tao_elem) // copying
- {
-   TAO_OutputCDR stream;
-@@ -6816,6 +6871,8 @@
-   #  pragma instantiate TAO_Object_Manager<PortableServer::ThreadPolicy,PortableServer::ThreadPolicy_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ // TAO_IDL - Generated from 
+ // be\be_visitor_exception/any_op_cs.cpp:50
  
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
- void operator<<= (CORBA::Any &_tao_any, PortableServer::LifespanPolicyValue _tao_elem)
- {
-   TAO_OutputCDR stream;
-@@ -6957,6 +7014,8 @@
-   #  pragma instantiate TAO_Object_Manager<PortableServer::IdAssignmentPolicy,PortableServer::IdAssignmentPolicy_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+@@ -985,11 +993,15 @@
+         PortableServer::POA::InvalidPolicy
+       >;
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- void operator<<= (CORBA::Any &_tao_any, PortableServer::ImplicitActivationPolicyValue _tao_elem)
- {
-   TAO_OutputCDR stream;
-@@ -7098,6 +7157,8 @@
-   #  pragma instantiate TAO_Object_Manager<PortableServer::RequestProcessingPolicy,PortableServer::RequestProcessingPolicy_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+   template class
+     TAO::Any_Dual_Impl_T<
+         PortableServer::POA::NoServant
+       >;
  
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
-     template class TAO_Object_Manager<PortableServer::POAManager,PortableServer::POAManager_var>;
-@@ -7105,6 +7166,8 @@
-   #  pragma instantiate TAO_Object_Manager<PortableServer::POAManager,PortableServer::POAManager_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+   template class
+     TAO::Any_Dual_Impl_T<
+         PortableServer::POA::ObjectAlreadyActive
+@@ -1047,11 +1059,15 @@
+         PortableServer::POA::InvalidPolicy \
+       >
  
 +#if (TAO_HAS_MINIMUM_POA == 0)
 +
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
-     template class TAO_Object_Manager<PortableServer::AdapterActivator,PortableServer::AdapterActivator_var>;
-@@ -7133,6 +7196,8 @@
-   #  pragma instantiate TAO_Object_Manager<PortableServer::ServantLocator,PortableServer::ServantLocator_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+ # pragma instantiate \
+     TAO::Any_Dual_Impl_T< \
+         PortableServer::POA::NoServant \
+       >
  
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
-+
- #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)  || \
-     defined (ACE_HAS_GNU_REPO)
-     template class TAO_Object_Manager<PortableServer::POA,PortableServer::POA_var>;
-@@ -7220,6 +7285,8 @@
-   return 0; // error
- }
- 
-+#if (TAO_HAS_MINIMUM_POA == 0)
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 +
- CORBA::Boolean operator<< (
-     TAO_OutputCDR &strm,
-     const PortableServer::IDs &_tao_sequence
-@@ -7267,3 +7334,4 @@
-   return 0; // error
- }
- 
-+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+ # pragma instantiate \
+     TAO::Any_Dual_Impl_T< \
+         PortableServer::POA::ObjectAlreadyActive \
diff --git a/TAO/tao/PortableServer/diffs/PortableServer_include.diff b/TAO/tao/PortableServer/diffs/PortableServer_include.diff
new file mode 100644
index 00000000000..a237f1baabf
--- /dev/null
+++ b/TAO/tao/PortableServer/diffs/PortableServer_include.diff
@@ -0,0 +1,11 @@
+--- orig/PortableServer_includeC.h	2004-12-02 09:59:06.116356400 +0100
++++ PortableServer_includeC.h	2004-12-02 09:59:42.268340400 +0100
+@@ -45,7 +45,7 @@
+ #include "tao/SystemException.h"
+ #include "tao/Environment.h"
+ 
+-#include "tao/PortableServer/PortableServerC.h"
++#include "tao/PortableServer/PortableServer.h"
+ 
+ #if defined (TAO_EXPORT_MACRO)
+ #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff b/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff
new file mode 100644
index 00000000000..421ec97a17d
--- /dev/null
+++ b/TAO/tao/PortableServer/diffs/RequestProcessingPolicy.diff
@@ -0,0 +1,67 @@
+--- orig/RequestProcessingPolicyC.h	2004-11-17 09:22:03.380739200 +0100
++++ RequestProcessingPolicyC.h	2004-11-17 09:22:12.363656000 +0100
+@@ -97,6 +97,7 @@
+     USE_SERVANT_MANAGER
+   };
+   
++#if (TAO_HAS_MINIMUM_POA == 0)
+   typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_out;
+   
+   // TAO_IDL - Generated from
+@@ -224,11 +225,13 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_module/module_ch.cpp:66
+ 
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+ } // module PortableServer
+ 
+ // TAO_IDL - Generated from
+ // be\be_visitor_traits.cpp:59
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
+ // Traits specializations.
+ namespace TAO
+ {
+@@ -274,6 +277,8 @@
+ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::RequestProcessingPolicyValue &);
+ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::RequestProcessingPolicyValue &);
+ 
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
++
+ // TAO_IDL - Generated from
+ // be\be_codegen.cpp:958
+ 
+--- orig/RequestProcessingPolicyC.cpp	2004-11-17 09:22:03.380739200 +0100
++++ RequestProcessingPolicyC.cpp	2004-11-17 09:22:12.433756800 +0100
+@@ -45,6 +45,8 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_arg_traits.cpp:64
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ // Arg traits specializations.
+ namespace TAO
+ {
+@@ -260,3 +262,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+--- orig/RequestProcessingPolicyA.cpp	2004-11-17 09:22:03.400768000 +0100
++++ RequestProcessingPolicyA.cpp	2004-11-17 09:22:12.483828800 +0100
+@@ -101,6 +101,8 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/typecode_defn.cpp:295
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ static const CORBA::Long _oc_PortableServer_RequestProcessingPolicy[] =
+ {
+     TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -264,3 +266,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/diffs/ServantActivator.diff b/TAO/tao/PortableServer/diffs/ServantActivator.diff
new file mode 100644
index 00000000000..91ff7b102cc
--- /dev/null
+++ b/TAO/tao/PortableServer/diffs/ServantActivator.diff
@@ -0,0 +1,54 @@
+--- orig/ServantActivatorC.h	2004-11-17 09:22:03.941545600 +0100
++++ ServantActivatorC.h	2004-11-17 09:22:12.654073600 +0100
+@@ -74,6 +74,8 @@
+ // TAO_IDL - Generated from 
+ // be\be_visitor_root/root_ch.cpp:63
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ namespace TAO
+ {
+   class Collocation_Proxy_Broker;
+@@ -244,6 +246,8 @@
+ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantActivator_ptr *); // non-copying
+ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantActivator_ptr &);
+ 
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
++
+ // TAO_IDL - Generated from
+ // be\be_codegen.cpp:958
+ 
+--- orig/ServantActivatorC.cpp	2004-11-17 09:22:03.941545600 +0100
++++ ServantActivatorC.cpp	2004-11-17 09:22:12.724174400 +0100
+@@ -46,6 +46,8 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_arg_traits.cpp:64
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ // Arg traits specializations.
+ namespace TAO
+ {
+@@ -239,3 +241,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+--- orig/ServantActivatorA.cpp	2004-11-17 09:22:03.961574400 +0100
++++ ServantActivatorA.cpp	2004-11-17 09:22:12.764232000 +0100
+@@ -32,6 +32,8 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/typecode_defn.cpp:295
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ static const CORBA::Long _oc_PortableServer_ServantActivator[] =
+ {
+     TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -154,3 +156,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/diffs/ServantLocator.diff b/TAO/tao/PortableServer/diffs/ServantLocator.diff
new file mode 100644
index 00000000000..3e8e6299418
--- /dev/null
+++ b/TAO/tao/PortableServer/diffs/ServantLocator.diff
@@ -0,0 +1,63 @@
+--- orig/ServantLocatorC.h	2004-11-17 09:22:04.502352000 +0100
++++ ServantLocatorC.h	2004-11-17 09:22:12.914448000 +0100
+@@ -74,6 +74,8 @@
+ // TAO_IDL - Generated from 
+ // be\be_visitor_root/root_ch.cpp:63
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ namespace TAO
+ {
+   class Collocation_Proxy_Broker;
+@@ -121,6 +123,8 @@
+     : public virtual ::PortableServer::ServantManager
+   {
+   public:
++    typedef void *Cookie;
++
+     typedef ServantLocator_ptr _ptr_type;
+     typedef ServantLocator_var _var_type;
+     
+@@ -246,6 +250,8 @@
+ TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantLocator_ptr *); // non-copying
+ TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantLocator_ptr &);
+ 
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
++
+ // TAO_IDL - Generated from
+ // be\be_codegen.cpp:958
+ 
+--- orig/ServantLocatorC.cpp	2004-11-17 09:22:04.502352000 +0100
++++ ServantLocatorC.cpp	2004-11-17 09:22:12.984548800 +0100
+@@ -46,6 +46,8 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_arg_traits.cpp:64
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ // Arg traits specializations.
+ namespace TAO
+ {
+@@ -239,3 +241,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+--- orig/ServantLocatorA.cpp	2004-11-17 09:22:04.522380800 +0100
++++ ServantLocatorA.cpp	2004-11-17 09:22:13.034620800 +0100
+@@ -32,6 +32,8 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/typecode_defn.cpp:295
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ static const CORBA::Long _oc_PortableServer_ServantLocator[] =
+ {
+     TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -153,3 +155,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/diffs/ServantManager.diff b/TAO/tao/PortableServer/diffs/ServantManager.diff
new file mode 100644
index 00000000000..499ee690c1b
--- /dev/null
+++ b/TAO/tao/PortableServer/diffs/ServantManager.diff
@@ -0,0 +1,53 @@
+--- orig/ServantManagerC.h	2004-11-17 09:22:04.832827200 +0100
++++ ServantManagerC.h	2004-11-17 09:22:13.154793600 +0100
+@@ -70,6 +70,8 @@
+ // TAO_IDL - Generated from 
+ // be\be_visitor_root/root_ch.cpp:63
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ namespace TAO
+ {
+   class Collocation_Proxy_Broker;
+@@ -282,6 +284,8 @@
+ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ForwardRequest &);
+ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ForwardRequest &);
+ 
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
++
+ // TAO_IDL - Generated from
+ // be\be_codegen.cpp:958
+ 
+--- orig/ServantManagerC.cpp	2004-11-17 09:22:04.832827200 +0100
++++ ServantManagerC.cpp	2004-11-17 09:22:13.224894400 +0100
+@@ -51,6 +51,7 @@
+ {
+ }
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
+ 
+ // TAO_IDL - Generated from
+ // be\be_visitor_interface/interface_cs.cpp:60
+@@ -469,3 +470,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+--- orig/ServantManagerA.cpp	2004-11-17 09:22:04.852856000 +0100
++++ ServantManagerA.cpp	2004-11-17 09:22:13.284980800 +0100
+@@ -30,6 +30,8 @@
+ #include "tao/Any_Impl_T.h"
+ #include "tao/Any_Dual_Impl_T.h"
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/typecode_defn.cpp:295
+ 
+@@ -249,3 +251,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff b/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff
new file mode 100644
index 00000000000..356091795a3
--- /dev/null
+++ b/TAO/tao/PortableServer/diffs/ServantRetentionPolicy.diff
@@ -0,0 +1,67 @@
+--- orig/ServantRetentionPolicyC.h	2004-11-17 09:22:05.163302400 +0100
++++ ServantRetentionPolicyC.h	2004-11-17 09:22:13.415168000 +0100
+@@ -96,6 +96,7 @@
+     NON_RETAIN
+   };
+   
++#if (TAO_HAS_MINIMUM_POA == 0)
+   typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out;
+   
+   // TAO_IDL - Generated from
+@@ -223,11 +224,13 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_module/module_ch.cpp:66
+ 
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+ } // module PortableServer
+ 
+ // TAO_IDL - Generated from
+ // be\be_visitor_traits.cpp:59
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
+ // Traits specializations.
+ namespace TAO
+ {
+@@ -273,6 +276,8 @@
+ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ServantRetentionPolicyValue &);
+ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ServantRetentionPolicyValue &);
+ 
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
++
+ // TAO_IDL - Generated from
+ // be\be_codegen.cpp:958
+ 
+--- orig/ServantRetentionPolicyC.cpp	2004-11-17 09:22:05.163302400 +0100
++++ ServantRetentionPolicyC.cpp	2004-11-17 09:22:13.485268800 +0100
+@@ -45,6 +45,8 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_arg_traits.cpp:64
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ // Arg traits specializations.
+ namespace TAO
+ {
+@@ -260,3 +262,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+--- orig/ServantRetentionPolicyA.cpp	2004-11-17 09:22:05.173316800 +0100
++++ ServantRetentionPolicyA.cpp	2004-11-17 09:22:13.545355200 +0100
+@@ -33,6 +33,8 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/typecode_defn.cpp:295
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ static const CORBA::Long _oc_PortableServer_ServantRetentionPolicyValue[] =
+ {
+   TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -250,3 +252,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/diffs/ThreadPolicy.diff b/TAO/tao/PortableServer/diffs/ThreadPolicy.diff
new file mode 100644
index 00000000000..045b03391b3
--- /dev/null
+++ b/TAO/tao/PortableServer/diffs/ThreadPolicy.diff
@@ -0,0 +1,68 @@
+--- orig/ThreadPolicyC.h	2004-11-17 09:22:05.523820800 +0100
++++ ThreadPolicyC.h	2004-11-17 09:22:13.705585600 +0100
+@@ -96,6 +96,7 @@
+     SINGLE_THREAD_MODEL
+   };
+   
++#if (TAO_HAS_MINIMUM_POA == 0)
+   typedef ThreadPolicyValue &ThreadPolicyValue_out;
+   
+   // TAO_IDL - Generated from
+@@ -223,12 +224,14 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_module/module_ch.cpp:66
+ 
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+ } // module PortableServer
+ 
+ // TAO_IDL - Generated from
+ // be\be_visitor_traits.cpp:59
+ 
+ // Traits specializations.
++#if (TAO_HAS_MINIMUM_POA == 0)
+ namespace TAO
+ {
+ 
+@@ -273,6 +276,8 @@
+ TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ThreadPolicyValue &);
+ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ThreadPolicyValue &);
+ 
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
++
+ // TAO_IDL - Generated from
+ // be\be_codegen.cpp:958
+ 
+--- orig/ThreadPolicyC.cpp	2004-11-17 09:22:05.523820800 +0100
++++ ThreadPolicyC.cpp	2004-11-17 09:22:13.795715200 +0100
+@@ -45,6 +45,8 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_arg_traits.cpp:64
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ // Arg traits specializations.
+ namespace TAO
+ {
+@@ -260,3 +262,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
+--- orig/ThreadPolicyA.cpp	2004-11-17 09:22:05.543849600 +0100
++++ ThreadPolicyA.cpp	2004-11-17 09:22:13.845787200 +0100
+@@ -33,6 +33,8 @@
+ // TAO_IDL - Generated from
+ // be\be_visitor_typecode/typecode_defn.cpp:295
+ 
++#if (TAO_HAS_MINIMUM_POA == 0)
++
+ static const CORBA::Long _oc_PortableServer_ThreadPolicyValue[] =
+ {
+   TAO_ENCAP_BYTE_ORDER, // byte order
+@@ -245,3 +247,5 @@
+       >
+ 
+ #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
++
++#endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/poa_macros.h b/TAO/tao/PortableServer/poa_macros.h
index e0716ad8dcc..ca9e01b11d8 100644
--- a/TAO/tao/PortableServer/poa_macros.h
+++ b/TAO/tao/PortableServer/poa_macros.h
@@ -25,12 +25,12 @@
   ACE_CHECK_RETURN (RETURN)
 
 #define TAO_POA_GUARD \
-  TAO_POA_Guard poa_guard (*this ACE_ENV_ARG_PARAMETER); \
+  TAO::Portable_Server::POA_Guard poa_guard (*this ACE_ENV_ARG_PARAMETER); \
   ACE_UNUSED_ARG (poa_guard); \
   ACE_CHECK
 
 #define TAO_POA_GUARD_RETURN(RETURN) \
-  TAO_POA_Guard poa_guard (*this ACE_ENV_ARG_PARAMETER); \
+  TAO::Portable_Server::POA_Guard poa_guard (*this ACE_ENV_ARG_PARAMETER); \
   ACE_UNUSED_ARG (poa_guard); \
   ACE_CHECK_RETURN (RETURN)
 
diff --git a/TAO/tao/PortableServer/portableserver_export.h b/TAO/tao/PortableServer/portableserver_export.h
index a65040567fe..81c9200c157 100644
--- a/TAO/tao/PortableServer/portableserver_export.h
+++ b/TAO/tao/PortableServer/portableserver_export.h
@@ -9,8 +9,6 @@
 
 #include "ace/config-all.h"
 
-#include "tao/Objref_VarOut_T.h"
-
 #if defined (TAO_AS_STATIC_LIBS)
 #  if !defined (TAO_PORTABLESERVER_HAS_DLL)
 #    define TAO_PORTABLESERVER_HAS_DLL 0
diff --git a/TAO/tao/RTCORBA/RTCORBA.pidl b/TAO/tao/RTCORBA/RTCORBA.pidl
index 1f2f0e3ce93..39d85285939 100644
--- a/TAO/tao/RTCORBA/RTCORBA.pidl
+++ b/TAO/tao/RTCORBA/RTCORBA.pidl
@@ -54,6 +54,7 @@
 
 #include <IOP.pidl>
 #include <TimeBase.pidl>
+#include <Policy.pidl>
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/RTCORBA/RTCORBAA.cpp b/TAO/tao/RTCORBA/RTCORBAA.cpp
new file mode 100644
index 00000000000..01b3d748208
--- /dev/null
+++ b/TAO/tao/RTCORBA/RTCORBAA.cpp
@@ -0,0 +1,3453 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+
+#include "RTCORBA.h"
+#include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
+#include "tao/Any_Impl_T.h"
+#include "tao/Any_Dual_Impl_T.h"
+#include "tao/Any_Basic_Impl_T.h"
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTCORBA_NativePriority[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  39,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x4e617469),
+  ACE_NTOHL (0x76655072),
+  ACE_NTOHL (0x696f7269),
+  ACE_NTOHL (0x74793a31),
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/NativePriority:1.0
+    15,
+  ACE_NTOHL (0x4e617469),
+  ACE_NTOHL (0x76655072),
+  ACE_NTOHL (0x696f7269),
+  ACE_NTOHL (0x74790000),  // name = NativePriority
+    CORBA::tk_short,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_NativePriority (
+    CORBA::tk_alias,
+    sizeof (_oc_RTCORBA_NativePriority),
+    (char *) &_oc_RTCORBA_NativePriority,
+    0,
+    0
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_NativePriority =
+    &_tc_TAO_tc_RTCORBA_NativePriority;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTCORBA_Priority[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  33,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
+    9,
+  ACE_NTOHL (0x5072696f),
+  ACE_NTOHL (0x72697479),
+  ACE_NTOHL (0x0),  // name = Priority
+    CORBA::tk_short,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Priority (
+    CORBA::tk_alias,
+    sizeof (_oc_RTCORBA_Priority),
+    (char *) &_oc_RTCORBA_Priority,
+    0,
+    0
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_Priority =
+    &_tc_TAO_tc_RTCORBA_Priority;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTCORBA_NetworkPriority[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  40,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x4e657477),
+  ACE_NTOHL (0x6f726b50),
+  ACE_NTOHL (0x72696f72),
+  ACE_NTOHL (0x6974793a),
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/NetworkPriority:1.0
+    16,
+  ACE_NTOHL (0x4e657477),
+  ACE_NTOHL (0x6f726b50),
+  ACE_NTOHL (0x72696f72),
+  ACE_NTOHL (0x69747900),  // name = NetworkPriority
+    CORBA::tk_long,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_NetworkPriority (
+    CORBA::tk_alias,
+    sizeof (_oc_RTCORBA_NetworkPriority),
+    (char *) &_oc_RTCORBA_NetworkPriority,
+    0,
+    0
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_NetworkPriority =
+    &_tc_TAO_tc_RTCORBA_NetworkPriority;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTCORBA_ThreadpoolId[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  37,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x6f6d672e),
+  ACE_NTOHL (0x6f72672f),
+  ACE_NTOHL (0x5254434f),
+  ACE_NTOHL (0x5242412f),
+  ACE_NTOHL (0x54687265),
+  ACE_NTOHL (0x6164706f),
+  ACE_NTOHL (0x6f6c4964),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolId:1.0
+    13,
+  ACE_NTOHL (0x54687265),
+  ACE_NTOHL (0x6164706f),
+  ACE_NTOHL (0x6f6c4964),
+  ACE_NTOHL (0x0),  // name = ThreadpoolId
+    CORBA::tk_ulong,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ThreadpoolId (
+    CORBA::tk_alias,
+    sizeof (_oc_RTCORBA_ThreadpoolId),
+    (char *) &_oc_RTCORBA_ThreadpoolId,
+    0,
+    0
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_ThreadpoolId =
+    &_tc_TAO_tc_RTCORBA_ThreadpoolId;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTCORBA_ThreadpoolLane[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  39,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164706f), 
+  ACE_NTOHL (0x6f6c4c61), 
+  ACE_NTOHL (0x6e653a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolLane:1.0
+    15,
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164706f), 
+  ACE_NTOHL (0x6f6c4c61), 
+  ACE_NTOHL (0x6e650000),  // name = ThreadpoolLane
+  3, // member count
+    14,
+  ACE_NTOHL (0x6c616e65), 
+  ACE_NTOHL (0x5f707269), 
+  ACE_NTOHL (0x6f726974), 
+  ACE_NTOHL (0x79000000),  // name = lane_priority
+    CORBA::tk_alias, // typecode kind for typedefs
+  64, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    33,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x5254434f), 
+    ACE_NTOHL (0x5242412f), 
+    ACE_NTOHL (0x5072696f), 
+    ACE_NTOHL (0x72697479), 
+    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
+        9,
+    ACE_NTOHL (0x5072696f), 
+    ACE_NTOHL (0x72697479), 
+    ACE_NTOHL (0x0),  // name = Priority
+        CORBA::tk_short,
+
+
+  15,
+  ACE_NTOHL (0x73746174), 
+  ACE_NTOHL (0x69635f74), 
+  ACE_NTOHL (0x68726561), 
+  ACE_NTOHL (0x64730000),  // name = static_threads
+    CORBA::tk_ulong,
+
+  16,
+  ACE_NTOHL (0x64796e61), 
+  ACE_NTOHL (0x6d69635f), 
+  ACE_NTOHL (0x74687265), 
+  ACE_NTOHL (0x61647300),  // name = dynamic_threads
+    CORBA::tk_ulong,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ThreadpoolLane (
+    CORBA::tk_struct,
+    sizeof (_oc_RTCORBA_ThreadpoolLane),
+    (char *) &_oc_RTCORBA_ThreadpoolLane,
+    0,
+    0
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_ThreadpoolLane =
+    &_tc_TAO_tc_RTCORBA_ThreadpoolLane;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTCORBA_ThreadpoolLanes[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  40,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164706f), 
+  ACE_NTOHL (0x6f6c4c61), 
+  ACE_NTOHL (0x6e65733a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolLanes:1.0
+    16,
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164706f), 
+  ACE_NTOHL (0x6f6c4c61), 
+  ACE_NTOHL (0x6e657300),  // name = ThreadpoolLanes
+    CORBA::tk_sequence, // typecode kind
+  228, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_struct, // typecode kind
+    212, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      39,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x5254434f), 
+      ACE_NTOHL (0x5242412f), 
+      ACE_NTOHL (0x54687265), 
+      ACE_NTOHL (0x6164706f), 
+      ACE_NTOHL (0x6f6c4c61), 
+      ACE_NTOHL (0x6e653a31), 
+      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolLane:1.0
+            15,
+      ACE_NTOHL (0x54687265), 
+      ACE_NTOHL (0x6164706f), 
+      ACE_NTOHL (0x6f6c4c61), 
+      ACE_NTOHL (0x6e650000),  // name = ThreadpoolLane
+      3, // member count
+            14,
+      ACE_NTOHL (0x6c616e65), 
+      ACE_NTOHL (0x5f707269), 
+      ACE_NTOHL (0x6f726974), 
+      ACE_NTOHL (0x79000000),  // name = lane_priority
+            CORBA::tk_alias, // typecode kind for typedefs
+      64, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        33,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x5254434f), 
+        ACE_NTOHL (0x5242412f), 
+        ACE_NTOHL (0x5072696f), 
+        ACE_NTOHL (0x72697479), 
+        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
+                9,
+        ACE_NTOHL (0x5072696f), 
+        ACE_NTOHL (0x72697479), 
+        ACE_NTOHL (0x0),  // name = Priority
+                CORBA::tk_short,
+
+
+      15,
+      ACE_NTOHL (0x73746174), 
+      ACE_NTOHL (0x69635f74), 
+      ACE_NTOHL (0x68726561), 
+      ACE_NTOHL (0x64730000),  // name = static_threads
+            CORBA::tk_ulong,
+
+      16,
+      ACE_NTOHL (0x64796e61), 
+      ACE_NTOHL (0x6d69635f), 
+      ACE_NTOHL (0x74687265), 
+      ACE_NTOHL (0x61647300),  // name = dynamic_threads
+            CORBA::tk_ulong,
+
+
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ThreadpoolLanes (
+    CORBA::tk_alias,
+    sizeof (_oc_RTCORBA_ThreadpoolLanes),
+    (char *) &_oc_RTCORBA_ThreadpoolLanes,
+    0,
+    0
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_ThreadpoolLanes =
+    &_tc_TAO_tc_RTCORBA_ThreadpoolLanes;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTCORBA_PriorityModel[] =
+{
+  TAO_ENCAP_BYTE_ORDER, // byte order
+  38,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x4d6f6465), 
+  ACE_NTOHL (0x6c3a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/PriorityModel:1.0
+  14,
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x4d6f6465), 
+  ACE_NTOHL (0x6c000000),  // name = PriorityModel
+  2, // member count
+  18,
+  ACE_NTOHL (0x434c4945), 
+  ACE_NTOHL (0x4e545f50), 
+  ACE_NTOHL (0x524f5041), 
+  ACE_NTOHL (0x47415445), 
+  ACE_NTOHL (0x44000000),  // name = CLIENT_PROPAGATED
+  16,
+  ACE_NTOHL (0x53455256), 
+  ACE_NTOHL (0x45525f44), 
+  ACE_NTOHL (0x45434c41), 
+  ACE_NTOHL (0x52454400),  // name = SERVER_DECLARED
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityModel (
+    CORBA::tk_enum,
+    sizeof (_oc_RTCORBA_PriorityModel),
+    (char *) &_oc_RTCORBA_PriorityModel,
+    0,
+    0
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_PriorityModel =
+    &_tc_TAO_tc_RTCORBA_PriorityModel;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTCORBA_PriorityModelPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  44,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x4d6f6465), 
+  ACE_NTOHL (0x6c506f6c), 
+  ACE_NTOHL (0x6963793a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/PriorityModelPolicy:1.0
+    20,
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x4d6f6465), 
+  ACE_NTOHL (0x6c506f6c), 
+  ACE_NTOHL (0x69637900),  // name = PriorityModelPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityModelPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_PriorityModelPolicy),
+    (char *) &_oc_RTCORBA_PriorityModelPolicy,
+    0,
+    0
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_PriorityModelPolicy =
+    &_tc_TAO_tc_RTCORBA_PriorityModelPolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTCORBA_ThreadpoolPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  41,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164706f), 
+  ACE_NTOHL (0x6f6c506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolPolicy:1.0
+    17,
+  ACE_NTOHL (0x54687265), 
+  ACE_NTOHL (0x6164706f), 
+  ACE_NTOHL (0x6f6c506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x0),  // name = ThreadpoolPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ThreadpoolPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_ThreadpoolPolicy),
+    (char *) &_oc_RTCORBA_ThreadpoolPolicy,
+    0,
+    0
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_ThreadpoolPolicy =
+    &_tc_TAO_tc_RTCORBA_ThreadpoolPolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTCORBA_ProtocolProperties[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  43,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x50726f70), 
+  ACE_NTOHL (0x65727469), 
+  ACE_NTOHL (0x65733a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
+    19,
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x50726f70), 
+  ACE_NTOHL (0x65727469), 
+  ACE_NTOHL (0x65730000),  // name = ProtocolProperties
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ProtocolProperties (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_ProtocolProperties),
+    (char *) &_oc_RTCORBA_ProtocolProperties,
+    0,
+    0
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_ProtocolProperties =
+    &_tc_TAO_tc_RTCORBA_ProtocolProperties;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTCORBA_Protocol[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  33,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Protocol:1.0
+    9,
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x0),  // name = Protocol
+  3, // member count
+    14,
+  ACE_NTOHL (0x70726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x5f747970), 
+  ACE_NTOHL (0x65000000),  // name = protocol_type
+    CORBA::tk_alias, // typecode kind for typedefs
+  60, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    30,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x494f502f), 
+    ACE_NTOHL (0x50726f66), 
+    ACE_NTOHL (0x696c6549), 
+    ACE_NTOHL (0x643a312e), 
+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
+        10,
+    ACE_NTOHL (0x50726f66), 
+    ACE_NTOHL (0x696c6549), 
+    ACE_NTOHL (0x64000000),  // name = ProfileId
+        CORBA::tk_ulong,
+
+
+  24,
+  ACE_NTOHL (0x6f72625f), 
+  ACE_NTOHL (0x70726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x5f70726f), 
+  ACE_NTOHL (0x70657274), 
+  ACE_NTOHL (0x69657300),  // name = orb_protocol_properties
+    CORBA::tk_objref, // typecode kind
+  76, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    43,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x5254434f), 
+    ACE_NTOHL (0x5242412f), 
+    ACE_NTOHL (0x50726f74), 
+    ACE_NTOHL (0x6f636f6c), 
+    ACE_NTOHL (0x50726f70), 
+    ACE_NTOHL (0x65727469), 
+    ACE_NTOHL (0x65733a31), 
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
+        19,
+    ACE_NTOHL (0x50726f74), 
+    ACE_NTOHL (0x6f636f6c), 
+    ACE_NTOHL (0x50726f70), 
+    ACE_NTOHL (0x65727469), 
+    ACE_NTOHL (0x65730000),  // name = ProtocolProperties
+    
+  30,
+  ACE_NTOHL (0x7472616e), 
+  ACE_NTOHL (0x73706f72), 
+  ACE_NTOHL (0x745f7072), 
+  ACE_NTOHL (0x6f746f63), 
+  ACE_NTOHL (0x6f6c5f70), 
+  ACE_NTOHL (0x726f7065), 
+  ACE_NTOHL (0x72746965), 
+  ACE_NTOHL (0x73000000),  // name = transport_protocol_properties
+    CORBA::tk_objref, // typecode kind
+  76, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    43,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x5254434f), 
+    ACE_NTOHL (0x5242412f), 
+    ACE_NTOHL (0x50726f74), 
+    ACE_NTOHL (0x6f636f6c), 
+    ACE_NTOHL (0x50726f70), 
+    ACE_NTOHL (0x65727469), 
+    ACE_NTOHL (0x65733a31), 
+    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
+        19,
+    ACE_NTOHL (0x50726f74), 
+    ACE_NTOHL (0x6f636f6c), 
+    ACE_NTOHL (0x50726f70), 
+    ACE_NTOHL (0x65727469), 
+    ACE_NTOHL (0x65730000),  // name = ProtocolProperties
+    
+};
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Protocol (
+    CORBA::tk_struct,
+    sizeof (_oc_RTCORBA_Protocol),
+    (char *) &_oc_RTCORBA_Protocol,
+    0,
+    0
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_Protocol =
+    &_tc_TAO_tc_RTCORBA_Protocol;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTCORBA_ProtocolList[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  37,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ProtocolList:1.0
+    13,
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x0),  // name = ProtocolList
+    CORBA::tk_sequence, // typecode kind
+  400, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_struct, // typecode kind
+    384, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      33,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x5254434f), 
+      ACE_NTOHL (0x5242412f), 
+      ACE_NTOHL (0x50726f74), 
+      ACE_NTOHL (0x6f636f6c), 
+      ACE_NTOHL (0x3a312e30), 
+      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Protocol:1.0
+            9,
+      ACE_NTOHL (0x50726f74), 
+      ACE_NTOHL (0x6f636f6c), 
+      ACE_NTOHL (0x0),  // name = Protocol
+      3, // member count
+            14,
+      ACE_NTOHL (0x70726f74), 
+      ACE_NTOHL (0x6f636f6c), 
+      ACE_NTOHL (0x5f747970), 
+      ACE_NTOHL (0x65000000),  // name = protocol_type
+            CORBA::tk_alias, // typecode kind for typedefs
+      60, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        30,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x494f502f), 
+        ACE_NTOHL (0x50726f66), 
+        ACE_NTOHL (0x696c6549), 
+        ACE_NTOHL (0x643a312e), 
+        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
+                10,
+        ACE_NTOHL (0x50726f66), 
+        ACE_NTOHL (0x696c6549), 
+        ACE_NTOHL (0x64000000),  // name = ProfileId
+                CORBA::tk_ulong,
+
+
+      24,
+      ACE_NTOHL (0x6f72625f), 
+      ACE_NTOHL (0x70726f74), 
+      ACE_NTOHL (0x6f636f6c), 
+      ACE_NTOHL (0x5f70726f), 
+      ACE_NTOHL (0x70657274), 
+      ACE_NTOHL (0x69657300),  // name = orb_protocol_properties
+            CORBA::tk_objref, // typecode kind
+      76, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        43,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x5254434f), 
+        ACE_NTOHL (0x5242412f), 
+        ACE_NTOHL (0x50726f74), 
+        ACE_NTOHL (0x6f636f6c), 
+        ACE_NTOHL (0x50726f70), 
+        ACE_NTOHL (0x65727469), 
+        ACE_NTOHL (0x65733a31), 
+        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
+                19,
+        ACE_NTOHL (0x50726f74), 
+        ACE_NTOHL (0x6f636f6c), 
+        ACE_NTOHL (0x50726f70), 
+        ACE_NTOHL (0x65727469), 
+        ACE_NTOHL (0x65730000),  // name = ProtocolProperties
+        
+      30,
+      ACE_NTOHL (0x7472616e), 
+      ACE_NTOHL (0x73706f72), 
+      ACE_NTOHL (0x745f7072), 
+      ACE_NTOHL (0x6f746f63), 
+      ACE_NTOHL (0x6f6c5f70), 
+      ACE_NTOHL (0x726f7065), 
+      ACE_NTOHL (0x72746965), 
+      ACE_NTOHL (0x73000000),  // name = transport_protocol_properties
+            CORBA::tk_objref, // typecode kind
+      76, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        43,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x5254434f), 
+        ACE_NTOHL (0x5242412f), 
+        ACE_NTOHL (0x50726f74), 
+        ACE_NTOHL (0x6f636f6c), 
+        ACE_NTOHL (0x50726f70), 
+        ACE_NTOHL (0x65727469), 
+        ACE_NTOHL (0x65733a31), 
+        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
+                19,
+        ACE_NTOHL (0x50726f74), 
+        ACE_NTOHL (0x6f636f6c), 
+        ACE_NTOHL (0x50726f70), 
+        ACE_NTOHL (0x65727469), 
+        ACE_NTOHL (0x65730000),  // name = ProtocolProperties
+        
+
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ProtocolList (
+    CORBA::tk_alias,
+    sizeof (_oc_RTCORBA_ProtocolList),
+    (char *) &_oc_RTCORBA_ProtocolList,
+    0,
+    0
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_ProtocolList =
+    &_tc_TAO_tc_RTCORBA_ProtocolList;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTCORBA_ServerProtocolPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  45,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65725072), 
+  ACE_NTOHL (0x6f746f63), 
+  ACE_NTOHL (0x6f6c506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ServerProtocolPolicy:1.0
+    21,
+  ACE_NTOHL (0x53657276), 
+  ACE_NTOHL (0x65725072), 
+  ACE_NTOHL (0x6f746f63), 
+  ACE_NTOHL (0x6f6c506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x0),  // name = ServerProtocolPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ServerProtocolPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_ServerProtocolPolicy),
+    (char *) &_oc_RTCORBA_ServerProtocolPolicy,
+    0,
+    0
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_ServerProtocolPolicy =
+    &_tc_TAO_tc_RTCORBA_ServerProtocolPolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTCORBA_ClientProtocolPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  45,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x436c6965), 
+  ACE_NTOHL (0x6e745072), 
+  ACE_NTOHL (0x6f746f63), 
+  ACE_NTOHL (0x6f6c506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ClientProtocolPolicy:1.0
+    21,
+  ACE_NTOHL (0x436c6965), 
+  ACE_NTOHL (0x6e745072), 
+  ACE_NTOHL (0x6f746f63), 
+  ACE_NTOHL (0x6f6c506f), 
+  ACE_NTOHL (0x6c696379), 
+  ACE_NTOHL (0x0),  // name = ClientProtocolPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ClientProtocolPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_ClientProtocolPolicy),
+    (char *) &_oc_RTCORBA_ClientProtocolPolicy,
+    0,
+    0
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_ClientProtocolPolicy =
+    &_tc_TAO_tc_RTCORBA_ClientProtocolPolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTCORBA_PrivateConnectionPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  48,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x50726976), 
+  ACE_NTOHL (0x61746543), 
+  ACE_NTOHL (0x6f6e6e65), 
+  ACE_NTOHL (0x6374696f), 
+  ACE_NTOHL (0x6e506f6c), 
+  ACE_NTOHL (0x6963793a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/PrivateConnectionPolicy:1.0
+    24,
+  ACE_NTOHL (0x50726976), 
+  ACE_NTOHL (0x61746543), 
+  ACE_NTOHL (0x6f6e6e65), 
+  ACE_NTOHL (0x6374696f), 
+  ACE_NTOHL (0x6e506f6c), 
+  ACE_NTOHL (0x69637900),  // name = PrivateConnectionPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PrivateConnectionPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_PrivateConnectionPolicy),
+    (char *) &_oc_RTCORBA_PrivateConnectionPolicy,
+    0,
+    0
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_PrivateConnectionPolicy =
+    &_tc_TAO_tc_RTCORBA_PrivateConnectionPolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTCORBA_TCPProtocolProperties[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  46,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x54435050), 
+  ACE_NTOHL (0x726f746f), 
+  ACE_NTOHL (0x636f6c50), 
+  ACE_NTOHL (0x726f7065), 
+  ACE_NTOHL (0x72746965), 
+  ACE_NTOHL (0x733a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/TCPProtocolProperties:1.0
+    22,
+  ACE_NTOHL (0x54435050), 
+  ACE_NTOHL (0x726f746f), 
+  ACE_NTOHL (0x636f6c50), 
+  ACE_NTOHL (0x726f7065), 
+  ACE_NTOHL (0x72746965), 
+  ACE_NTOHL (0x73000000),  // name = TCPProtocolProperties
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_TCPProtocolProperties (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_TCPProtocolProperties),
+    (char *) &_oc_RTCORBA_TCPProtocolProperties,
+    0,
+    0
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_TCPProtocolProperties =
+    &_tc_TAO_tc_RTCORBA_TCPProtocolProperties;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTCORBA_GIOPProtocolProperties[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  47,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x47494f50), 
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x50726f70), 
+  ACE_NTOHL (0x65727469), 
+  ACE_NTOHL (0x65733a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/GIOPProtocolProperties:1.0
+    23,
+  ACE_NTOHL (0x47494f50), 
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x50726f70), 
+  ACE_NTOHL (0x65727469), 
+  ACE_NTOHL (0x65730000),  // name = GIOPProtocolProperties
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_GIOPProtocolProperties (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_GIOPProtocolProperties),
+    (char *) &_oc_RTCORBA_GIOPProtocolProperties,
+    0,
+    0
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_GIOPProtocolProperties =
+    &_tc_TAO_tc_RTCORBA_GIOPProtocolProperties;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTCORBA_UnixDomainProtocolProperties[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  53,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x556e6978), 
+  ACE_NTOHL (0x446f6d61), 
+  ACE_NTOHL (0x696e5072), 
+  ACE_NTOHL (0x6f746f63), 
+  ACE_NTOHL (0x6f6c5072), 
+  ACE_NTOHL (0x6f706572), 
+  ACE_NTOHL (0x74696573), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/UnixDomainProtocolProperties:1.0
+    29,
+  ACE_NTOHL (0x556e6978), 
+  ACE_NTOHL (0x446f6d61), 
+  ACE_NTOHL (0x696e5072), 
+  ACE_NTOHL (0x6f746f63), 
+  ACE_NTOHL (0x6f6c5072), 
+  ACE_NTOHL (0x6f706572), 
+  ACE_NTOHL (0x74696573), 
+  ACE_NTOHL (0x0),  // name = UnixDomainProtocolProperties
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_UnixDomainProtocolProperties (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_UnixDomainProtocolProperties),
+    (char *) &_oc_RTCORBA_UnixDomainProtocolProperties,
+    0,
+    0
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_UnixDomainProtocolProperties =
+    &_tc_TAO_tc_RTCORBA_UnixDomainProtocolProperties;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTCORBA_SharedMemoryProtocolProperties[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  55,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x53686172), 
+  ACE_NTOHL (0x65644d65), 
+  ACE_NTOHL (0x6d6f7279), 
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x50726f70), 
+  ACE_NTOHL (0x65727469), 
+  ACE_NTOHL (0x65733a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/SharedMemoryProtocolProperties:1.0
+    31,
+  ACE_NTOHL (0x53686172), 
+  ACE_NTOHL (0x65644d65), 
+  ACE_NTOHL (0x6d6f7279), 
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x50726f70), 
+  ACE_NTOHL (0x65727469), 
+  ACE_NTOHL (0x65730000),  // name = SharedMemoryProtocolProperties
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_SharedMemoryProtocolProperties (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_SharedMemoryProtocolProperties),
+    (char *) &_oc_RTCORBA_SharedMemoryProtocolProperties,
+    0,
+    0
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_SharedMemoryProtocolProperties =
+    &_tc_TAO_tc_RTCORBA_SharedMemoryProtocolProperties;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTCORBA_UserDatagramProtocolProperties[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  55,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x55736572), 
+  ACE_NTOHL (0x44617461), 
+  ACE_NTOHL (0x6772616d), 
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x50726f70), 
+  ACE_NTOHL (0x65727469), 
+  ACE_NTOHL (0x65733a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/UserDatagramProtocolProperties:1.0
+    31,
+  ACE_NTOHL (0x55736572), 
+  ACE_NTOHL (0x44617461), 
+  ACE_NTOHL (0x6772616d), 
+  ACE_NTOHL (0x50726f74), 
+  ACE_NTOHL (0x6f636f6c), 
+  ACE_NTOHL (0x50726f70), 
+  ACE_NTOHL (0x65727469), 
+  ACE_NTOHL (0x65730000),  // name = UserDatagramProtocolProperties
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_UserDatagramProtocolProperties (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_UserDatagramProtocolProperties),
+    (char *) &_oc_RTCORBA_UserDatagramProtocolProperties,
+    0,
+    0
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_UserDatagramProtocolProperties =
+    &_tc_TAO_tc_RTCORBA_UserDatagramProtocolProperties;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTCORBA_StreamControlProtocolProperties[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  56,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x53747265), 
+  ACE_NTOHL (0x616d436f), 
+  ACE_NTOHL (0x6e74726f), 
+  ACE_NTOHL (0x6c50726f), 
+  ACE_NTOHL (0x746f636f), 
+  ACE_NTOHL (0x6c50726f), 
+  ACE_NTOHL (0x70657274), 
+  ACE_NTOHL (0x6965733a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/StreamControlProtocolProperties:1.0
+    32,
+  ACE_NTOHL (0x53747265), 
+  ACE_NTOHL (0x616d436f), 
+  ACE_NTOHL (0x6e74726f), 
+  ACE_NTOHL (0x6c50726f), 
+  ACE_NTOHL (0x746f636f), 
+  ACE_NTOHL (0x6c50726f), 
+  ACE_NTOHL (0x70657274), 
+  ACE_NTOHL (0x69657300),  // name = StreamControlProtocolProperties
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_StreamControlProtocolProperties (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_StreamControlProtocolProperties),
+    (char *) &_oc_RTCORBA_StreamControlProtocolProperties,
+    0,
+    0
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_StreamControlProtocolProperties =
+    &_tc_TAO_tc_RTCORBA_StreamControlProtocolProperties;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTCORBA_PriorityBand[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  37,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x42616e64), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/PriorityBand:1.0
+    13,
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x42616e64), 
+  ACE_NTOHL (0x0),  // name = PriorityBand
+  2, // member count
+    4,
+  ACE_NTOHL (0x6c6f7700),  // name = low
+    CORBA::tk_alias, // typecode kind for typedefs
+  64, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    33,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x5254434f), 
+    ACE_NTOHL (0x5242412f), 
+    ACE_NTOHL (0x5072696f), 
+    ACE_NTOHL (0x72697479), 
+    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
+        9,
+    ACE_NTOHL (0x5072696f), 
+    ACE_NTOHL (0x72697479), 
+    ACE_NTOHL (0x0),  // name = Priority
+        CORBA::tk_short,
+
+
+  5,
+  ACE_NTOHL (0x68696768), 
+  ACE_NTOHL (0x0),  // name = high
+    CORBA::tk_alias, // typecode kind for typedefs
+  64, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    33,
+    ACE_NTOHL (0x49444c3a), 
+    ACE_NTOHL (0x6f6d672e), 
+    ACE_NTOHL (0x6f72672f), 
+    ACE_NTOHL (0x5254434f), 
+    ACE_NTOHL (0x5242412f), 
+    ACE_NTOHL (0x5072696f), 
+    ACE_NTOHL (0x72697479), 
+    ACE_NTOHL (0x3a312e30), 
+    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
+        9,
+    ACE_NTOHL (0x5072696f), 
+    ACE_NTOHL (0x72697479), 
+    ACE_NTOHL (0x0),  // name = Priority
+        CORBA::tk_short,
+
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityBand (
+    CORBA::tk_struct,
+    sizeof (_oc_RTCORBA_PriorityBand),
+    (char *) &_oc_RTCORBA_PriorityBand,
+    0,
+    0
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_PriorityBand =
+    &_tc_TAO_tc_RTCORBA_PriorityBand;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTCORBA_PriorityBands[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  38,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x42616e64), 
+  ACE_NTOHL (0x733a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/PriorityBands:1.0
+    14,
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x42616e64), 
+  ACE_NTOHL (0x73000000),  // name = PriorityBands
+    CORBA::tk_sequence, // typecode kind
+  252, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_struct, // typecode kind
+    236, // encapsulation length
+      TAO_ENCAP_BYTE_ORDER, // byte order
+      37,
+      ACE_NTOHL (0x49444c3a), 
+      ACE_NTOHL (0x6f6d672e), 
+      ACE_NTOHL (0x6f72672f), 
+      ACE_NTOHL (0x5254434f), 
+      ACE_NTOHL (0x5242412f), 
+      ACE_NTOHL (0x5072696f), 
+      ACE_NTOHL (0x72697479), 
+      ACE_NTOHL (0x42616e64), 
+      ACE_NTOHL (0x3a312e30), 
+      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/PriorityBand:1.0
+            13,
+      ACE_NTOHL (0x5072696f), 
+      ACE_NTOHL (0x72697479), 
+      ACE_NTOHL (0x42616e64), 
+      ACE_NTOHL (0x0),  // name = PriorityBand
+      2, // member count
+            4,
+      ACE_NTOHL (0x6c6f7700),  // name = low
+            CORBA::tk_alias, // typecode kind for typedefs
+      64, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        33,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x5254434f), 
+        ACE_NTOHL (0x5242412f), 
+        ACE_NTOHL (0x5072696f), 
+        ACE_NTOHL (0x72697479), 
+        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
+                9,
+        ACE_NTOHL (0x5072696f), 
+        ACE_NTOHL (0x72697479), 
+        ACE_NTOHL (0x0),  // name = Priority
+                CORBA::tk_short,
+
+
+      5,
+      ACE_NTOHL (0x68696768), 
+      ACE_NTOHL (0x0),  // name = high
+            CORBA::tk_alias, // typecode kind for typedefs
+      64, // encapsulation length
+        TAO_ENCAP_BYTE_ORDER, // byte order
+        33,
+        ACE_NTOHL (0x49444c3a), 
+        ACE_NTOHL (0x6f6d672e), 
+        ACE_NTOHL (0x6f72672f), 
+        ACE_NTOHL (0x5254434f), 
+        ACE_NTOHL (0x5242412f), 
+        ACE_NTOHL (0x5072696f), 
+        ACE_NTOHL (0x72697479), 
+        ACE_NTOHL (0x3a312e30), 
+        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
+                9,
+        ACE_NTOHL (0x5072696f), 
+        ACE_NTOHL (0x72697479), 
+        ACE_NTOHL (0x0),  // name = Priority
+                CORBA::tk_short,
+
+
+
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityBands (
+    CORBA::tk_alias,
+    sizeof (_oc_RTCORBA_PriorityBands),
+    (char *) &_oc_RTCORBA_PriorityBands,
+    0,
+    0
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_PriorityBands =
+    &_tc_TAO_tc_RTCORBA_PriorityBands;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTCORBA_PriorityBandedConnectionPolicy[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  55,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x42616e64), 
+  ACE_NTOHL (0x6564436f), 
+  ACE_NTOHL (0x6e6e6563), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63793a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/PriorityBandedConnectionPolicy:1.0
+    31,
+  ACE_NTOHL (0x5072696f), 
+  ACE_NTOHL (0x72697479), 
+  ACE_NTOHL (0x42616e64), 
+  ACE_NTOHL (0x6564436f), 
+  ACE_NTOHL (0x6e6e6563), 
+  ACE_NTOHL (0x74696f6e), 
+  ACE_NTOHL (0x506f6c69), 
+  ACE_NTOHL (0x63790000),  // name = PriorityBandedConnectionPolicy
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityBandedConnectionPolicy (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_PriorityBandedConnectionPolicy),
+    (char *) &_oc_RTCORBA_PriorityBandedConnectionPolicy,
+    0,
+    0
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_PriorityBandedConnectionPolicy =
+    &_tc_TAO_tc_RTCORBA_PriorityBandedConnectionPolicy;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTCORBA_Current[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  32,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x43757272), 
+  ACE_NTOHL (0x656e743a), 
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/Current:1.0
+    8,
+  ACE_NTOHL (0x43757272), 
+  ACE_NTOHL (0x656e7400),  // name = Current
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Current (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_Current),
+    (char *) &_oc_RTCORBA_Current,
+    0,
+    0
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_Current =
+    &_tc_TAO_tc_RTCORBA_Current;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTCORBA_Mutex[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  30,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x4d757465), 
+  ACE_NTOHL (0x783a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/Mutex:1.0
+    6,
+  ACE_NTOHL (0x4d757465), 
+  ACE_NTOHL (0x78000000),  // name = Mutex
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Mutex (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_Mutex),
+    (char *) &_oc_RTCORBA_Mutex,
+    0,
+    0
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_Mutex =
+    &_tc_TAO_tc_RTCORBA_Mutex;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTCORBA_RTORB[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  30,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x5254434f), 
+  ACE_NTOHL (0x5242412f), 
+  ACE_NTOHL (0x52544f52), 
+  ACE_NTOHL (0x423a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/RTORB:1.0
+    6,
+  ACE_NTOHL (0x52544f52), 
+  ACE_NTOHL (0x42000000),  // name = RTORB
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTCORBA_RTORB (
+    CORBA::tk_objref,
+    sizeof (_oc_RTCORBA_RTORB),
+    (char *) &_oc_RTCORBA_RTORB,
+    0,
+    0
+  );
+
+namespace RTCORBA
+{
+  ::CORBA::TypeCode_ptr _tc_RTORB =
+    &_tc_TAO_tc_RTCORBA_RTORB;
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const RTCORBA::ThreadpoolLane &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLane>::insert_copy (
+      _tao_any,
+      RTCORBA::ThreadpoolLane::_tao_any_destructor,
+      RTCORBA::_tc_ThreadpoolLane,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::ThreadpoolLane *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLane>::insert (
+      _tao_any,
+      RTCORBA::ThreadpoolLane::_tao_any_destructor,
+      RTCORBA::_tc_ThreadpoolLane,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::ThreadpoolLane *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const RTCORBA::ThreadpoolLane *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const RTCORBA::ThreadpoolLane *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLane>::extract (
+        _tao_any,
+        RTCORBA::ThreadpoolLane::_tao_any_destructor,
+        RTCORBA::_tc_ThreadpoolLane,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const RTCORBA::ThreadpoolLanes &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLanes>::insert_copy (
+      _tao_any,
+      RTCORBA::ThreadpoolLanes::_tao_any_destructor,
+      RTCORBA::_tc_ThreadpoolLanes,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::ThreadpoolLanes *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLanes>::insert (
+      _tao_any,
+      RTCORBA::ThreadpoolLanes::_tao_any_destructor,
+      RTCORBA::_tc_ThreadpoolLanes,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::ThreadpoolLanes *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const RTCORBA::ThreadpoolLanes *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const RTCORBA::ThreadpoolLanes *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLanes>::extract (
+        _tao_any,
+        RTCORBA::ThreadpoolLanes::_tao_any_destructor,
+        RTCORBA::_tc_ThreadpoolLanes,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::PriorityModel _tao_elem
+  )
+{
+  TAO::Any_Basic_Impl_T<RTCORBA::PriorityModel>::insert (
+      _tao_any,
+      RTCORBA::_tc_PriorityModel,
+      _tao_elem
+    );
+}
+
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::PriorityModel &_tao_elem
+  )
+{
+  return
+    TAO::Any_Basic_Impl_T<RTCORBA::PriorityModel>::extract (
+        _tao_any,
+        RTCORBA::_tc_PriorityModel,
+        _tao_elem 
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>::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<RTCORBA::PriorityModelPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::PriorityModelPolicy_ptr _tao_elem
+  )
+{
+  RTCORBA::PriorityModelPolicy_ptr _tao_objptr =
+    RTCORBA::PriorityModelPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::PriorityModelPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>::insert (
+      _tao_any,
+      RTCORBA::PriorityModelPolicy::_tao_any_destructor,
+      RTCORBA::_tc_PriorityModelPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::PriorityModelPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>::extract (
+        _tao_any,
+        RTCORBA::PriorityModelPolicy::_tao_any_destructor,
+        RTCORBA::_tc_PriorityModelPolicy,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>::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<RTCORBA::ThreadpoolPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::ThreadpoolPolicy_ptr _tao_elem
+  )
+{
+  RTCORBA::ThreadpoolPolicy_ptr _tao_objptr =
+    RTCORBA::ThreadpoolPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::ThreadpoolPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>::insert (
+      _tao_any,
+      RTCORBA::ThreadpoolPolicy::_tao_any_destructor,
+      RTCORBA::_tc_ThreadpoolPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::ThreadpoolPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>::extract (
+        _tao_any,
+        RTCORBA::ThreadpoolPolicy::_tao_any_destructor,
+        RTCORBA::_tc_ThreadpoolPolicy,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ProtocolProperties>::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<RTCORBA::ProtocolProperties>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ProtocolProperties>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::ProtocolProperties_ptr _tao_elem
+  )
+{
+  RTCORBA::ProtocolProperties_ptr _tao_objptr =
+    RTCORBA::ProtocolProperties::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::ProtocolProperties_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::ProtocolProperties>::insert (
+      _tao_any,
+      RTCORBA::ProtocolProperties::_tao_any_destructor,
+      RTCORBA::_tc_ProtocolProperties,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::ProtocolProperties_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::ProtocolProperties>::extract (
+        _tao_any,
+        RTCORBA::ProtocolProperties::_tao_any_destructor,
+        RTCORBA::_tc_ProtocolProperties,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<RTCORBA::Protocol>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<RTCORBA::Protocol>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const RTCORBA::Protocol &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<RTCORBA::Protocol>::insert_copy (
+      _tao_any,
+      RTCORBA::Protocol::_tao_any_destructor,
+      RTCORBA::_tc_Protocol,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::Protocol *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<RTCORBA::Protocol>::insert (
+      _tao_any,
+      RTCORBA::Protocol::_tao_any_destructor,
+      RTCORBA::_tc_Protocol,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::Protocol *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const RTCORBA::Protocol *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const RTCORBA::Protocol *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<RTCORBA::Protocol>::extract (
+        _tao_any,
+        RTCORBA::Protocol::_tao_any_destructor,
+        RTCORBA::_tc_Protocol,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const RTCORBA::ProtocolList &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>::insert_copy (
+      _tao_any,
+      RTCORBA::ProtocolList::_tao_any_destructor,
+      RTCORBA::_tc_ProtocolList,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::ProtocolList *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>::insert (
+      _tao_any,
+      RTCORBA::ProtocolList::_tao_any_destructor,
+      RTCORBA::_tc_ProtocolList,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::ProtocolList *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const RTCORBA::ProtocolList *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const RTCORBA::ProtocolList *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>::extract (
+        _tao_any,
+        RTCORBA::ProtocolList::_tao_any_destructor,
+        RTCORBA::_tc_ProtocolList,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>::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<RTCORBA::ServerProtocolPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::ServerProtocolPolicy_ptr _tao_elem
+  )
+{
+  RTCORBA::ServerProtocolPolicy_ptr _tao_objptr =
+    RTCORBA::ServerProtocolPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::ServerProtocolPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>::insert (
+      _tao_any,
+      RTCORBA::ServerProtocolPolicy::_tao_any_destructor,
+      RTCORBA::_tc_ServerProtocolPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::ServerProtocolPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>::extract (
+        _tao_any,
+        RTCORBA::ServerProtocolPolicy::_tao_any_destructor,
+        RTCORBA::_tc_ServerProtocolPolicy,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>::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<RTCORBA::ClientProtocolPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::ClientProtocolPolicy_ptr _tao_elem
+  )
+{
+  RTCORBA::ClientProtocolPolicy_ptr _tao_objptr =
+    RTCORBA::ClientProtocolPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::ClientProtocolPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>::insert (
+      _tao_any,
+      RTCORBA::ClientProtocolPolicy::_tao_any_destructor,
+      RTCORBA::_tc_ClientProtocolPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::ClientProtocolPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>::extract (
+        _tao_any,
+        RTCORBA::ClientProtocolPolicy::_tao_any_destructor,
+        RTCORBA::_tc_ClientProtocolPolicy,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::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<RTCORBA::PrivateConnectionPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::PrivateConnectionPolicy_ptr _tao_elem
+  )
+{
+  RTCORBA::PrivateConnectionPolicy_ptr _tao_objptr =
+    RTCORBA::PrivateConnectionPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::PrivateConnectionPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::insert (
+      _tao_any,
+      RTCORBA::PrivateConnectionPolicy::_tao_any_destructor,
+      RTCORBA::_tc_PrivateConnectionPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::PrivateConnectionPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::extract (
+        _tao_any,
+        RTCORBA::PrivateConnectionPolicy::_tao_any_destructor,
+        RTCORBA::_tc_PrivateConnectionPolicy,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>::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<RTCORBA::TCPProtocolProperties>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::TCPProtocolProperties_ptr _tao_elem
+  )
+{
+  RTCORBA::TCPProtocolProperties_ptr _tao_objptr =
+    RTCORBA::TCPProtocolProperties::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::TCPProtocolProperties_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>::insert (
+      _tao_any,
+      RTCORBA::TCPProtocolProperties::_tao_any_destructor,
+      RTCORBA::_tc_TCPProtocolProperties,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::TCPProtocolProperties_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>::extract (
+        _tao_any,
+        RTCORBA::TCPProtocolProperties::_tao_any_destructor,
+        RTCORBA::_tc_TCPProtocolProperties,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>::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<RTCORBA::GIOPProtocolProperties>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::GIOPProtocolProperties_ptr _tao_elem
+  )
+{
+  RTCORBA::GIOPProtocolProperties_ptr _tao_objptr =
+    RTCORBA::GIOPProtocolProperties::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::GIOPProtocolProperties_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>::insert (
+      _tao_any,
+      RTCORBA::GIOPProtocolProperties::_tao_any_destructor,
+      RTCORBA::_tc_GIOPProtocolProperties,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::GIOPProtocolProperties_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>::extract (
+        _tao_any,
+        RTCORBA::GIOPProtocolProperties::_tao_any_destructor,
+        RTCORBA::_tc_GIOPProtocolProperties,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::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<RTCORBA::UnixDomainProtocolProperties>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::UnixDomainProtocolProperties_ptr _tao_elem
+  )
+{
+  RTCORBA::UnixDomainProtocolProperties_ptr _tao_objptr =
+    RTCORBA::UnixDomainProtocolProperties::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::UnixDomainProtocolProperties_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::insert (
+      _tao_any,
+      RTCORBA::UnixDomainProtocolProperties::_tao_any_destructor,
+      RTCORBA::_tc_UnixDomainProtocolProperties,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::UnixDomainProtocolProperties_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::extract (
+        _tao_any,
+        RTCORBA::UnixDomainProtocolProperties::_tao_any_destructor,
+        RTCORBA::_tc_UnixDomainProtocolProperties,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::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<RTCORBA::SharedMemoryProtocolProperties>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::SharedMemoryProtocolProperties_ptr _tao_elem
+  )
+{
+  RTCORBA::SharedMemoryProtocolProperties_ptr _tao_objptr =
+    RTCORBA::SharedMemoryProtocolProperties::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::SharedMemoryProtocolProperties_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::insert (
+      _tao_any,
+      RTCORBA::SharedMemoryProtocolProperties::_tao_any_destructor,
+      RTCORBA::_tc_SharedMemoryProtocolProperties,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::SharedMemoryProtocolProperties_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::extract (
+        _tao_any,
+        RTCORBA::SharedMemoryProtocolProperties::_tao_any_destructor,
+        RTCORBA::_tc_SharedMemoryProtocolProperties,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::UserDatagramProtocolProperties>::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<RTCORBA::UserDatagramProtocolProperties>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::UserDatagramProtocolProperties>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::UserDatagramProtocolProperties_ptr _tao_elem
+  )
+{
+  RTCORBA::UserDatagramProtocolProperties_ptr _tao_objptr =
+    RTCORBA::UserDatagramProtocolProperties::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::UserDatagramProtocolProperties_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::UserDatagramProtocolProperties>::insert (
+      _tao_any,
+      RTCORBA::UserDatagramProtocolProperties::_tao_any_destructor,
+      RTCORBA::_tc_UserDatagramProtocolProperties,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::UserDatagramProtocolProperties_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::UserDatagramProtocolProperties>::extract (
+        _tao_any,
+        RTCORBA::UserDatagramProtocolProperties::_tao_any_destructor,
+        RTCORBA::_tc_UserDatagramProtocolProperties,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::StreamControlProtocolProperties>::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<RTCORBA::StreamControlProtocolProperties>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::StreamControlProtocolProperties>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::StreamControlProtocolProperties_ptr _tao_elem
+  )
+{
+  RTCORBA::StreamControlProtocolProperties_ptr _tao_objptr =
+    RTCORBA::StreamControlProtocolProperties::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::StreamControlProtocolProperties_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::StreamControlProtocolProperties>::insert (
+      _tao_any,
+      RTCORBA::StreamControlProtocolProperties::_tao_any_destructor,
+      RTCORBA::_tc_StreamControlProtocolProperties,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::StreamControlProtocolProperties_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::StreamControlProtocolProperties>::extract (
+        _tao_any,
+        RTCORBA::StreamControlProtocolProperties::_tao_any_destructor,
+        RTCORBA::_tc_StreamControlProtocolProperties,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const RTCORBA::PriorityBand &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<RTCORBA::PriorityBand>::insert_copy (
+      _tao_any,
+      RTCORBA::PriorityBand::_tao_any_destructor,
+      RTCORBA::_tc_PriorityBand,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::PriorityBand *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<RTCORBA::PriorityBand>::insert (
+      _tao_any,
+      RTCORBA::PriorityBand::_tao_any_destructor,
+      RTCORBA::_tc_PriorityBand,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::PriorityBand *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const RTCORBA::PriorityBand *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const RTCORBA::PriorityBand *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<RTCORBA::PriorityBand>::extract (
+        _tao_any,
+        RTCORBA::PriorityBand::_tao_any_destructor,
+        RTCORBA::_tc_PriorityBand,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const RTCORBA::PriorityBands &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<RTCORBA::PriorityBands>::insert_copy (
+      _tao_any,
+      RTCORBA::PriorityBands::_tao_any_destructor,
+      RTCORBA::_tc_PriorityBands,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::PriorityBands *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<RTCORBA::PriorityBands>::insert (
+      _tao_any,
+      RTCORBA::PriorityBands::_tao_any_destructor,
+      RTCORBA::_tc_PriorityBands,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::PriorityBands *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const RTCORBA::PriorityBands *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const RTCORBA::PriorityBands *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<RTCORBA::PriorityBands>::extract (
+        _tao_any,
+        RTCORBA::PriorityBands::_tao_any_destructor,
+        RTCORBA::_tc_PriorityBands,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::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<RTCORBA::PriorityBandedConnectionPolicy>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::PriorityBandedConnectionPolicy_ptr _tao_elem
+  )
+{
+  RTCORBA::PriorityBandedConnectionPolicy_ptr _tao_objptr =
+    RTCORBA::PriorityBandedConnectionPolicy::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::PriorityBandedConnectionPolicy_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::insert (
+      _tao_any,
+      RTCORBA::PriorityBandedConnectionPolicy::_tao_any_destructor,
+      RTCORBA::_tc_PriorityBandedConnectionPolicy,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::PriorityBandedConnectionPolicy_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::extract (
+        _tao_any,
+        RTCORBA::PriorityBandedConnectionPolicy::_tao_any_destructor,
+        RTCORBA::_tc_PriorityBandedConnectionPolicy,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::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<RTCORBA::Current>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::Current>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::Current_ptr _tao_elem
+  )
+{
+  RTCORBA::Current_ptr _tao_objptr =
+    RTCORBA::Current::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::Current_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::Current>::insert (
+      _tao_any,
+      RTCORBA::Current::_tao_any_destructor,
+      RTCORBA::_tc_Current,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::Current_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::Current>::extract (
+        _tao_any,
+        RTCORBA::Current::_tao_any_destructor,
+        RTCORBA::_tc_Current,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::Mutex>::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<RTCORBA::Mutex>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::Mutex>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::Mutex_ptr _tao_elem
+  )
+{
+  RTCORBA::Mutex_ptr _tao_objptr =
+    RTCORBA::Mutex::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::Mutex_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::Mutex>::insert (
+      _tao_any,
+      RTCORBA::Mutex::_tao_any_destructor,
+      RTCORBA::_tc_Mutex,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::Mutex_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::Mutex>::extract (
+        _tao_any,
+        RTCORBA::Mutex::_tao_any_destructor,
+        RTCORBA::_tc_Mutex,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::RTORB>::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<RTCORBA::RTORB>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Impl_T<RTCORBA::RTORB>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::RTORB_ptr _tao_elem
+  )
+{
+  RTCORBA::RTORB_ptr _tao_objptr =
+    RTCORBA::RTORB::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::RTORB_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<RTCORBA::RTORB>::insert (
+      _tao_any,
+      RTCORBA::RTORB::_tao_any_destructor,
+      RTCORBA::_tc_RTORB,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::RTORB_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<RTCORBA::RTORB>::extract (
+        _tao_any,
+        RTCORBA::RTORB::_tao_any_destructor,
+        RTCORBA::_tc_RTORB,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_exception/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<RTCORBA::RTORB::MutexNotFound>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<RTCORBA::RTORB::MutexNotFound>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const RTCORBA::RTORB::MutexNotFound &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<RTCORBA::RTORB::MutexNotFound>::insert_copy (
+      _tao_any,
+      RTCORBA::RTORB::MutexNotFound::_tao_any_destructor,
+      RTCORBA::RTORB::_tc_MutexNotFound,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::RTORB::MutexNotFound *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<RTCORBA::RTORB::MutexNotFound>::insert (
+      _tao_any,
+      RTCORBA::RTORB::MutexNotFound::_tao_any_destructor,
+      RTCORBA::RTORB::_tc_MutexNotFound,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::RTORB::MutexNotFound *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const RTCORBA::RTORB::MutexNotFound *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const RTCORBA::RTORB::MutexNotFound *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<RTCORBA::RTORB::MutexNotFound>::extract (
+        _tao_any,
+        RTCORBA::RTORB::MutexNotFound::_tao_any_destructor,
+        RTCORBA::RTORB::_tc_MutexNotFound,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_exception/any_op_cs.cpp:50
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<RTCORBA::RTORB::InvalidThreadpool>::marshal_value (TAO_OutputCDR &)
+{
+  return false;
+}
+
+ACE_TEMPLATE_SPECIALIZATION
+CORBA::Boolean
+TAO::Any_Dual_Impl_T<RTCORBA::RTORB::InvalidThreadpool>::demarshal_value (TAO_InputCDR &)
+{
+  return false;
+}
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const RTCORBA::RTORB::InvalidThreadpool &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<RTCORBA::RTORB::InvalidThreadpool>::insert_copy (
+      _tao_any,
+      RTCORBA::RTORB::InvalidThreadpool::_tao_any_destructor,
+      RTCORBA::RTORB::_tc_InvalidThreadpool,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    RTCORBA::RTORB::InvalidThreadpool *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<RTCORBA::RTORB::InvalidThreadpool>::insert (
+      _tao_any,
+      RTCORBA::RTORB::InvalidThreadpool::_tao_any_destructor,
+      RTCORBA::RTORB::_tc_InvalidThreadpool,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    RTCORBA::RTORB::InvalidThreadpool *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const RTCORBA::RTORB::InvalidThreadpool *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const RTCORBA::RTORB::InvalidThreadpool *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<RTCORBA::RTORB::InvalidThreadpool>::extract (
+        _tao_any,
+        RTCORBA::RTORB::InvalidThreadpool::_tao_any_destructor,
+        RTCORBA::RTORB::_tc_InvalidThreadpool,
+        _tao_elem
+      );
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        RTCORBA::ThreadpoolLane
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        RTCORBA::ThreadpoolLanes
+      >;
+
+  template class
+    TAO::Any_Basic_Impl_T<
+        RTCORBA::PriorityModel
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::PriorityModelPolicy
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::ThreadpoolPolicy
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::ProtocolProperties
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        RTCORBA::Protocol
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        RTCORBA::ProtocolList
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::ServerProtocolPolicy
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::ClientProtocolPolicy
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::PrivateConnectionPolicy
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::TCPProtocolProperties
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::GIOPProtocolProperties
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::UnixDomainProtocolProperties
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::SharedMemoryProtocolProperties
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::UserDatagramProtocolProperties
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::StreamControlProtocolProperties
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        RTCORBA::PriorityBand
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        RTCORBA::PriorityBands
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::PriorityBandedConnectionPolicy
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::Current
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::Mutex
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        RTCORBA::RTORB::MutexNotFound
+      >;
+
+  template class
+    TAO::Any_Dual_Impl_T<
+        RTCORBA::RTORB::InvalidThreadpool
+      >;
+
+  template class
+    TAO::Any_Impl_T<
+        RTCORBA::RTORB
+      >;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        RTCORBA::ThreadpoolLane \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        RTCORBA::ThreadpoolLanes \
+      >
+
+# pragma instantiate \
+    TAO::Any_Basic_Impl_T< \
+        RTCORBA::PriorityModel \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::PriorityModelPolicy \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::ThreadpoolPolicy \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::ProtocolProperties \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        RTCORBA::Protocol \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        RTCORBA::ProtocolList \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::ServerProtocolPolicy \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::ClientProtocolPolicy \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::PrivateConnectionPolicy \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::TCPProtocolProperties \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::GIOPProtocolProperties \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::UnixDomainProtocolProperties \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::SharedMemoryProtocolProperties \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::UserDatagramProtocolProperties \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::StreamControlProtocolProperties \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        RTCORBA::PriorityBand \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        RTCORBA::PriorityBands \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::PriorityBandedConnectionPolicy \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::Current \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::Mutex \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        RTCORBA::RTORB::MutexNotFound \
+      >
+
+# pragma instantiate \
+    TAO::Any_Dual_Impl_T< \
+        RTCORBA::RTORB::InvalidThreadpool \
+      >
+
+# pragma instantiate \
+    TAO::Any_Impl_T< \
+        RTCORBA::RTORB \
+      >
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/RTCORBA/RTCORBAC.cpp b/TAO/tao/RTCORBA/RTCORBAC.cpp
index d54c0cc9cde..f80f03d7d72 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.cpp
+++ b/TAO/tao/RTCORBA/RTCORBAC.cpp
@@ -26,15 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:303
+// be\be_codegen.cpp:302
 
 
 #include "RTCORBA.h"
 #include "tao/CDR.h"
 #include "tao/Typecode.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/Special_Basic_Arguments.h"
 #include "tao/UB_String_Arguments.h"
@@ -49,7 +46,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -73,244 +70,8 @@ RTCORBA::ProtocolProperties::_tao_decode (TAO_InputCDR &)
   return 1;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTCORBA_NativePriority[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x4e617469), 
-  ACE_NTOHL (0x76655072), 
-  ACE_NTOHL (0x696f7269), 
-  ACE_NTOHL (0x74793a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/NativePriority:1.0
-    15,
-  ACE_NTOHL (0x4e617469), 
-  ACE_NTOHL (0x76655072), 
-  ACE_NTOHL (0x696f7269), 
-  ACE_NTOHL (0x74790000),  // name = NativePriority
-    CORBA::tk_short,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_NativePriority (
-    CORBA::tk_alias,
-    sizeof (_oc_RTCORBA_NativePriority),
-    (char *) &_oc_RTCORBA_NativePriority,
-    0,
-    sizeof (RTCORBA::NativePriority)
-  );
-
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr _tc_NativePriority =
-    &_tc_TAO_tc_RTCORBA_NativePriority;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTCORBA_Priority[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
-    9,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x0),  // name = Priority
-    CORBA::tk_short,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Priority (
-    CORBA::tk_alias,
-    sizeof (_oc_RTCORBA_Priority),
-    (char *) &_oc_RTCORBA_Priority,
-    0,
-    sizeof (RTCORBA::Priority)
-  );
-
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr _tc_Priority =
-    &_tc_TAO_tc_RTCORBA_Priority;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTCORBA_NetworkPriority[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x4e657477), 
-  ACE_NTOHL (0x6f726b50), 
-  ACE_NTOHL (0x72696f72), 
-  ACE_NTOHL (0x6974793a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/NetworkPriority:1.0
-    16,
-  ACE_NTOHL (0x4e657477), 
-  ACE_NTOHL (0x6f726b50), 
-  ACE_NTOHL (0x72696f72), 
-  ACE_NTOHL (0x69747900),  // name = NetworkPriority
-    CORBA::tk_long,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_NetworkPriority (
-    CORBA::tk_alias,
-    sizeof (_oc_RTCORBA_NetworkPriority),
-    (char *) &_oc_RTCORBA_NetworkPriority,
-    0,
-    sizeof (RTCORBA::NetworkPriority)
-  );
-
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr _tc_NetworkPriority =
-    &_tc_TAO_tc_RTCORBA_NetworkPriority;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTCORBA_ThreadpoolId[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c4964), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolId:1.0
-    13,
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c4964), 
-  ACE_NTOHL (0x0),  // name = ThreadpoolId
-    CORBA::tk_ulong,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ThreadpoolId (
-    CORBA::tk_alias,
-    sizeof (_oc_RTCORBA_ThreadpoolId),
-    (char *) &_oc_RTCORBA_ThreadpoolId,
-    0,
-    sizeof (RTCORBA::ThreadpoolId)
-  );
-
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr _tc_ThreadpoolId =
-    &_tc_TAO_tc_RTCORBA_ThreadpoolId;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTCORBA_ThreadpoolLane[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  39,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c4c61), 
-  ACE_NTOHL (0x6e653a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolLane:1.0
-    15,
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c4c61), 
-  ACE_NTOHL (0x6e650000),  // name = ThreadpoolLane
-  3, // member count
-    14,
-  ACE_NTOHL (0x6c616e65), 
-  ACE_NTOHL (0x5f707269), 
-  ACE_NTOHL (0x6f726974), 
-  ACE_NTOHL (0x79000000),  // name = lane_priority
-    CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x5254434f), 
-    ACE_NTOHL (0x5242412f), 
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
-    ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
-        9,
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
-    ACE_NTOHL (0x0),  // name = Priority
-        CORBA::tk_short,
-
-
-  15,
-  ACE_NTOHL (0x73746174), 
-  ACE_NTOHL (0x69635f74), 
-  ACE_NTOHL (0x68726561), 
-  ACE_NTOHL (0x64730000),  // name = static_threads
-    CORBA::tk_ulong,
-
-  16,
-  ACE_NTOHL (0x64796e61), 
-  ACE_NTOHL (0x6d69635f), 
-  ACE_NTOHL (0x74687265), 
-  ACE_NTOHL (0x61647300),  // name = dynamic_threads
-    CORBA::tk_ulong,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ThreadpoolLane (
-    CORBA::tk_struct,
-    sizeof (_oc_RTCORBA_ThreadpoolLane),
-    (char *) &_oc_RTCORBA_ThreadpoolLane,
-    0,
-    sizeof (RTCORBA::ThreadpoolLane)
-  );
-
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr _tc_ThreadpoolLane =
-    &_tc_TAO_tc_RTCORBA_ThreadpoolLane;
-}
-
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:66
+// be\be_visitor_structure/structure_cs.cpp:66
 
 void 
 RTCORBA::ThreadpoolLane::_tao_any_destructor (
@@ -323,7 +84,7 @@ RTCORBA::ThreadpoolLane::_tao_any_destructor (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_cs.cpp:65
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_RTCORBA_THREADPOOLLANES_CS_)
 #define _RTCORBA_THREADPOOLLANES_CS_
@@ -376,160 +137,7 @@ void RTCORBA::ThreadpoolLanes::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTCORBA_ThreadpoolLanes[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  40,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c4c61), 
-  ACE_NTOHL (0x6e65733a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolLanes:1.0
-    16,
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c4c61), 
-  ACE_NTOHL (0x6e657300),  // name = ThreadpoolLanes
-    CORBA::tk_sequence, // typecode kind
-  228, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    212, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      39,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x5254434f), 
-      ACE_NTOHL (0x5242412f), 
-      ACE_NTOHL (0x54687265), 
-      ACE_NTOHL (0x6164706f), 
-      ACE_NTOHL (0x6f6c4c61), 
-      ACE_NTOHL (0x6e653a31), 
-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolLane:1.0
-            15,
-      ACE_NTOHL (0x54687265), 
-      ACE_NTOHL (0x6164706f), 
-      ACE_NTOHL (0x6f6c4c61), 
-      ACE_NTOHL (0x6e650000),  // name = ThreadpoolLane
-      3, // member count
-            14,
-      ACE_NTOHL (0x6c616e65), 
-      ACE_NTOHL (0x5f707269), 
-      ACE_NTOHL (0x6f726974), 
-      ACE_NTOHL (0x79000000),  // name = lane_priority
-            CORBA::tk_alias, // typecode kind for typedefs
-      64, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x5254434f), 
-        ACE_NTOHL (0x5242412f), 
-        ACE_NTOHL (0x5072696f), 
-        ACE_NTOHL (0x72697479), 
-        ACE_NTOHL (0x3a312e30), 
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
-                9,
-        ACE_NTOHL (0x5072696f), 
-        ACE_NTOHL (0x72697479), 
-        ACE_NTOHL (0x0),  // name = Priority
-                CORBA::tk_short,
-
-
-      15,
-      ACE_NTOHL (0x73746174), 
-      ACE_NTOHL (0x69635f74), 
-      ACE_NTOHL (0x68726561), 
-      ACE_NTOHL (0x64730000),  // name = static_threads
-            CORBA::tk_ulong,
-
-      16,
-      ACE_NTOHL (0x64796e61), 
-      ACE_NTOHL (0x6d69635f), 
-      ACE_NTOHL (0x74687265), 
-      ACE_NTOHL (0x61647300),  // name = dynamic_threads
-            CORBA::tk_ulong,
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ThreadpoolLanes (
-    CORBA::tk_alias,
-    sizeof (_oc_RTCORBA_ThreadpoolLanes),
-    (char *) &_oc_RTCORBA_ThreadpoolLanes,
-    0,
-    sizeof (RTCORBA::ThreadpoolLanes)
-  );
-
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr _tc_ThreadpoolLanes =
-    &_tc_TAO_tc_RTCORBA_ThreadpoolLanes;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTCORBA_PriorityModel[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x4d6f6465), 
-  ACE_NTOHL (0x6c3a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/PriorityModel:1.0
-  14,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x4d6f6465), 
-  ACE_NTOHL (0x6c000000),  // name = PriorityModel
-  2, // member count
-  18,
-  ACE_NTOHL (0x434c4945), 
-  ACE_NTOHL (0x4e545f50), 
-  ACE_NTOHL (0x524f5041), 
-  ACE_NTOHL (0x47415445), 
-  ACE_NTOHL (0x44000000),  // name = CLIENT_PROPAGATED
-  16,
-  ACE_NTOHL (0x53455256), 
-  ACE_NTOHL (0x45525f44), 
-  ACE_NTOHL (0x45434c41), 
-  ACE_NTOHL (0x52454400),  // name = SERVER_DECLARED
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityModel (
-    CORBA::tk_enum,
-    sizeof (_oc_RTCORBA_PriorityModel),
-    (char *) &_oc_RTCORBA_PriorityModel,
-    0,
-    sizeof (RTCORBA::PriorityModel)
-  );
-
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr _tc_PriorityModel =
-    &_tc_TAO_tc_RTCORBA_PriorityModel;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::PriorityModelPolicy.
 
@@ -568,12 +176,6 @@ TAO::Objref_Traits<RTCORBA::PriorityModelPolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*RTCORBA__TAO_PriorityModelPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 RTCORBA::PriorityModelPolicy::PriorityModelPolicy (void)
 {}
 
@@ -641,22 +243,22 @@ RTCORBA::PriorityModelPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/RTCORBA/PriorityModelPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -678,47 +280,7 @@ RTCORBA::PriorityModelPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTCORBA_PriorityModelPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  44,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x4d6f6465), 
-  ACE_NTOHL (0x6c506f6c), 
-  ACE_NTOHL (0x6963793a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/PriorityModelPolicy:1.0
-    20,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x4d6f6465), 
-  ACE_NTOHL (0x6c506f6c), 
-  ACE_NTOHL (0x69637900),  // name = PriorityModelPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityModelPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_PriorityModelPolicy),
-    (char *) &_oc_RTCORBA_PriorityModelPolicy,
-    0,
-    sizeof (RTCORBA::PriorityModelPolicy)
-  );
-
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr _tc_PriorityModelPolicy =
-    &_tc_TAO_tc_RTCORBA_PriorityModelPolicy;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::ThreadpoolPolicy.
 
@@ -757,12 +319,6 @@ TAO::Objref_Traits<RTCORBA::ThreadpoolPolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*RTCORBA__TAO_ThreadpoolPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 RTCORBA::ThreadpoolPolicy::ThreadpoolPolicy (void)
 {}
 
@@ -830,22 +386,22 @@ RTCORBA::ThreadpoolPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/RTCORBA/ThreadpoolPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -867,47 +423,7 @@ RTCORBA::ThreadpoolPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTCORBA_ThreadpoolPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  41,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ThreadpoolPolicy:1.0
-    17,
-  ACE_NTOHL (0x54687265), 
-  ACE_NTOHL (0x6164706f), 
-  ACE_NTOHL (0x6f6c506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x0),  // name = ThreadpoolPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ThreadpoolPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_ThreadpoolPolicy),
-    (char *) &_oc_RTCORBA_ThreadpoolPolicy,
-    0,
-    sizeof (RTCORBA::ThreadpoolPolicy)
-  );
-
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr _tc_ThreadpoolPolicy =
-    &_tc_TAO_tc_RTCORBA_ThreadpoolPolicy;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::ProtocolProperties.
 
@@ -946,12 +462,6 @@ TAO::Objref_Traits<RTCORBA::ProtocolProperties>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*RTCORBA__TAO_ProtocolProperties_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 RTCORBA::ProtocolProperties::ProtocolProperties (void)
 {}
 
@@ -1019,18 +529,18 @@ RTCORBA::ProtocolProperties::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/RTCORBA/ProtocolProperties:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1051,169 +561,8 @@ RTCORBA::ProtocolProperties::marshal (TAO_OutputCDR &)
   return 0;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTCORBA_ProtocolProperties[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  43,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727469), 
-  ACE_NTOHL (0x65733a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
-    19,
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727469), 
-  ACE_NTOHL (0x65730000),  // name = ProtocolProperties
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ProtocolProperties (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_ProtocolProperties),
-    (char *) &_oc_RTCORBA_ProtocolProperties,
-    0,
-    sizeof (RTCORBA::ProtocolProperties)
-  );
-
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr _tc_ProtocolProperties =
-    &_tc_TAO_tc_RTCORBA_ProtocolProperties;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTCORBA_Protocol[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Protocol:1.0
-    9,
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x0),  // name = Protocol
-  3, // member count
-    14,
-  ACE_NTOHL (0x70726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x5f747970), 
-  ACE_NTOHL (0x65000000),  // name = protocol_type
-    CORBA::tk_alias, // typecode kind for typedefs
-  60, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    30,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x494f502f), 
-    ACE_NTOHL (0x50726f66), 
-    ACE_NTOHL (0x696c6549), 
-    ACE_NTOHL (0x643a312e), 
-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-        10,
-    ACE_NTOHL (0x50726f66), 
-    ACE_NTOHL (0x696c6549), 
-    ACE_NTOHL (0x64000000),  // name = ProfileId
-        CORBA::tk_ulong,
-
-
-  24,
-  ACE_NTOHL (0x6f72625f), 
-  ACE_NTOHL (0x70726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x5f70726f), 
-  ACE_NTOHL (0x70657274), 
-  ACE_NTOHL (0x69657300),  // name = orb_protocol_properties
-    CORBA::tk_objref, // typecode kind
-  76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    43,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x5254434f), 
-    ACE_NTOHL (0x5242412f), 
-    ACE_NTOHL (0x50726f74), 
-    ACE_NTOHL (0x6f636f6c), 
-    ACE_NTOHL (0x50726f70), 
-    ACE_NTOHL (0x65727469), 
-    ACE_NTOHL (0x65733a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
-        19,
-    ACE_NTOHL (0x50726f74), 
-    ACE_NTOHL (0x6f636f6c), 
-    ACE_NTOHL (0x50726f70), 
-    ACE_NTOHL (0x65727469), 
-    ACE_NTOHL (0x65730000),  // name = ProtocolProperties
-    
-  30,
-  ACE_NTOHL (0x7472616e), 
-  ACE_NTOHL (0x73706f72), 
-  ACE_NTOHL (0x745f7072), 
-  ACE_NTOHL (0x6f746f63), 
-  ACE_NTOHL (0x6f6c5f70), 
-  ACE_NTOHL (0x726f7065), 
-  ACE_NTOHL (0x72746965), 
-  ACE_NTOHL (0x73000000),  // name = transport_protocol_properties
-    CORBA::tk_objref, // typecode kind
-  76, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    43,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x5254434f), 
-    ACE_NTOHL (0x5242412f), 
-    ACE_NTOHL (0x50726f74), 
-    ACE_NTOHL (0x6f636f6c), 
-    ACE_NTOHL (0x50726f70), 
-    ACE_NTOHL (0x65727469), 
-    ACE_NTOHL (0x65733a31), 
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
-        19,
-    ACE_NTOHL (0x50726f74), 
-    ACE_NTOHL (0x6f636f6c), 
-    ACE_NTOHL (0x50726f70), 
-    ACE_NTOHL (0x65727469), 
-    ACE_NTOHL (0x65730000),  // name = ProtocolProperties
-    
-};
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Protocol (
-    CORBA::tk_struct,
-    sizeof (_oc_RTCORBA_Protocol),
-    (char *) &_oc_RTCORBA_Protocol,
-    0,
-    sizeof (RTCORBA::Protocol)
-  );
-
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr _tc_Protocol =
-    &_tc_TAO_tc_RTCORBA_Protocol;
-}
-
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:66
+// be\be_visitor_structure/structure_cs.cpp:66
 
 void 
 RTCORBA::Protocol::_tao_any_destructor (
@@ -1226,7 +575,7 @@ RTCORBA::Protocol::_tao_any_destructor (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_cs.cpp:65
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_RTCORBA_PROTOCOLLIST_CS_)
 #define _RTCORBA_PROTOCOLLIST_CS_
@@ -1279,153 +628,7 @@ void RTCORBA::ProtocolList::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTCORBA_ProtocolList[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ProtocolList:1.0
-    13,
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x4c697374), 
-  ACE_NTOHL (0x0),  // name = ProtocolList
-    CORBA::tk_sequence, // typecode kind
-  400, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    384, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      33,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x5254434f), 
-      ACE_NTOHL (0x5242412f), 
-      ACE_NTOHL (0x50726f74), 
-      ACE_NTOHL (0x6f636f6c), 
-      ACE_NTOHL (0x3a312e30), 
-      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Protocol:1.0
-            9,
-      ACE_NTOHL (0x50726f74), 
-      ACE_NTOHL (0x6f636f6c), 
-      ACE_NTOHL (0x0),  // name = Protocol
-      3, // member count
-            14,
-      ACE_NTOHL (0x70726f74), 
-      ACE_NTOHL (0x6f636f6c), 
-      ACE_NTOHL (0x5f747970), 
-      ACE_NTOHL (0x65000000),  // name = protocol_type
-            CORBA::tk_alias, // typecode kind for typedefs
-      60, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        30,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x494f502f), 
-        ACE_NTOHL (0x50726f66), 
-        ACE_NTOHL (0x696c6549), 
-        ACE_NTOHL (0x643a312e), 
-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-                10,
-        ACE_NTOHL (0x50726f66), 
-        ACE_NTOHL (0x696c6549), 
-        ACE_NTOHL (0x64000000),  // name = ProfileId
-                CORBA::tk_ulong,
-
-
-      24,
-      ACE_NTOHL (0x6f72625f), 
-      ACE_NTOHL (0x70726f74), 
-      ACE_NTOHL (0x6f636f6c), 
-      ACE_NTOHL (0x5f70726f), 
-      ACE_NTOHL (0x70657274), 
-      ACE_NTOHL (0x69657300),  // name = orb_protocol_properties
-            CORBA::tk_objref, // typecode kind
-      76, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        43,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x5254434f), 
-        ACE_NTOHL (0x5242412f), 
-        ACE_NTOHL (0x50726f74), 
-        ACE_NTOHL (0x6f636f6c), 
-        ACE_NTOHL (0x50726f70), 
-        ACE_NTOHL (0x65727469), 
-        ACE_NTOHL (0x65733a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
-                19,
-        ACE_NTOHL (0x50726f74), 
-        ACE_NTOHL (0x6f636f6c), 
-        ACE_NTOHL (0x50726f70), 
-        ACE_NTOHL (0x65727469), 
-        ACE_NTOHL (0x65730000),  // name = ProtocolProperties
-        
-      30,
-      ACE_NTOHL (0x7472616e), 
-      ACE_NTOHL (0x73706f72), 
-      ACE_NTOHL (0x745f7072), 
-      ACE_NTOHL (0x6f746f63), 
-      ACE_NTOHL (0x6f6c5f70), 
-      ACE_NTOHL (0x726f7065), 
-      ACE_NTOHL (0x72746965), 
-      ACE_NTOHL (0x73000000),  // name = transport_protocol_properties
-            CORBA::tk_objref, // typecode kind
-      76, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        43,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x5254434f), 
-        ACE_NTOHL (0x5242412f), 
-        ACE_NTOHL (0x50726f74), 
-        ACE_NTOHL (0x6f636f6c), 
-        ACE_NTOHL (0x50726f70), 
-        ACE_NTOHL (0x65727469), 
-        ACE_NTOHL (0x65733a31), 
-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/ProtocolProperties:1.0
-                19,
-        ACE_NTOHL (0x50726f74), 
-        ACE_NTOHL (0x6f636f6c), 
-        ACE_NTOHL (0x50726f70), 
-        ACE_NTOHL (0x65727469), 
-        ACE_NTOHL (0x65730000),  // name = ProtocolProperties
-        
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ProtocolList (
-    CORBA::tk_alias,
-    sizeof (_oc_RTCORBA_ProtocolList),
-    (char *) &_oc_RTCORBA_ProtocolList,
-    0,
-    sizeof (RTCORBA::ProtocolList)
-  );
-
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr _tc_ProtocolList =
-    &_tc_TAO_tc_RTCORBA_ProtocolList;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::ServerProtocolPolicy.
 
@@ -1464,12 +667,6 @@ TAO::Objref_Traits<RTCORBA::ServerProtocolPolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*RTCORBA__TAO_ServerProtocolPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 RTCORBA::ServerProtocolPolicy::ServerProtocolPolicy (void)
 {}
 
@@ -1537,22 +734,22 @@ RTCORBA::ServerProtocolPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/RTCORBA/ServerProtocolPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1574,49 +771,7 @@ RTCORBA::ServerProtocolPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTCORBA_ServerProtocolPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  45,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65725072), 
-  ACE_NTOHL (0x6f746f63), 
-  ACE_NTOHL (0x6f6c506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ServerProtocolPolicy:1.0
-    21,
-  ACE_NTOHL (0x53657276), 
-  ACE_NTOHL (0x65725072), 
-  ACE_NTOHL (0x6f746f63), 
-  ACE_NTOHL (0x6f6c506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x0),  // name = ServerProtocolPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ServerProtocolPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_ServerProtocolPolicy),
-    (char *) &_oc_RTCORBA_ServerProtocolPolicy,
-    0,
-    sizeof (RTCORBA::ServerProtocolPolicy)
-  );
-
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr _tc_ServerProtocolPolicy =
-    &_tc_TAO_tc_RTCORBA_ServerProtocolPolicy;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::ClientProtocolPolicy.
 
@@ -1655,12 +810,6 @@ TAO::Objref_Traits<RTCORBA::ClientProtocolPolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*RTCORBA__TAO_ClientProtocolPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 RTCORBA::ClientProtocolPolicy::ClientProtocolPolicy (void)
 {}
 
@@ -1728,22 +877,22 @@ RTCORBA::ClientProtocolPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/RTCORBA/ClientProtocolPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1765,49 +914,7 @@ RTCORBA::ClientProtocolPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTCORBA_ClientProtocolPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  45,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x436c6965), 
-  ACE_NTOHL (0x6e745072), 
-  ACE_NTOHL (0x6f746f63), 
-  ACE_NTOHL (0x6f6c506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/ClientProtocolPolicy:1.0
-    21,
-  ACE_NTOHL (0x436c6965), 
-  ACE_NTOHL (0x6e745072), 
-  ACE_NTOHL (0x6f746f63), 
-  ACE_NTOHL (0x6f6c506f), 
-  ACE_NTOHL (0x6c696379), 
-  ACE_NTOHL (0x0),  // name = ClientProtocolPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_ClientProtocolPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_ClientProtocolPolicy),
-    (char *) &_oc_RTCORBA_ClientProtocolPolicy,
-    0,
-    sizeof (RTCORBA::ClientProtocolPolicy)
-  );
-
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr _tc_ClientProtocolPolicy =
-    &_tc_TAO_tc_RTCORBA_ClientProtocolPolicy;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::PrivateConnectionPolicy.
 
@@ -1846,12 +953,6 @@ TAO::Objref_Traits<RTCORBA::PrivateConnectionPolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*RTCORBA__TAO_PrivateConnectionPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 RTCORBA::PrivateConnectionPolicy::PrivateConnectionPolicy (void)
 {}
 
@@ -1919,22 +1020,22 @@ RTCORBA::PrivateConnectionPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/RTCORBA/PrivateConnectionPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1956,49 +1057,7 @@ RTCORBA::PrivateConnectionPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTCORBA_PrivateConnectionPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  48,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x50726976), 
-  ACE_NTOHL (0x61746543), 
-  ACE_NTOHL (0x6f6e6e65), 
-  ACE_NTOHL (0x6374696f), 
-  ACE_NTOHL (0x6e506f6c), 
-  ACE_NTOHL (0x6963793a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/PrivateConnectionPolicy:1.0
-    24,
-  ACE_NTOHL (0x50726976), 
-  ACE_NTOHL (0x61746543), 
-  ACE_NTOHL (0x6f6e6e65), 
-  ACE_NTOHL (0x6374696f), 
-  ACE_NTOHL (0x6e506f6c), 
-  ACE_NTOHL (0x69637900),  // name = PrivateConnectionPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PrivateConnectionPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_PrivateConnectionPolicy),
-    (char *) &_oc_RTCORBA_PrivateConnectionPolicy,
-    0,
-    sizeof (RTCORBA::PrivateConnectionPolicy)
-  );
-
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr _tc_PrivateConnectionPolicy =
-    &_tc_TAO_tc_RTCORBA_PrivateConnectionPolicy;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::TCPProtocolProperties.
 
@@ -2037,12 +1096,6 @@ TAO::Objref_Traits<RTCORBA::TCPProtocolProperties>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*RTCORBA__TAO_TCPProtocolProperties_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 RTCORBA::TCPProtocolProperties::TCPProtocolProperties (void)
 {}
 
@@ -2110,22 +1163,22 @@ RTCORBA::TCPProtocolProperties::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/RTCORBA/ProtocolProperties:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/RTCORBA/TCPProtocolProperties:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -2147,49 +1200,7 @@ RTCORBA::TCPProtocolProperties::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTCORBA_TCPProtocolProperties[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  46,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x54435050), 
-  ACE_NTOHL (0x726f746f), 
-  ACE_NTOHL (0x636f6c50), 
-  ACE_NTOHL (0x726f7065), 
-  ACE_NTOHL (0x72746965), 
-  ACE_NTOHL (0x733a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/TCPProtocolProperties:1.0
-    22,
-  ACE_NTOHL (0x54435050), 
-  ACE_NTOHL (0x726f746f), 
-  ACE_NTOHL (0x636f6c50), 
-  ACE_NTOHL (0x726f7065), 
-  ACE_NTOHL (0x72746965), 
-  ACE_NTOHL (0x73000000),  // name = TCPProtocolProperties
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_TCPProtocolProperties (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_TCPProtocolProperties),
-    (char *) &_oc_RTCORBA_TCPProtocolProperties,
-    0,
-    sizeof (RTCORBA::TCPProtocolProperties)
-  );
-
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr _tc_TCPProtocolProperties =
-    &_tc_TAO_tc_RTCORBA_TCPProtocolProperties;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::GIOPProtocolProperties.
 
@@ -2228,12 +1239,6 @@ TAO::Objref_Traits<RTCORBA::GIOPProtocolProperties>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*RTCORBA__TAO_GIOPProtocolProperties_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 RTCORBA::GIOPProtocolProperties::GIOPProtocolProperties (void)
 {}
 
@@ -2301,22 +1306,22 @@ RTCORBA::GIOPProtocolProperties::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/RTCORBA/ProtocolProperties:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/RTCORBA/GIOPProtocolProperties:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -2338,49 +1343,7 @@ RTCORBA::GIOPProtocolProperties::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTCORBA_GIOPProtocolProperties[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  47,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x47494f50), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727469), 
-  ACE_NTOHL (0x65733a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/GIOPProtocolProperties:1.0
-    23,
-  ACE_NTOHL (0x47494f50), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727469), 
-  ACE_NTOHL (0x65730000),  // name = GIOPProtocolProperties
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_GIOPProtocolProperties (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_GIOPProtocolProperties),
-    (char *) &_oc_RTCORBA_GIOPProtocolProperties,
-    0,
-    sizeof (RTCORBA::GIOPProtocolProperties)
-  );
-
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr _tc_GIOPProtocolProperties =
-    &_tc_TAO_tc_RTCORBA_GIOPProtocolProperties;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::UnixDomainProtocolProperties.
 
@@ -2419,12 +1382,6 @@ TAO::Objref_Traits<RTCORBA::UnixDomainProtocolProperties>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*RTCORBA__TAO_UnixDomainProtocolProperties_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 RTCORBA::UnixDomainProtocolProperties::UnixDomainProtocolProperties (void)
 {}
 
@@ -2492,22 +1449,22 @@ RTCORBA::UnixDomainProtocolProperties::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/RTCORBA/ProtocolProperties:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/RTCORBA/UnixDomainProtocolProperties:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -2529,53 +1486,7 @@ RTCORBA::UnixDomainProtocolProperties::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTCORBA_UnixDomainProtocolProperties[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  53,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x556e6978), 
-  ACE_NTOHL (0x446f6d61), 
-  ACE_NTOHL (0x696e5072), 
-  ACE_NTOHL (0x6f746f63), 
-  ACE_NTOHL (0x6f6c5072), 
-  ACE_NTOHL (0x6f706572), 
-  ACE_NTOHL (0x74696573), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/UnixDomainProtocolProperties:1.0
-    29,
-  ACE_NTOHL (0x556e6978), 
-  ACE_NTOHL (0x446f6d61), 
-  ACE_NTOHL (0x696e5072), 
-  ACE_NTOHL (0x6f746f63), 
-  ACE_NTOHL (0x6f6c5072), 
-  ACE_NTOHL (0x6f706572), 
-  ACE_NTOHL (0x74696573), 
-  ACE_NTOHL (0x0),  // name = UnixDomainProtocolProperties
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_UnixDomainProtocolProperties (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_UnixDomainProtocolProperties),
-    (char *) &_oc_RTCORBA_UnixDomainProtocolProperties,
-    0,
-    sizeof (RTCORBA::UnixDomainProtocolProperties)
-  );
-
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr _tc_UnixDomainProtocolProperties =
-    &_tc_TAO_tc_RTCORBA_UnixDomainProtocolProperties;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::SharedMemoryProtocolProperties.
 
@@ -2614,12 +1525,6 @@ TAO::Objref_Traits<RTCORBA::SharedMemoryProtocolProperties>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*RTCORBA__TAO_SharedMemoryProtocolProperties_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 RTCORBA::SharedMemoryProtocolProperties::SharedMemoryProtocolProperties (void)
 {}
 
@@ -2687,22 +1592,22 @@ RTCORBA::SharedMemoryProtocolProperties::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/RTCORBA/ProtocolProperties:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/RTCORBA/SharedMemoryProtocolProperties:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -2724,53 +1629,7 @@ RTCORBA::SharedMemoryProtocolProperties::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTCORBA_SharedMemoryProtocolProperties[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  55,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x53686172), 
-  ACE_NTOHL (0x65644d65), 
-  ACE_NTOHL (0x6d6f7279), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727469), 
-  ACE_NTOHL (0x65733a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/SharedMemoryProtocolProperties:1.0
-    31,
-  ACE_NTOHL (0x53686172), 
-  ACE_NTOHL (0x65644d65), 
-  ACE_NTOHL (0x6d6f7279), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727469), 
-  ACE_NTOHL (0x65730000),  // name = SharedMemoryProtocolProperties
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_SharedMemoryProtocolProperties (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_SharedMemoryProtocolProperties),
-    (char *) &_oc_RTCORBA_SharedMemoryProtocolProperties,
-    0,
-    sizeof (RTCORBA::SharedMemoryProtocolProperties)
-  );
-
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr _tc_SharedMemoryProtocolProperties =
-    &_tc_TAO_tc_RTCORBA_SharedMemoryProtocolProperties;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::UserDatagramProtocolProperties.
 
@@ -2809,12 +1668,6 @@ TAO::Objref_Traits<RTCORBA::UserDatagramProtocolProperties>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*RTCORBA__TAO_UserDatagramProtocolProperties_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 RTCORBA::UserDatagramProtocolProperties::UserDatagramProtocolProperties (void)
 {}
 
@@ -2882,22 +1735,22 @@ RTCORBA::UserDatagramProtocolProperties::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/RTCORBA/ProtocolProperties:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/RTCORBA/UserDatagramProtocolProperties:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -2919,53 +1772,7 @@ RTCORBA::UserDatagramProtocolProperties::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTCORBA_UserDatagramProtocolProperties[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  55,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x55736572), 
-  ACE_NTOHL (0x44617461), 
-  ACE_NTOHL (0x6772616d), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727469), 
-  ACE_NTOHL (0x65733a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/UserDatagramProtocolProperties:1.0
-    31,
-  ACE_NTOHL (0x55736572), 
-  ACE_NTOHL (0x44617461), 
-  ACE_NTOHL (0x6772616d), 
-  ACE_NTOHL (0x50726f74), 
-  ACE_NTOHL (0x6f636f6c), 
-  ACE_NTOHL (0x50726f70), 
-  ACE_NTOHL (0x65727469), 
-  ACE_NTOHL (0x65730000),  // name = UserDatagramProtocolProperties
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_UserDatagramProtocolProperties (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_UserDatagramProtocolProperties),
-    (char *) &_oc_RTCORBA_UserDatagramProtocolProperties,
-    0,
-    sizeof (RTCORBA::UserDatagramProtocolProperties)
-  );
-
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr _tc_UserDatagramProtocolProperties =
-    &_tc_TAO_tc_RTCORBA_UserDatagramProtocolProperties;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::StreamControlProtocolProperties.
 
@@ -3004,12 +1811,6 @@ TAO::Objref_Traits<RTCORBA::StreamControlProtocolProperties>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*RTCORBA__TAO_StreamControlProtocolProperties_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 RTCORBA::StreamControlProtocolProperties::StreamControlProtocolProperties (void)
 {}
 
@@ -3077,22 +1878,22 @@ RTCORBA::StreamControlProtocolProperties::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/RTCORBA/ProtocolProperties:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/RTCORBA/StreamControlProtocolProperties:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -3113,138 +1914,8 @@ RTCORBA::StreamControlProtocolProperties::marshal (TAO_OutputCDR &)
   return 0;
 }
 
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTCORBA_StreamControlProtocolProperties[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  56,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x53747265), 
-  ACE_NTOHL (0x616d436f), 
-  ACE_NTOHL (0x6e74726f), 
-  ACE_NTOHL (0x6c50726f), 
-  ACE_NTOHL (0x746f636f), 
-  ACE_NTOHL (0x6c50726f), 
-  ACE_NTOHL (0x70657274), 
-  ACE_NTOHL (0x6965733a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/StreamControlProtocolProperties:1.0
-    32,
-  ACE_NTOHL (0x53747265), 
-  ACE_NTOHL (0x616d436f), 
-  ACE_NTOHL (0x6e74726f), 
-  ACE_NTOHL (0x6c50726f), 
-  ACE_NTOHL (0x746f636f), 
-  ACE_NTOHL (0x6c50726f), 
-  ACE_NTOHL (0x70657274), 
-  ACE_NTOHL (0x69657300),  // name = StreamControlProtocolProperties
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_StreamControlProtocolProperties (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_StreamControlProtocolProperties),
-    (char *) &_oc_RTCORBA_StreamControlProtocolProperties,
-    0,
-    sizeof (RTCORBA::StreamControlProtocolProperties)
-  );
-
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr _tc_StreamControlProtocolProperties =
-    &_tc_TAO_tc_RTCORBA_StreamControlProtocolProperties;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTCORBA_PriorityBand[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x42616e64), 
-  ACE_NTOHL (0x3a312e30), 
-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/PriorityBand:1.0
-    13,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x42616e64), 
-  ACE_NTOHL (0x0),  // name = PriorityBand
-  2, // member count
-    4,
-  ACE_NTOHL (0x6c6f7700),  // name = low
-    CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x5254434f), 
-    ACE_NTOHL (0x5242412f), 
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
-    ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
-        9,
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
-    ACE_NTOHL (0x0),  // name = Priority
-        CORBA::tk_short,
-
-
-  5,
-  ACE_NTOHL (0x68696768), 
-  ACE_NTOHL (0x0),  // name = high
-    CORBA::tk_alias, // typecode kind for typedefs
-  64, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    33,
-    ACE_NTOHL (0x49444c3a), 
-    ACE_NTOHL (0x6f6d672e), 
-    ACE_NTOHL (0x6f72672f), 
-    ACE_NTOHL (0x5254434f), 
-    ACE_NTOHL (0x5242412f), 
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
-    ACE_NTOHL (0x3a312e30), 
-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
-        9,
-    ACE_NTOHL (0x5072696f), 
-    ACE_NTOHL (0x72697479), 
-    ACE_NTOHL (0x0),  // name = Priority
-        CORBA::tk_short,
-
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityBand (
-    CORBA::tk_struct,
-    sizeof (_oc_RTCORBA_PriorityBand),
-    (char *) &_oc_RTCORBA_PriorityBand,
-    0,
-    sizeof (RTCORBA::PriorityBand)
-  );
-
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr _tc_PriorityBand =
-    &_tc_TAO_tc_RTCORBA_PriorityBand;
-}
-
 // TAO_IDL - Generated from 
-// be/be_visitor_structure/structure_cs.cpp:66
+// be\be_visitor_structure/structure_cs.cpp:66
 
 void 
 RTCORBA::PriorityBand::_tao_any_destructor (
@@ -3257,7 +1928,7 @@ RTCORBA::PriorityBand::_tao_any_destructor (
 }
 
 // TAO_IDL - Generated from 
-// be/be_visitor_sequence/sequence_cs.cpp:65
+// be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_RTCORBA_PRIORITYBANDS_CS_)
 #define _RTCORBA_PRIORITYBANDS_CS_
@@ -3310,116 +1981,7 @@ void RTCORBA::PriorityBands::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTCORBA_PriorityBands[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x42616e64), 
-  ACE_NTOHL (0x733a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/PriorityBands:1.0
-    14,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x42616e64), 
-  ACE_NTOHL (0x73000000),  // name = PriorityBands
-    CORBA::tk_sequence, // typecode kind
-  252, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_struct, // typecode kind
-    236, // encapsulation length
-      TAO_ENCAP_BYTE_ORDER, // byte order
-      37,
-      ACE_NTOHL (0x49444c3a), 
-      ACE_NTOHL (0x6f6d672e), 
-      ACE_NTOHL (0x6f72672f), 
-      ACE_NTOHL (0x5254434f), 
-      ACE_NTOHL (0x5242412f), 
-      ACE_NTOHL (0x5072696f), 
-      ACE_NTOHL (0x72697479), 
-      ACE_NTOHL (0x42616e64), 
-      ACE_NTOHL (0x3a312e30), 
-      ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/PriorityBand:1.0
-            13,
-      ACE_NTOHL (0x5072696f), 
-      ACE_NTOHL (0x72697479), 
-      ACE_NTOHL (0x42616e64), 
-      ACE_NTOHL (0x0),  // name = PriorityBand
-      2, // member count
-            4,
-      ACE_NTOHL (0x6c6f7700),  // name = low
-            CORBA::tk_alias, // typecode kind for typedefs
-      64, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x5254434f), 
-        ACE_NTOHL (0x5242412f), 
-        ACE_NTOHL (0x5072696f), 
-        ACE_NTOHL (0x72697479), 
-        ACE_NTOHL (0x3a312e30), 
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
-                9,
-        ACE_NTOHL (0x5072696f), 
-        ACE_NTOHL (0x72697479), 
-        ACE_NTOHL (0x0),  // name = Priority
-                CORBA::tk_short,
-
-
-      5,
-      ACE_NTOHL (0x68696768), 
-      ACE_NTOHL (0x0),  // name = high
-            CORBA::tk_alias, // typecode kind for typedefs
-      64, // encapsulation length
-        TAO_ENCAP_BYTE_ORDER, // byte order
-        33,
-        ACE_NTOHL (0x49444c3a), 
-        ACE_NTOHL (0x6f6d672e), 
-        ACE_NTOHL (0x6f72672f), 
-        ACE_NTOHL (0x5254434f), 
-        ACE_NTOHL (0x5242412f), 
-        ACE_NTOHL (0x5072696f), 
-        ACE_NTOHL (0x72697479), 
-        ACE_NTOHL (0x3a312e30), 
-        ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTCORBA/Priority:1.0
-                9,
-        ACE_NTOHL (0x5072696f), 
-        ACE_NTOHL (0x72697479), 
-        ACE_NTOHL (0x0),  // name = Priority
-                CORBA::tk_short,
-
-
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityBands (
-    CORBA::tk_alias,
-    sizeof (_oc_RTCORBA_PriorityBands),
-    (char *) &_oc_RTCORBA_PriorityBands,
-    0,
-    sizeof (RTCORBA::PriorityBands)
-  );
-
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr _tc_PriorityBands =
-    &_tc_TAO_tc_RTCORBA_PriorityBands;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::PriorityBandedConnectionPolicy.
 
@@ -3458,12 +2020,6 @@ TAO::Objref_Traits<RTCORBA::PriorityBandedConnectionPolicy>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*RTCORBA__TAO_PriorityBandedConnectionPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 RTCORBA::PriorityBandedConnectionPolicy::PriorityBandedConnectionPolicy (void)
 {}
 
@@ -3531,22 +2087,22 @@ RTCORBA::PriorityBandedConnectionPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/RTCORBA/PriorityBandedConnectionPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -3568,53 +2124,7 @@ RTCORBA::PriorityBandedConnectionPolicy::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTCORBA_PriorityBandedConnectionPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  55,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x42616e64), 
-  ACE_NTOHL (0x6564436f), 
-  ACE_NTOHL (0x6e6e6563), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63793a31), 
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/RTCORBA/PriorityBandedConnectionPolicy:1.0
-    31,
-  ACE_NTOHL (0x5072696f), 
-  ACE_NTOHL (0x72697479), 
-  ACE_NTOHL (0x42616e64), 
-  ACE_NTOHL (0x6564436f), 
-  ACE_NTOHL (0x6e6e6563), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x506f6c69), 
-  ACE_NTOHL (0x63790000),  // name = PriorityBandedConnectionPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_PriorityBandedConnectionPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_PriorityBandedConnectionPolicy),
-    (char *) &_oc_RTCORBA_PriorityBandedConnectionPolicy,
-    0,
-    sizeof (RTCORBA::PriorityBandedConnectionPolicy)
-  );
-
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr _tc_PriorityBandedConnectionPolicy =
-    &_tc_TAO_tc_RTCORBA_PriorityBandedConnectionPolicy;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::Current.
 
@@ -3653,12 +2163,6 @@ TAO::Objref_Traits<RTCORBA::Current>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*RTCORBA__TAO_Current_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 RTCORBA::Current::Current (void)
 {}
 
@@ -3726,22 +2230,22 @@ RTCORBA::Current::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Current:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/RTCORBA/Current:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -3763,41 +2267,7 @@ RTCORBA::Current::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTCORBA_Current[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  32,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x43757272), 
-  ACE_NTOHL (0x656e743a), 
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/RTCORBA/Current:1.0
-    8,
-  ACE_NTOHL (0x43757272), 
-  ACE_NTOHL (0x656e7400),  // name = Current
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Current (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_Current),
-    (char *) &_oc_RTCORBA_Current,
-    0,
-    sizeof (RTCORBA::Current)
-  );
-
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr _tc_Current =
-    &_tc_TAO_tc_RTCORBA_Current;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::Mutex.
 
@@ -3836,12 +2306,6 @@ TAO::Objref_Traits<RTCORBA::Mutex>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*RTCORBA__TAO_Mutex_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 RTCORBA::Mutex::Mutex (void)
 {}
 
@@ -3909,18 +2373,18 @@ RTCORBA::Mutex::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/RTCORBA/Mutex:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -3942,41 +2406,7 @@ RTCORBA::Mutex::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTCORBA_Mutex[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x4d757465), 
-  ACE_NTOHL (0x783a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/Mutex:1.0
-    6,
-  ACE_NTOHL (0x4d757465), 
-  ACE_NTOHL (0x78000000),  // name = Mutex
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_Mutex (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_Mutex),
-    (char *) &_oc_RTCORBA_Mutex,
-    0,
-    sizeof (RTCORBA::Mutex)
-  );
-
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr _tc_Mutex =
-    &_tc_TAO_tc_RTCORBA_Mutex;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
+// be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTCORBA::RTORB.
 
@@ -4015,14 +2445,8 @@ TAO::Objref_Traits<RTCORBA::RTORB>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
-(*RTCORBA__TAO_RTORB_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 // TAO_IDL - Generated from 
-// be/be_visitor_exception/exception_cs.cpp:63
+// be\be_visitor_exception/exception_cs.cpp:63
 
 RTCORBA::RTORB::MutexNotFound::MutexNotFound (void)
   : CORBA::UserException (
@@ -4054,21 +2478,20 @@ RTCORBA::RTORB::MutexNotFound::operator= (const ::RTCORBA::RTORB::MutexNotFound
 void RTCORBA::RTORB::MutexNotFound::_tao_any_destructor (void *_tao_void_pointer)
 {
   MutexNotFound *_tao_tmp_pointer =
-    static_cast<MutexNotFound*> (_tao_void_pointer);
+    static_cast<MutexNotFound *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 RTCORBA::RTORB::MutexNotFound *
 RTCORBA::RTORB::MutexNotFound::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/RTCORBA/RTORB/MutexNotFound:1.0", _tao_excp->_rep_id ()))
-    {
-      return dynamic_cast<MutexNotFound *> (_tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<MutexNotFound *> (_tao_excp);
+}
+
+const RTCORBA::RTORB::MutexNotFound *
+RTCORBA::RTORB::MutexNotFound::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const MutexNotFound *> (_tao_excp);
 }
 
 CORBA::Exception *RTCORBA::RTORB::MutexNotFound::_alloc (void)
@@ -4118,7 +2541,7 @@ CORBA::TypeCode_ptr RTCORBA::RTORB::MutexNotFound::_type (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_RTCORBA_RTORB_MutexNotFound[] =
 {
@@ -4148,14 +2571,14 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_RTORB_MutexNotFound (
     sizeof (_oc_RTCORBA_RTORB_MutexNotFound),
     (char *) &_oc_RTCORBA_RTORB_MutexNotFound,
     0,
-    sizeof (RTCORBA::RTORB::MutexNotFound)
+    0
   );
 
 ::CORBA::TypeCode_ptr RTCORBA::RTORB::_tc_MutexNotFound =
   &_tc_TAO_tc_RTCORBA_RTORB_MutexNotFound;
 
 // TAO_IDL - Generated from 
-// be/be_visitor_exception/exception_cs.cpp:63
+// be\be_visitor_exception/exception_cs.cpp:63
 
 RTCORBA::RTORB::InvalidThreadpool::InvalidThreadpool (void)
   : CORBA::UserException (
@@ -4187,21 +2610,20 @@ RTCORBA::RTORB::InvalidThreadpool::operator= (const ::RTCORBA::RTORB::InvalidThr
 void RTCORBA::RTORB::InvalidThreadpool::_tao_any_destructor (void *_tao_void_pointer)
 {
   InvalidThreadpool *_tao_tmp_pointer =
-    static_cast<InvalidThreadpool*> (_tao_void_pointer);
+    static_cast<InvalidThreadpool *> (_tao_void_pointer);
   delete _tao_tmp_pointer;
 }
 
 RTCORBA::RTORB::InvalidThreadpool *
 RTCORBA::RTORB::InvalidThreadpool::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:omg.org/RTCORBA/RTORB/InvalidThreadpool:1.0", _tao_excp->_rep_id ()))
-    {
-      return dynamic_cast<InvalidThreadpool *> (_tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<InvalidThreadpool *> (_tao_excp);
+}
+
+const RTCORBA::RTORB::InvalidThreadpool *
+RTCORBA::RTORB::InvalidThreadpool::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const InvalidThreadpool *> (_tao_excp);
 }
 
 CORBA::Exception *RTCORBA::RTORB::InvalidThreadpool::_alloc (void)
@@ -4251,7 +2673,7 @@ CORBA::TypeCode_ptr RTCORBA::RTORB::InvalidThreadpool::_type (void) const
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_RTCORBA_RTORB_InvalidThreadpool[] =
 {
@@ -4283,7 +2705,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTCORBA_RTORB_InvalidThreadpool (
     sizeof (_oc_RTCORBA_RTORB_InvalidThreadpool),
     (char *) &_oc_RTCORBA_RTORB_InvalidThreadpool,
     0,
-    sizeof (RTCORBA::RTORB::InvalidThreadpool)
+    0
   );
 
 ::CORBA::TypeCode_ptr RTCORBA::RTORB::_tc_InvalidThreadpool =
@@ -4356,18 +2778,18 @@ RTCORBA::RTORB::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/RTCORBA/RTORB:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -4389,1693 +2811,7 @@ RTCORBA::RTORB::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTCORBA_RTORB[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  30,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x5254434f), 
-  ACE_NTOHL (0x5242412f), 
-  ACE_NTOHL (0x52544f52), 
-  ACE_NTOHL (0x423a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/RTCORBA/RTORB:1.0
-    6,
-  ACE_NTOHL (0x52544f52), 
-  ACE_NTOHL (0x42000000),  // name = RTORB
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTCORBA_RTORB (
-    CORBA::tk_objref,
-    sizeof (_oc_RTCORBA_RTORB),
-    (char *) &_oc_RTCORBA_RTORB,
-    0,
-    sizeof (RTCORBA::RTORB)
-  );
-
-namespace RTCORBA
-{
-  ::CORBA::TypeCode_ptr _tc_RTORB =
-    &_tc_TAO_tc_RTCORBA_RTORB;
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const RTCORBA::ThreadpoolLane &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLane>::insert_copy (
-      _tao_any,
-      RTCORBA::ThreadpoolLane::_tao_any_destructor,
-      RTCORBA::_tc_ThreadpoolLane,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::ThreadpoolLane *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLane>::insert (
-      _tao_any,
-      RTCORBA::ThreadpoolLane::_tao_any_destructor,
-      RTCORBA::_tc_ThreadpoolLane,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::ThreadpoolLane *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const RTCORBA::ThreadpoolLane *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const RTCORBA::ThreadpoolLane *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLane>::extract (
-        _tao_any,
-        RTCORBA::ThreadpoolLane::_tao_any_destructor,
-        RTCORBA::_tc_ThreadpoolLane,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const RTCORBA::ThreadpoolLanes &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLanes>::insert_copy (
-      _tao_any,
-      RTCORBA::ThreadpoolLanes::_tao_any_destructor,
-      RTCORBA::_tc_ThreadpoolLanes,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::ThreadpoolLanes *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLanes>::insert (
-      _tao_any,
-      RTCORBA::ThreadpoolLanes::_tao_any_destructor,
-      RTCORBA::_tc_ThreadpoolLanes,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::ThreadpoolLanes *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const RTCORBA::ThreadpoolLanes *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const RTCORBA::ThreadpoolLanes *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<RTCORBA::ThreadpoolLanes>::extract (
-        _tao_any,
-        RTCORBA::ThreadpoolLanes::_tao_any_destructor,
-        RTCORBA::_tc_ThreadpoolLanes,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::PriorityModel _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<RTCORBA::PriorityModel>::insert (
-      _tao_any,
-      RTCORBA::_tc_PriorityModel,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::PriorityModel &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<RTCORBA::PriorityModel>::extract (
-        _tao_any,
-        RTCORBA::_tc_PriorityModel,
-        _tao_elem 
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>::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<RTCORBA::PriorityModelPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::PriorityModelPolicy_ptr _tao_elem
-  )
-{
-  RTCORBA::PriorityModelPolicy_ptr _tao_objptr =
-    RTCORBA::PriorityModelPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::PriorityModelPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>::insert (
-      _tao_any,
-      RTCORBA::PriorityModelPolicy::_tao_any_destructor,
-      RTCORBA::_tc_PriorityModelPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::PriorityModelPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::PriorityModelPolicy>::extract (
-        _tao_any,
-        RTCORBA::PriorityModelPolicy::_tao_any_destructor,
-        RTCORBA::_tc_PriorityModelPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>::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<RTCORBA::ThreadpoolPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::ThreadpoolPolicy_ptr _tao_elem
-  )
-{
-  RTCORBA::ThreadpoolPolicy_ptr _tao_objptr =
-    RTCORBA::ThreadpoolPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::ThreadpoolPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>::insert (
-      _tao_any,
-      RTCORBA::ThreadpoolPolicy::_tao_any_destructor,
-      RTCORBA::_tc_ThreadpoolPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::ThreadpoolPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::ThreadpoolPolicy>::extract (
-        _tao_any,
-        RTCORBA::ThreadpoolPolicy::_tao_any_destructor,
-        RTCORBA::_tc_ThreadpoolPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::ProtocolProperties>::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<RTCORBA::ProtocolProperties>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::ProtocolProperties>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::ProtocolProperties_ptr _tao_elem
-  )
-{
-  RTCORBA::ProtocolProperties_ptr _tao_objptr =
-    RTCORBA::ProtocolProperties::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::ProtocolProperties_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::ProtocolProperties>::insert (
-      _tao_any,
-      RTCORBA::ProtocolProperties::_tao_any_destructor,
-      RTCORBA::_tc_ProtocolProperties,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::ProtocolProperties_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::ProtocolProperties>::extract (
-        _tao_any,
-        RTCORBA::ProtocolProperties::_tao_any_destructor,
-        RTCORBA::_tc_ProtocolProperties,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<RTCORBA::Protocol>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<RTCORBA::Protocol>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const RTCORBA::Protocol &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::Protocol>::insert_copy (
-      _tao_any,
-      RTCORBA::Protocol::_tao_any_destructor,
-      RTCORBA::_tc_Protocol,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::Protocol *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::Protocol>::insert (
-      _tao_any,
-      RTCORBA::Protocol::_tao_any_destructor,
-      RTCORBA::_tc_Protocol,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::Protocol *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const RTCORBA::Protocol *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const RTCORBA::Protocol *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<RTCORBA::Protocol>::extract (
-        _tao_any,
-        RTCORBA::Protocol::_tao_any_destructor,
-        RTCORBA::_tc_Protocol,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const RTCORBA::ProtocolList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>::insert_copy (
-      _tao_any,
-      RTCORBA::ProtocolList::_tao_any_destructor,
-      RTCORBA::_tc_ProtocolList,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::ProtocolList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>::insert (
-      _tao_any,
-      RTCORBA::ProtocolList::_tao_any_destructor,
-      RTCORBA::_tc_ProtocolList,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::ProtocolList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const RTCORBA::ProtocolList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const RTCORBA::ProtocolList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<RTCORBA::ProtocolList>::extract (
-        _tao_any,
-        RTCORBA::ProtocolList::_tao_any_destructor,
-        RTCORBA::_tc_ProtocolList,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>::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<RTCORBA::ServerProtocolPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::ServerProtocolPolicy_ptr _tao_elem
-  )
-{
-  RTCORBA::ServerProtocolPolicy_ptr _tao_objptr =
-    RTCORBA::ServerProtocolPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::ServerProtocolPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>::insert (
-      _tao_any,
-      RTCORBA::ServerProtocolPolicy::_tao_any_destructor,
-      RTCORBA::_tc_ServerProtocolPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::ServerProtocolPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::ServerProtocolPolicy>::extract (
-        _tao_any,
-        RTCORBA::ServerProtocolPolicy::_tao_any_destructor,
-        RTCORBA::_tc_ServerProtocolPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>::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<RTCORBA::ClientProtocolPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::ClientProtocolPolicy_ptr _tao_elem
-  )
-{
-  RTCORBA::ClientProtocolPolicy_ptr _tao_objptr =
-    RTCORBA::ClientProtocolPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::ClientProtocolPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>::insert (
-      _tao_any,
-      RTCORBA::ClientProtocolPolicy::_tao_any_destructor,
-      RTCORBA::_tc_ClientProtocolPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::ClientProtocolPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::ClientProtocolPolicy>::extract (
-        _tao_any,
-        RTCORBA::ClientProtocolPolicy::_tao_any_destructor,
-        RTCORBA::_tc_ClientProtocolPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::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<RTCORBA::PrivateConnectionPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::PrivateConnectionPolicy_ptr _tao_elem
-  )
-{
-  RTCORBA::PrivateConnectionPolicy_ptr _tao_objptr =
-    RTCORBA::PrivateConnectionPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::PrivateConnectionPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::insert (
-      _tao_any,
-      RTCORBA::PrivateConnectionPolicy::_tao_any_destructor,
-      RTCORBA::_tc_PrivateConnectionPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::PrivateConnectionPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::extract (
-        _tao_any,
-        RTCORBA::PrivateConnectionPolicy::_tao_any_destructor,
-        RTCORBA::_tc_PrivateConnectionPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>::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<RTCORBA::TCPProtocolProperties>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::TCPProtocolProperties_ptr _tao_elem
-  )
-{
-  RTCORBA::TCPProtocolProperties_ptr _tao_objptr =
-    RTCORBA::TCPProtocolProperties::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::TCPProtocolProperties_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>::insert (
-      _tao_any,
-      RTCORBA::TCPProtocolProperties::_tao_any_destructor,
-      RTCORBA::_tc_TCPProtocolProperties,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::TCPProtocolProperties_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::TCPProtocolProperties>::extract (
-        _tao_any,
-        RTCORBA::TCPProtocolProperties::_tao_any_destructor,
-        RTCORBA::_tc_TCPProtocolProperties,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>::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<RTCORBA::GIOPProtocolProperties>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::GIOPProtocolProperties_ptr _tao_elem
-  )
-{
-  RTCORBA::GIOPProtocolProperties_ptr _tao_objptr =
-    RTCORBA::GIOPProtocolProperties::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::GIOPProtocolProperties_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>::insert (
-      _tao_any,
-      RTCORBA::GIOPProtocolProperties::_tao_any_destructor,
-      RTCORBA::_tc_GIOPProtocolProperties,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::GIOPProtocolProperties_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::GIOPProtocolProperties>::extract (
-        _tao_any,
-        RTCORBA::GIOPProtocolProperties::_tao_any_destructor,
-        RTCORBA::_tc_GIOPProtocolProperties,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::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<RTCORBA::UnixDomainProtocolProperties>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::UnixDomainProtocolProperties_ptr _tao_elem
-  )
-{
-  RTCORBA::UnixDomainProtocolProperties_ptr _tao_objptr =
-    RTCORBA::UnixDomainProtocolProperties::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::UnixDomainProtocolProperties_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::insert (
-      _tao_any,
-      RTCORBA::UnixDomainProtocolProperties::_tao_any_destructor,
-      RTCORBA::_tc_UnixDomainProtocolProperties,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::UnixDomainProtocolProperties_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::extract (
-        _tao_any,
-        RTCORBA::UnixDomainProtocolProperties::_tao_any_destructor,
-        RTCORBA::_tc_UnixDomainProtocolProperties,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::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<RTCORBA::SharedMemoryProtocolProperties>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::SharedMemoryProtocolProperties_ptr _tao_elem
-  )
-{
-  RTCORBA::SharedMemoryProtocolProperties_ptr _tao_objptr =
-    RTCORBA::SharedMemoryProtocolProperties::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::SharedMemoryProtocolProperties_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::insert (
-      _tao_any,
-      RTCORBA::SharedMemoryProtocolProperties::_tao_any_destructor,
-      RTCORBA::_tc_SharedMemoryProtocolProperties,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::SharedMemoryProtocolProperties_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::extract (
-        _tao_any,
-        RTCORBA::SharedMemoryProtocolProperties::_tao_any_destructor,
-        RTCORBA::_tc_SharedMemoryProtocolProperties,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::UserDatagramProtocolProperties>::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<RTCORBA::UserDatagramProtocolProperties>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::UserDatagramProtocolProperties>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::UserDatagramProtocolProperties_ptr _tao_elem
-  )
-{
-  RTCORBA::UserDatagramProtocolProperties_ptr _tao_objptr =
-    RTCORBA::UserDatagramProtocolProperties::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::UserDatagramProtocolProperties_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::UserDatagramProtocolProperties>::insert (
-      _tao_any,
-      RTCORBA::UserDatagramProtocolProperties::_tao_any_destructor,
-      RTCORBA::_tc_UserDatagramProtocolProperties,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::UserDatagramProtocolProperties_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::UserDatagramProtocolProperties>::extract (
-        _tao_any,
-        RTCORBA::UserDatagramProtocolProperties::_tao_any_destructor,
-        RTCORBA::_tc_UserDatagramProtocolProperties,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::StreamControlProtocolProperties>::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<RTCORBA::StreamControlProtocolProperties>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::StreamControlProtocolProperties>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::StreamControlProtocolProperties_ptr _tao_elem
-  )
-{
-  RTCORBA::StreamControlProtocolProperties_ptr _tao_objptr =
-    RTCORBA::StreamControlProtocolProperties::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::StreamControlProtocolProperties_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::StreamControlProtocolProperties>::insert (
-      _tao_any,
-      RTCORBA::StreamControlProtocolProperties::_tao_any_destructor,
-      RTCORBA::_tc_StreamControlProtocolProperties,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::StreamControlProtocolProperties_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::StreamControlProtocolProperties>::extract (
-        _tao_any,
-        RTCORBA::StreamControlProtocolProperties::_tao_any_destructor,
-        RTCORBA::_tc_StreamControlProtocolProperties,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const RTCORBA::PriorityBand &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::PriorityBand>::insert_copy (
-      _tao_any,
-      RTCORBA::PriorityBand::_tao_any_destructor,
-      RTCORBA::_tc_PriorityBand,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::PriorityBand *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::PriorityBand>::insert (
-      _tao_any,
-      RTCORBA::PriorityBand::_tao_any_destructor,
-      RTCORBA::_tc_PriorityBand,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::PriorityBand *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const RTCORBA::PriorityBand *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const RTCORBA::PriorityBand *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<RTCORBA::PriorityBand>::extract (
-        _tao_any,
-        RTCORBA::PriorityBand::_tao_any_destructor,
-        RTCORBA::_tc_PriorityBand,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const RTCORBA::PriorityBands &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::PriorityBands>::insert_copy (
-      _tao_any,
-      RTCORBA::PriorityBands::_tao_any_destructor,
-      RTCORBA::_tc_PriorityBands,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::PriorityBands *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::PriorityBands>::insert (
-      _tao_any,
-      RTCORBA::PriorityBands::_tao_any_destructor,
-      RTCORBA::_tc_PriorityBands,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::PriorityBands *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const RTCORBA::PriorityBands *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const RTCORBA::PriorityBands *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<RTCORBA::PriorityBands>::extract (
-        _tao_any,
-        RTCORBA::PriorityBands::_tao_any_destructor,
-        RTCORBA::_tc_PriorityBands,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::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<RTCORBA::PriorityBandedConnectionPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::PriorityBandedConnectionPolicy_ptr _tao_elem
-  )
-{
-  RTCORBA::PriorityBandedConnectionPolicy_ptr _tao_objptr =
-    RTCORBA::PriorityBandedConnectionPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::PriorityBandedConnectionPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::insert (
-      _tao_any,
-      RTCORBA::PriorityBandedConnectionPolicy::_tao_any_destructor,
-      RTCORBA::_tc_PriorityBandedConnectionPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::PriorityBandedConnectionPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::extract (
-        _tao_any,
-        RTCORBA::PriorityBandedConnectionPolicy::_tao_any_destructor,
-        RTCORBA::_tc_PriorityBandedConnectionPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::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<RTCORBA::Current>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::Current>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::Current_ptr _tao_elem
-  )
-{
-  RTCORBA::Current_ptr _tao_objptr =
-    RTCORBA::Current::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::Current_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::Current>::insert (
-      _tao_any,
-      RTCORBA::Current::_tao_any_destructor,
-      RTCORBA::_tc_Current,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::Current_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::Current>::extract (
-        _tao_any,
-        RTCORBA::Current::_tao_any_destructor,
-        RTCORBA::_tc_Current,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::Mutex>::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<RTCORBA::Mutex>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::Mutex>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::Mutex_ptr _tao_elem
-  )
-{
-  RTCORBA::Mutex_ptr _tao_objptr =
-    RTCORBA::Mutex::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::Mutex_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::Mutex>::insert (
-      _tao_any,
-      RTCORBA::Mutex::_tao_any_destructor,
-      RTCORBA::_tc_Mutex,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::Mutex_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::Mutex>::extract (
-        _tao_any,
-        RTCORBA::Mutex::_tao_any_destructor,
-        RTCORBA::_tc_Mutex,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::RTORB>::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<RTCORBA::RTORB>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<RTCORBA::RTORB>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::RTORB_ptr _tao_elem
-  )
-{
-  RTCORBA::RTORB_ptr _tao_objptr =
-    RTCORBA::RTORB::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::RTORB_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<RTCORBA::RTORB>::insert (
-      _tao_any,
-      RTCORBA::RTORB::_tao_any_destructor,
-      RTCORBA::_tc_RTORB,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::RTORB_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<RTCORBA::RTORB>::extract (
-        _tao_any,
-        RTCORBA::RTORB::_tao_any_destructor,
-        RTCORBA::_tc_RTORB,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<RTCORBA::RTORB::MutexNotFound>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<RTCORBA::RTORB::MutexNotFound>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const RTCORBA::RTORB::MutexNotFound &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::RTORB::MutexNotFound>::insert_copy (
-      _tao_any,
-      RTCORBA::RTORB::MutexNotFound::_tao_any_destructor,
-      RTCORBA::RTORB::_tc_MutexNotFound,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::RTORB::MutexNotFound *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::RTORB::MutexNotFound>::insert (
-      _tao_any,
-      RTCORBA::RTORB::MutexNotFound::_tao_any_destructor,
-      RTCORBA::RTORB::_tc_MutexNotFound,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::RTORB::MutexNotFound *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const RTCORBA::RTORB::MutexNotFound *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const RTCORBA::RTORB::MutexNotFound *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<RTCORBA::RTORB::MutexNotFound>::extract (
-        _tao_any,
-        RTCORBA::RTORB::MutexNotFound::_tao_any_destructor,
-        RTCORBA::RTORB::_tc_MutexNotFound,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<RTCORBA::RTORB::InvalidThreadpool>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<RTCORBA::RTORB::InvalidThreadpool>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const RTCORBA::RTORB::InvalidThreadpool &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::RTORB::InvalidThreadpool>::insert_copy (
-      _tao_any,
-      RTCORBA::RTORB::InvalidThreadpool::_tao_any_destructor,
-      RTCORBA::RTORB::_tc_InvalidThreadpool,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    RTCORBA::RTORB::InvalidThreadpool *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<RTCORBA::RTORB::InvalidThreadpool>::insert (
-      _tao_any,
-      RTCORBA::RTORB::InvalidThreadpool::_tao_any_destructor,
-      RTCORBA::RTORB::_tc_InvalidThreadpool,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    RTCORBA::RTORB::InvalidThreadpool *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const RTCORBA::RTORB::InvalidThreadpool *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const RTCORBA::RTORB::InvalidThreadpool *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<RTCORBA::RTORB::InvalidThreadpool>::extract (
-        _tao_any,
-        RTCORBA::RTORB::InvalidThreadpool::_tao_any_destructor,
-        RTCORBA::RTORB::_tc_InvalidThreadpool,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_cs.cpp:61
+// be\be_visitor_structure/cdr_op_cs.cpp:61
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -6100,7 +2836,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:96
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_CPP_
 #define _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_CPP_
@@ -6115,7 +2851,7 @@ CORBA::Boolean operator<< (
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -6125,7 +2861,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -6142,7 +2878,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -6151,11 +2887,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -6166,13 +2902,13 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_CPP_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/cdr_op_cs.cpp:51
+// be\be_visitor_enum/cdr_op_cs.cpp:51
 
 CORBA::Boolean operator<< (TAO_OutputCDR &strm, const RTCORBA::PriorityModel &_tao_enumval)
 {
@@ -6194,7 +2930,7 @@ CORBA::Boolean operator>> (TAO_InputCDR &strm, RTCORBA::PriorityModel &_tao_enum
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_cs.cpp:61
+// be\be_visitor_structure/cdr_op_cs.cpp:61
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -6217,7 +2953,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_cs.cpp:96
+// be\be_visitor_sequence/cdr_op_cs.cpp:96
 
 #if !defined _TAO_CDR_OP_RTCORBA_PriorityBands_CPP_
 #define _TAO_CDR_OP_RTCORBA_PriorityBands_CPP_
@@ -6232,7 +2968,7 @@ CORBA::Boolean operator<< (
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -6242,7 +2978,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -6259,7 +2995,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -6268,11 +3004,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -6283,13 +3019,13 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_CPP_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_root/root.cpp:1629
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -6304,11 +3040,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Dual_Impl_T<
-        RTCORBA::ThreadpoolLane
-      >;
-
-  template class
     TAO_FixedSeq_Var_T<
         RTCORBA::ThreadpoolLanes,
         RTCORBA::ThreadpoolLane
@@ -6338,16 +3069,6 @@ CORBA::Boolean operator>> (
 #endif /* end #if !defined */
 
   template class
-    TAO::Any_Dual_Impl_T<
-        RTCORBA::ThreadpoolLanes
-      >;
-
-  template class
-    TAO::Any_Basic_Impl_T<
-        RTCORBA::PriorityModel
-      >;
-
-  template class
     TAO::Objref_Traits<
         RTCORBA::PriorityModelPolicy
       >;
@@ -6363,11 +3084,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        RTCORBA::PriorityModelPolicy
-      >;
-
-  template class
     TAO::Objref_Traits<
         RTCORBA::ThreadpoolPolicy
       >;
@@ -6383,11 +3099,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        RTCORBA::ThreadpoolPolicy
-      >;
-
-  template class
     TAO::Objref_Traits<
         RTCORBA::ProtocolProperties
       >;
@@ -6403,11 +3114,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        RTCORBA::ProtocolProperties
-      >;
-
-  template class
     TAO_Var_Var_T<
         RTCORBA::Protocol
       >;
@@ -6424,11 +3130,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Dual_Impl_T<
-        RTCORBA::Protocol
-      >;
-
-  template class
     TAO_VarSeq_Var_T<
         RTCORBA::ProtocolList,
         RTCORBA::Protocol
@@ -6458,11 +3159,6 @@ CORBA::Boolean operator>> (
 #endif /* end #if !defined */
 
   template class
-    TAO::Any_Dual_Impl_T<
-        RTCORBA::ProtocolList
-      >;
-
-  template class
     TAO::Objref_Traits<
         RTCORBA::ServerProtocolPolicy
       >;
@@ -6478,11 +3174,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        RTCORBA::ServerProtocolPolicy
-      >;
-
-  template class
     TAO::Objref_Traits<
         RTCORBA::ClientProtocolPolicy
       >;
@@ -6498,11 +3189,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        RTCORBA::ClientProtocolPolicy
-      >;
-
-  template class
     TAO::Objref_Traits<
         RTCORBA::PrivateConnectionPolicy
       >;
@@ -6518,11 +3204,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        RTCORBA::PrivateConnectionPolicy
-      >;
-
-  template class
     TAO::Objref_Traits<
         RTCORBA::TCPProtocolProperties
       >;
@@ -6538,11 +3219,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        RTCORBA::TCPProtocolProperties
-      >;
-
-  template class
     TAO::Objref_Traits<
         RTCORBA::GIOPProtocolProperties
       >;
@@ -6558,11 +3234,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        RTCORBA::GIOPProtocolProperties
-      >;
-
-  template class
     TAO::Objref_Traits<
         RTCORBA::UnixDomainProtocolProperties
       >;
@@ -6578,11 +3249,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        RTCORBA::UnixDomainProtocolProperties
-      >;
-
-  template class
     TAO::Objref_Traits<
         RTCORBA::SharedMemoryProtocolProperties
       >;
@@ -6598,11 +3264,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        RTCORBA::SharedMemoryProtocolProperties
-      >;
-
-  template class
     TAO::Objref_Traits<
         RTCORBA::UserDatagramProtocolProperties
       >;
@@ -6618,11 +3279,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        RTCORBA::UserDatagramProtocolProperties
-      >;
-
-  template class
     TAO::Objref_Traits<
         RTCORBA::StreamControlProtocolProperties
       >;
@@ -6638,11 +3294,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        RTCORBA::StreamControlProtocolProperties
-      >;
-
-  template class
     TAO_Fixed_Var_T<
         RTCORBA::PriorityBand
       >;
@@ -6653,11 +3304,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Dual_Impl_T<
-        RTCORBA::PriorityBand
-      >;
-
-  template class
     TAO_FixedSeq_Var_T<
         RTCORBA::PriorityBands,
         RTCORBA::PriorityBand
@@ -6687,11 +3333,6 @@ CORBA::Boolean operator>> (
 #endif /* end #if !defined */
 
   template class
-    TAO::Any_Dual_Impl_T<
-        RTCORBA::PriorityBands
-      >;
-
-  template class
     TAO::Objref_Traits<
         RTCORBA::PriorityBandedConnectionPolicy
       >;
@@ -6707,11 +3348,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        RTCORBA::PriorityBandedConnectionPolicy
-      >;
-
-  template class
     TAO::Objref_Traits<
         RTCORBA::Current
       >;
@@ -6727,11 +3363,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        RTCORBA::Current
-      >;
-
-  template class
     TAO::Objref_Traits<
         RTCORBA::Mutex
       >;
@@ -6747,21 +3378,6 @@ CORBA::Boolean operator>> (
       >;
 
   template class
-    TAO::Any_Impl_T<
-        RTCORBA::Mutex
-      >;
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        RTCORBA::RTORB::MutexNotFound
-      >;
-
-  template class
-    TAO::Any_Dual_Impl_T<
-        RTCORBA::RTORB::InvalidThreadpool
-      >;
-
-  template class
     TAO::Objref_Traits<
         RTCORBA::RTORB
       >;
@@ -6776,11 +3392,6 @@ CORBA::Boolean operator>> (
         RTCORBA::RTORB
       >;
 
-  template class
-    TAO::Any_Impl_T<
-        RTCORBA::RTORB
-      >;
-
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
 # pragma instantiate \
@@ -6794,11 +3405,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        RTCORBA::ThreadpoolLane \
-      >
-
-# pragma instantiate \
     TAO_FixedSeq_Var_T< \
         RTCORBA::ThreadpoolLanes, \
         RTCORBA::ThreadpoolLane \
@@ -6828,16 +3434,6 @@ CORBA::Boolean operator>> (
 #endif /* end #if !defined */
 
 # pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        RTCORBA::ThreadpoolLanes \
-      >
-
-# pragma instantiate \
-    TAO::Any_Basic_Impl_T< \
-        RTCORBA::PriorityModel \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         RTCORBA::PriorityModelPolicy \
       >
@@ -6853,11 +3449,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        RTCORBA::PriorityModelPolicy \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         RTCORBA::ThreadpoolPolicy \
       >
@@ -6873,11 +3464,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        RTCORBA::ThreadpoolPolicy \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         RTCORBA::ProtocolProperties \
       >
@@ -6893,11 +3479,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        RTCORBA::ProtocolProperties \
-      >
-
-# pragma instantiate \
     TAO_Var_Var_T< \
         RTCORBA::Protocol \
       >
@@ -6914,11 +3495,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        RTCORBA::Protocol \
-      >
-
-# pragma instantiate \
     TAO_VarSeq_Var_T< \
         RTCORBA::ProtocolList, \
         RTCORBA::Protocol \
@@ -6948,11 +3524,6 @@ CORBA::Boolean operator>> (
 #endif /* end #if !defined */
 
 # pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        RTCORBA::ProtocolList \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         RTCORBA::ServerProtocolPolicy \
       >
@@ -6968,11 +3539,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        RTCORBA::ServerProtocolPolicy \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         RTCORBA::ClientProtocolPolicy \
       >
@@ -6988,11 +3554,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        RTCORBA::ClientProtocolPolicy \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         RTCORBA::PrivateConnectionPolicy \
       >
@@ -7008,11 +3569,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        RTCORBA::PrivateConnectionPolicy \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         RTCORBA::TCPProtocolProperties \
       >
@@ -7028,11 +3584,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        RTCORBA::TCPProtocolProperties \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         RTCORBA::GIOPProtocolProperties \
       >
@@ -7048,11 +3599,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        RTCORBA::GIOPProtocolProperties \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         RTCORBA::UnixDomainProtocolProperties \
       >
@@ -7068,11 +3614,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        RTCORBA::UnixDomainProtocolProperties \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         RTCORBA::SharedMemoryProtocolProperties \
       >
@@ -7088,11 +3629,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        RTCORBA::SharedMemoryProtocolProperties \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         RTCORBA::UserDatagramProtocolProperties \
       >
@@ -7108,11 +3644,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        RTCORBA::UserDatagramProtocolProperties \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         RTCORBA::StreamControlProtocolProperties \
       >
@@ -7128,11 +3659,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        RTCORBA::StreamControlProtocolProperties \
-      >
-
-# pragma instantiate \
     TAO_Fixed_Var_T< \
         RTCORBA::PriorityBand \
       >
@@ -7143,11 +3669,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        RTCORBA::PriorityBand \
-      >
-
-# pragma instantiate \
     TAO_FixedSeq_Var_T< \
         RTCORBA::PriorityBands, \
         RTCORBA::PriorityBand \
@@ -7177,11 +3698,6 @@ CORBA::Boolean operator>> (
 #endif /* end #if !defined */
 
 # pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        RTCORBA::PriorityBands \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         RTCORBA::PriorityBandedConnectionPolicy \
       >
@@ -7197,11 +3713,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        RTCORBA::PriorityBandedConnectionPolicy \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         RTCORBA::Current \
       >
@@ -7217,11 +3728,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        RTCORBA::Current \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         RTCORBA::Mutex \
       >
@@ -7237,21 +3743,6 @@ CORBA::Boolean operator>> (
       >
 
 # pragma instantiate \
-    TAO::Any_Impl_T< \
-        RTCORBA::Mutex \
-      >
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        RTCORBA::RTORB::MutexNotFound \
-      >
-
-# pragma instantiate \
-    TAO::Any_Dual_Impl_T< \
-        RTCORBA::RTORB::InvalidThreadpool \
-      >
-
-# pragma instantiate \
     TAO::Objref_Traits< \
         RTCORBA::RTORB \
       >
@@ -7266,9 +3757,4 @@ CORBA::Boolean operator>> (
         RTCORBA::RTORB
       >
 
-# pragma instantiate \
-    TAO::Any_Impl_T< \
-        RTCORBA::RTORB \
-      >
-
 #endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/RTCORBA/RTCORBAC.h b/TAO/tao/RTCORBA/RTCORBAC.h
index 5603ff1398f..894fd4da1dd 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.h
+++ b/TAO/tao/RTCORBA/RTCORBAC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:153
+// be\be_codegen.cpp:153
 
-#ifndef _TAO_IDL_RTCORBAC_H_
-#define _TAO_IDL_RTCORBAC_H_
+#ifndef _TAO_IDL_ORIG_RTCORBAC_H_
+#define _TAO_IDL_ORIG_RTCORBAC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -60,8 +60,6 @@
 #include "tao/PolicyC.h"
 
 #include "tao/IOPC.h"
-#include "tao/TimeBaseC.h"
-
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
@@ -75,9 +73,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -86,7 +82,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from 
-// be/be_visitor_root/root_ch.cpp:63
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -97,67 +93,67 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace RTCORBA
 {
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::Short NativePriority;
   typedef CORBA::Short_out NativePriority_out;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NativePriority;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::Short Priority;
   typedef CORBA::Short_out Priority_out;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Priority;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
+  // be\be_visitor_constant/constant_ch.cpp:52
   
   const RTCORBA::Priority minPriority = 0;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
+  // be\be_visitor_constant/constant_ch.cpp:52
   
   const RTCORBA::Priority maxPriority = 32767;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::Long NetworkPriority;
   typedef CORBA::Long_out NetworkPriority_out;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_NetworkPriority;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::ULong ThreadpoolId;
   typedef CORBA::ULong_out ThreadpoolId_out;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolId;
   
   // TAO_IDL - Generated from
-  // be/be_type.cpp:258
+  // be\be_type.cpp:258
   
   struct ThreadpoolLane;
   
@@ -172,7 +168,7 @@ namespace RTCORBA
     ThreadpoolLane_out;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_RTCORBA_Export ThreadpoolLane
   {
@@ -185,12 +181,12 @@ namespace RTCORBA
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolLane;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:101
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_RTCORBA_THREADPOOLLANES_CH_)
 #define _RTCORBA_THREADPOOLLANES_CH_
@@ -238,17 +234,17 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolLanes;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
+  // be\be_visitor_constant/constant_ch.cpp:52
   
   const CORBA::PolicyType PRIORITY_MODEL_POLICY_TYPE = 40U;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_enum/enum_ch.cpp:57
+  // be\be_visitor_enum/enum_ch.cpp:57
   
   enum PriorityModel
   {
@@ -259,12 +255,12 @@ namespace RTCORBA
   typedef PriorityModel &PriorityModel_out;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityModel;
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:601
+  // be\be_interface.cpp:598
 
 #if !defined (_RTCORBA_PRIORITYMODELPOLICY__VAR_OUT_CH_)
 #define _RTCORBA_PRIORITYMODELPOLICY__VAR_OUT_CH_
@@ -287,7 +283,7 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_PRIORITYMODELPOLICY_CH_)
 #define _RTCORBA_PRIORITYMODELPOLICY_CH_
@@ -314,13 +310,13 @@ namespace RTCORBA
     
     static PriorityModelPolicy_ptr _nil (void)
     {
-      return (PriorityModelPolicy_ptr)0;
+      return static_cast<PriorityModelPolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::RTCORBA::PriorityModel priority_model (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -330,7 +326,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual RTCORBA::Priority server_priority (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -340,7 +336,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -350,7 +346,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -360,7 +356,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:208
+    // be\be_visitor_interface/interface_ch.cpp:208
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -386,17 +382,17 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityModelPolicy;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
+  // be\be_visitor_constant/constant_ch.cpp:52
   
   const CORBA::PolicyType THREADPOOL_POLICY_TYPE = 41U;
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:601
+  // be\be_interface.cpp:598
 
 #if !defined (_RTCORBA_THREADPOOLPOLICY__VAR_OUT_CH_)
 #define _RTCORBA_THREADPOOLPOLICY__VAR_OUT_CH_
@@ -419,7 +415,7 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_THREADPOOLPOLICY_CH_)
 #define _RTCORBA_THREADPOOLPOLICY_CH_
@@ -446,13 +442,13 @@ namespace RTCORBA
     
     static ThreadpoolPolicy_ptr _nil (void)
     {
-      return (ThreadpoolPolicy_ptr)0;
+      return static_cast<ThreadpoolPolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual RTCORBA::ThreadpoolId threadpool (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -462,7 +458,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -472,7 +468,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -482,7 +478,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:208
+    // be\be_visitor_interface/interface_ch.cpp:208
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -508,12 +504,12 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadpoolPolicy;
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:601
+  // be\be_interface.cpp:598
 
 #if !defined (_RTCORBA_PROTOCOLPROPERTIES__VAR_OUT_CH_)
 #define _RTCORBA_PROTOCOLPROPERTIES__VAR_OUT_CH_
@@ -536,7 +532,7 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_PROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_PROTOCOLPROPERTIES_CH_
@@ -564,13 +560,13 @@ namespace RTCORBA
     
     static ProtocolProperties_ptr _nil (void)
     {
-      return (ProtocolProperties_ptr)0;
+      return static_cast<ProtocolProperties_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:208
+    // be\be_visitor_interface/interface_ch.cpp:208
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -599,12 +595,12 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProtocolProperties;
   
   // TAO_IDL - Generated from
-  // be/be_type.cpp:258
+  // be\be_type.cpp:258
   
   struct Protocol;
   
@@ -622,7 +618,7 @@ namespace RTCORBA
     Protocol_out;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_RTCORBA_Export Protocol
   {
@@ -635,12 +631,12 @@ namespace RTCORBA
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Protocol;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:101
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_RTCORBA_PROTOCOLLIST_CH_)
 #define _RTCORBA_PROTOCOLLIST_CH_
@@ -688,17 +684,17 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProtocolList;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
+  // be\be_visitor_constant/constant_ch.cpp:52
   
   const CORBA::PolicyType SERVER_PROTOCOL_POLICY_TYPE = 42U;
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:601
+  // be\be_interface.cpp:598
 
 #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY__VAR_OUT_CH_)
 #define _RTCORBA_SERVERPROTOCOLPOLICY__VAR_OUT_CH_
@@ -721,7 +717,7 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_SERVERPROTOCOLPOLICY_CH_)
 #define _RTCORBA_SERVERPROTOCOLPOLICY_CH_
@@ -748,13 +744,13 @@ namespace RTCORBA
     
     static ServerProtocolPolicy_ptr _nil (void)
     {
-      return (ServerProtocolPolicy_ptr)0;
+      return static_cast<ServerProtocolPolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::RTCORBA::ProtocolList * protocols (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -764,7 +760,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -774,7 +770,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -784,7 +780,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:208
+    // be\be_visitor_interface/interface_ch.cpp:208
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -810,17 +806,17 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServerProtocolPolicy;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
+  // be\be_visitor_constant/constant_ch.cpp:52
   
   const CORBA::PolicyType CLIENT_PROTOCOL_POLICY_TYPE = 43U;
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:601
+  // be\be_interface.cpp:598
 
 #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY__VAR_OUT_CH_)
 #define _RTCORBA_CLIENTPROTOCOLPOLICY__VAR_OUT_CH_
@@ -843,7 +839,7 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_CLIENTPROTOCOLPOLICY_CH_)
 #define _RTCORBA_CLIENTPROTOCOLPOLICY_CH_
@@ -870,13 +866,13 @@ namespace RTCORBA
     
     static ClientProtocolPolicy_ptr _nil (void)
     {
-      return (ClientProtocolPolicy_ptr)0;
+      return static_cast<ClientProtocolPolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::RTCORBA::ProtocolList * protocols (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -886,7 +882,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -896,7 +892,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -906,7 +902,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:208
+    // be\be_visitor_interface/interface_ch.cpp:208
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -932,17 +928,17 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ClientProtocolPolicy;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
+  // be\be_visitor_constant/constant_ch.cpp:52
   
   const CORBA::PolicyType PRIVATE_CONNECTION_POLICY_TYPE = 44U;
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:601
+  // be\be_interface.cpp:598
 
 #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY__VAR_OUT_CH_)
 #define _RTCORBA_PRIVATECONNECTIONPOLICY__VAR_OUT_CH_
@@ -965,7 +961,7 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_PRIVATECONNECTIONPOLICY_CH_)
 #define _RTCORBA_PRIVATECONNECTIONPOLICY_CH_
@@ -992,13 +988,13 @@ namespace RTCORBA
     
     static PrivateConnectionPolicy_ptr _nil (void)
     {
-      return (PrivateConnectionPolicy_ptr)0;
+      return static_cast<PrivateConnectionPolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1008,7 +1004,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1018,7 +1014,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:208
+    // be\be_visitor_interface/interface_ch.cpp:208
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -1044,12 +1040,12 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PrivateConnectionPolicy;
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:601
+  // be\be_interface.cpp:598
 
 #if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES__VAR_OUT_CH_)
 #define _RTCORBA_TCPPROTOCOLPROPERTIES__VAR_OUT_CH_
@@ -1072,7 +1068,7 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_TCPPROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_TCPPROTOCOLPROPERTIES_CH_
@@ -1099,13 +1095,13 @@ namespace RTCORBA
     
     static TCPProtocolProperties_ptr _nil (void)
     {
-      return (TCPProtocolProperties_ptr)0;
+      return static_cast<TCPProtocolProperties_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Long send_buffer_size (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1115,7 +1111,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void send_buffer_size (
         ::CORBA::Long send_buffer_size
@@ -1126,7 +1122,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Long recv_buffer_size (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1136,7 +1132,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void recv_buffer_size (
         ::CORBA::Long recv_buffer_size
@@ -1147,7 +1143,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean keep_alive (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1157,7 +1153,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void keep_alive (
         ::CORBA::Boolean keep_alive
@@ -1168,7 +1164,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean dont_route (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1178,7 +1174,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void dont_route (
         ::CORBA::Boolean dont_route
@@ -1189,7 +1185,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean no_delay (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1199,7 +1195,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void no_delay (
         ::CORBA::Boolean no_delay
@@ -1210,7 +1206,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean enable_network_priority (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1220,7 +1216,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void enable_network_priority (
         ::CORBA::Boolean enable_network_priority
@@ -1231,7 +1227,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:208
+    // be\be_visitor_interface/interface_ch.cpp:208
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -1257,12 +1253,12 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TCPProtocolProperties;
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:601
+  // be\be_interface.cpp:598
 
 #if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES__VAR_OUT_CH_)
 #define _RTCORBA_GIOPPROTOCOLPROPERTIES__VAR_OUT_CH_
@@ -1285,7 +1281,7 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_GIOPPROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_GIOPPROTOCOLPROPERTIES_CH_
@@ -1312,13 +1308,13 @@ namespace RTCORBA
     
     static GIOPProtocolProperties_ptr _nil (void)
     {
-      return (GIOPProtocolProperties_ptr)0;
+      return static_cast<GIOPProtocolProperties_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:208
+    // be\be_visitor_interface/interface_ch.cpp:208
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -1344,12 +1340,12 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_GIOPProtocolProperties;
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:601
+  // be\be_interface.cpp:598
 
 #if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__VAR_OUT_CH_)
 #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES__VAR_OUT_CH_
@@ -1372,7 +1368,7 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_UNIXDOMAINPROTOCOLPROPERTIES_CH_
@@ -1399,13 +1395,13 @@ namespace RTCORBA
     
     static UnixDomainProtocolProperties_ptr _nil (void)
     {
-      return (UnixDomainProtocolProperties_ptr)0;
+      return static_cast<UnixDomainProtocolProperties_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Long send_buffer_size (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1415,7 +1411,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void send_buffer_size (
         ::CORBA::Long send_buffer_size
@@ -1426,7 +1422,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Long recv_buffer_size (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1436,7 +1432,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void recv_buffer_size (
         ::CORBA::Long recv_buffer_size
@@ -1447,7 +1443,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:208
+    // be\be_visitor_interface/interface_ch.cpp:208
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -1473,12 +1469,12 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UnixDomainProtocolProperties;
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:601
+  // be\be_interface.cpp:598
 
 #if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__VAR_OUT_CH_)
 #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES__VAR_OUT_CH_
@@ -1501,7 +1497,7 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_SHAREDMEMORYPROTOCOLPROPERTIES_CH_
@@ -1528,13 +1524,13 @@ namespace RTCORBA
     
     static SharedMemoryProtocolProperties_ptr _nil (void)
     {
-      return (SharedMemoryProtocolProperties_ptr)0;
+      return static_cast<SharedMemoryProtocolProperties_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Long send_buffer_size (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1544,7 +1540,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void send_buffer_size (
         ::CORBA::Long send_buffer_size
@@ -1555,7 +1551,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Long recv_buffer_size (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1565,7 +1561,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void recv_buffer_size (
         ::CORBA::Long recv_buffer_size
@@ -1576,7 +1572,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean keep_alive (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1586,7 +1582,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void keep_alive (
         ::CORBA::Boolean keep_alive
@@ -1597,7 +1593,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean dont_route (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1607,7 +1603,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void dont_route (
         ::CORBA::Boolean dont_route
@@ -1618,7 +1614,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean no_delay (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1628,7 +1624,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void no_delay (
         ::CORBA::Boolean no_delay
@@ -1639,7 +1635,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Long preallocate_buffer_size (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1649,7 +1645,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void preallocate_buffer_size (
         ::CORBA::Long preallocate_buffer_size
@@ -1660,7 +1656,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual char * mmap_filename (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1670,7 +1666,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void mmap_filename (
         const char * mmap_filename
@@ -1681,7 +1677,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual char * mmap_lockname (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1691,7 +1687,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void mmap_lockname (
         const char * mmap_lockname
@@ -1702,7 +1698,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:208
+    // be\be_visitor_interface/interface_ch.cpp:208
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -1728,12 +1724,12 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SharedMemoryProtocolProperties;
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:601
+  // be\be_interface.cpp:598
 
 #if !defined (_RTCORBA_USERDATAGRAMPROTOCOLPROPERTIES__VAR_OUT_CH_)
 #define _RTCORBA_USERDATAGRAMPROTOCOLPROPERTIES__VAR_OUT_CH_
@@ -1756,7 +1752,7 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_USERDATAGRAMPROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_USERDATAGRAMPROTOCOLPROPERTIES_CH_
@@ -1783,13 +1779,13 @@ namespace RTCORBA
     
     static UserDatagramProtocolProperties_ptr _nil (void)
     {
-      return (UserDatagramProtocolProperties_ptr)0;
+      return static_cast<UserDatagramProtocolProperties_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean enable_network_priority (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1799,7 +1795,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void enable_network_priority (
         ::CORBA::Boolean enable_network_priority
@@ -1810,7 +1806,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:208
+    // be\be_visitor_interface/interface_ch.cpp:208
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -1836,12 +1832,12 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_UserDatagramProtocolProperties;
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:601
+  // be\be_interface.cpp:598
 
 #if !defined (_RTCORBA_STREAMCONTROLPROTOCOLPROPERTIES__VAR_OUT_CH_)
 #define _RTCORBA_STREAMCONTROLPROTOCOLPROPERTIES__VAR_OUT_CH_
@@ -1864,7 +1860,7 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_STREAMCONTROLPROTOCOLPROPERTIES_CH_)
 #define _RTCORBA_STREAMCONTROLPROTOCOLPROPERTIES_CH_
@@ -1891,13 +1887,13 @@ namespace RTCORBA
     
     static StreamControlProtocolProperties_ptr _nil (void)
     {
-      return (StreamControlProtocolProperties_ptr)0;
+      return static_cast<StreamControlProtocolProperties_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Long send_buffer_size (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1907,7 +1903,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void send_buffer_size (
         ::CORBA::Long send_buffer_size
@@ -1918,7 +1914,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Long recv_buffer_size (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1928,7 +1924,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void recv_buffer_size (
         ::CORBA::Long recv_buffer_size
@@ -1939,7 +1935,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean keep_alive (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1949,7 +1945,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void keep_alive (
         ::CORBA::Boolean keep_alive
@@ -1960,7 +1956,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean dont_route (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1970,7 +1966,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void dont_route (
         ::CORBA::Boolean dont_route
@@ -1981,7 +1977,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean no_delay (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1991,7 +1987,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void no_delay (
         ::CORBA::Boolean no_delay
@@ -2002,7 +1998,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean enable_network_priority (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2012,7 +2008,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void enable_network_priority (
         ::CORBA::Boolean enable_network_priority
@@ -2023,7 +2019,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:208
+    // be\be_visitor_interface/interface_ch.cpp:208
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -2049,12 +2045,12 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_StreamControlProtocolProperties;
   
   // TAO_IDL - Generated from
-  // be/be_type.cpp:258
+  // be\be_type.cpp:258
   
   struct PriorityBand;
   
@@ -2069,7 +2065,7 @@ namespace RTCORBA
     PriorityBand_out;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:52
   
   struct TAO_RTCORBA_Export PriorityBand
   {
@@ -2081,12 +2077,12 @@ namespace RTCORBA
   };
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityBand;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_sequence/sequence_ch.cpp:101
+  // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_RTCORBA_PRIORITYBANDS_CH_)
 #define _RTCORBA_PRIORITYBANDS_CH_
@@ -2134,17 +2130,17 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityBands;
   
   // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
+  // be\be_visitor_constant/constant_ch.cpp:52
   
   const CORBA::PolicyType PRIORITY_BANDED_CONNECTION_POLICY_TYPE = 45U;
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:601
+  // be\be_interface.cpp:598
 
 #if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__VAR_OUT_CH_)
 #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY__VAR_OUT_CH_
@@ -2167,7 +2163,7 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY_CH_)
 #define _RTCORBA_PRIORITYBANDEDCONNECTIONPOLICY_CH_
@@ -2194,13 +2190,13 @@ namespace RTCORBA
     
     static PriorityBandedConnectionPolicy_ptr _nil (void)
     {
-      return (PriorityBandedConnectionPolicy_ptr)0;
+      return static_cast<PriorityBandedConnectionPolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::RTCORBA::PriorityBands * priority_bands (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2210,7 +2206,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2220,7 +2216,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2230,7 +2226,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:208
+    // be\be_visitor_interface/interface_ch.cpp:208
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -2256,12 +2252,12 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_PriorityBandedConnectionPolicy;
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:601
+  // be\be_interface.cpp:598
 
 #if !defined (_RTCORBA_CURRENT__VAR_OUT_CH_)
 #define _RTCORBA_CURRENT__VAR_OUT_CH_
@@ -2284,7 +2280,7 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_CURRENT_CH_)
 #define _RTCORBA_CURRENT_CH_
@@ -2311,13 +2307,13 @@ namespace RTCORBA
     
     static Current_ptr _nil (void)
     {
-      return (Current_ptr)0;
+      return static_cast<Current_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual RTCORBA::Priority the_priority (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2327,7 +2323,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void the_priority (
         ::RTCORBA::Priority the_priority
@@ -2338,7 +2334,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:208
+    // be\be_visitor_interface/interface_ch.cpp:208
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -2364,12 +2360,12 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:601
+  // be\be_interface.cpp:598
 
 #if !defined (_RTCORBA_MUTEX__VAR_OUT_CH_)
 #define _RTCORBA_MUTEX__VAR_OUT_CH_
@@ -2392,7 +2388,7 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_MUTEX_CH_)
 #define _RTCORBA_MUTEX_CH_
@@ -2419,13 +2415,13 @@ namespace RTCORBA
     
     static Mutex_ptr _nil (void)
     {
-      return (Mutex_ptr)0;
+      return static_cast<Mutex_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void lock (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2435,7 +2431,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void unlock (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2445,7 +2441,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual CORBA::Boolean try_lock (
         ::TimeBase::TimeT max_wait
@@ -2456,7 +2452,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:208
+    // be\be_visitor_interface/interface_ch.cpp:208
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -2482,12 +2478,12 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Mutex;
   
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:601
+  // be\be_interface.cpp:598
 
 #if !defined (_RTCORBA_RTORB__VAR_OUT_CH_)
 #define _RTCORBA_RTORB__VAR_OUT_CH_
@@ -2510,7 +2506,7 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
+  // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_RTCORBA_RTORB_CH_)
 #define _RTCORBA_RTORB_CH_
@@ -2537,13 +2533,13 @@ namespace RTCORBA
     
     static RTORB_ptr _nil (void)
     {
-      return (RTORB_ptr)0;
+      return static_cast<RTORB_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::RTCORBA::Mutex_ptr create_mutex (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2553,7 +2549,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void destroy_mutex (
         ::RTCORBA::Mutex_ptr the_mutex
@@ -2564,7 +2560,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_exception/exception_ch.cpp:51
+    // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_RTCORBA_RTORB_MUTEXNOTFOUND_CH_)
 #define _RTCORBA_RTORB_MUTEXNOTFOUND_CH_
@@ -2582,8 +2578,10 @@ namespace RTCORBA
       static void _tao_any_destructor (void *);
       
       static MutexNotFound *_downcast (CORBA::Exception *);
+      static const MutexNotFound *_downcast (CORBA::Exception const *);
+      
       static CORBA::Exception *_alloc (void);
-
+      
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -2599,20 +2597,20 @@ namespace RTCORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_visitor_exception/exception_ch.cpp:125
+      // be\be_visitor_exception/exception_ch.cpp:127
       
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
     
     // TAO_IDL - Generated from
-    // be/be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:44
     
     static ::CORBA::TypeCode_ptr _tc_MutexNotFound;
 
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::RTCORBA::Mutex_ptr create_named_mutex (
         const char * name,
@@ -2624,7 +2622,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::RTCORBA::Mutex_ptr open_named_mutex (
         const char * name
@@ -2636,7 +2634,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::RTCORBA::TCPProtocolProperties_ptr create_tcp_protocol_properties (
         ::CORBA::Long send_buffer_size,
@@ -2652,7 +2650,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::RTCORBA::UnixDomainProtocolProperties_ptr create_unix_domain_protocol_properties (
         ::CORBA::Long send_buffer_size,
@@ -2664,7 +2662,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::RTCORBA::SharedMemoryProtocolProperties_ptr create_shared_memory_protocol_properties (
         ::CORBA::Long send_buffer_size,
@@ -2682,7 +2680,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::RTCORBA::UserDatagramProtocolProperties_ptr create_user_datagram_protocol_properties (
         ::CORBA::Boolean enable_network_priority
@@ -2693,7 +2691,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::RTCORBA::StreamControlProtocolProperties_ptr create_stream_control_protocol_properties (
         ::CORBA::Long send_buffer_size,
@@ -2709,7 +2707,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_exception/exception_ch.cpp:51
+    // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_RTCORBA_RTORB_INVALIDTHREADPOOL_CH_)
 #define _RTCORBA_RTORB_INVALIDTHREADPOOL_CH_
@@ -2727,8 +2725,10 @@ namespace RTCORBA
       static void _tao_any_destructor (void *);
       
       static InvalidThreadpool *_downcast (CORBA::Exception *);
+      static const InvalidThreadpool *_downcast (CORBA::Exception const *);
+      
       static CORBA::Exception *_alloc (void);
-
+      
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -2744,20 +2744,20 @@ namespace RTCORBA
         );
       
       // TAO_IDL - Generated from
-      // be/be_visitor_exception/exception_ch.cpp:125
+      // be\be_visitor_exception/exception_ch.cpp:127
       
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
     
     // TAO_IDL - Generated from
-    // be/be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:44
     
     static ::CORBA::TypeCode_ptr _tc_InvalidThreadpool;
 
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual RTCORBA::ThreadpoolId create_threadpool (
         ::CORBA::ULong stacksize,
@@ -2774,7 +2774,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual RTCORBA::ThreadpoolId create_threadpool_with_lanes (
         ::CORBA::ULong stacksize,
@@ -2790,7 +2790,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void destroy_threadpool (
         ::RTCORBA::ThreadpoolId threadpool
@@ -2802,7 +2802,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::RTCORBA::PriorityModelPolicy_ptr create_priority_model_policy (
         ::RTCORBA::PriorityModel priority_model,
@@ -2814,7 +2814,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::RTCORBA::ThreadpoolPolicy_ptr create_threadpool_policy (
         ::RTCORBA::ThreadpoolId threadpool
@@ -2825,7 +2825,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::RTCORBA::PriorityBandedConnectionPolicy_ptr create_priority_banded_connection_policy (
         const ::RTCORBA::PriorityBands & priority_bands
@@ -2836,7 +2836,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::RTCORBA::ServerProtocolPolicy_ptr create_server_protocol_policy (
         const ::RTCORBA::ProtocolList & protocols
@@ -2847,7 +2847,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::RTCORBA::ClientProtocolPolicy_ptr create_client_protocol_policy (
         const ::RTCORBA::ProtocolList & protocols
@@ -2858,7 +2858,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
+    // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::RTCORBA::PrivateConnectionPolicy_ptr create_private_connection_policy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -2868,7 +2868,7 @@ namespace RTCORBA
       )) = 0;
     
     // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:208
+    // be\be_visitor_interface/interface_ch.cpp:208
     
     virtual CORBA::Boolean _is_a (
         const char *type_id
@@ -2894,17 +2894,17 @@ namespace RTCORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:44
   
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RTORB;
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module RTCORBA
 
 // TAO_IDL - Generated from
-// be/be_visitor_traits.cpp:59
+// be\be_visitor_traits.cpp:59
 
 // Traits specializations.
 namespace TAO
@@ -3248,7 +3248,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::ThreadpoolLane &); // copying version
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolLane*); // noncopying version
@@ -3256,7 +3256,7 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Thre
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::ThreadpoolLane *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::ThreadpoolLanes &); // copying version
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolLanes*); // noncopying version
@@ -3264,34 +3264,34 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Thre
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::ThreadpoolLanes *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_ch.cpp:51
+// be\be_visitor_enum/any_op_ch.cpp:51
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityModel);
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PriorityModel &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityModelPolicy_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityModelPolicy_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PriorityModelPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolPolicy_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ThreadpoolPolicy_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ThreadpoolPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ProtocolProperties_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ProtocolProperties_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ProtocolProperties_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::Protocol &); // copying version
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Protocol*); // noncopying version
@@ -3299,7 +3299,7 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Prot
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::Protocol *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::ProtocolList &); // copying version
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ProtocolList*); // noncopying version
@@ -3307,70 +3307,70 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Prot
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::ProtocolList *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ServerProtocolPolicy_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ServerProtocolPolicy_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ServerProtocolPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ClientProtocolPolicy_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::ClientProtocolPolicy_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::ClientProtocolPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PrivateConnectionPolicy_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PrivateConnectionPolicy_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PrivateConnectionPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::TCPProtocolProperties_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::TCPProtocolProperties_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::TCPProtocolProperties_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::GIOPProtocolProperties_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::GIOPProtocolProperties_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::GIOPProtocolProperties_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::UnixDomainProtocolProperties_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::UnixDomainProtocolProperties_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::UnixDomainProtocolProperties_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::SharedMemoryProtocolProperties_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::SharedMemoryProtocolProperties_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::SharedMemoryProtocolProperties_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::UserDatagramProtocolProperties_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::UserDatagramProtocolProperties_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::UserDatagramProtocolProperties_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::StreamControlProtocolProperties_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::StreamControlProtocolProperties_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::StreamControlProtocolProperties_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::PriorityBand &); // copying version
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityBand*); // noncopying version
@@ -3378,7 +3378,7 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Prio
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::PriorityBand *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::PriorityBands &); // copying version
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityBands*); // noncopying version
@@ -3386,35 +3386,35 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Prio
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::PriorityBands *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityBandedConnectionPolicy_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::PriorityBandedConnectionPolicy_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::PriorityBandedConnectionPolicy_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Current_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Current_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Current_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Mutex_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::Mutex_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::Mutex_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::RTORB_ptr); // copying
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::RTORB_ptr *); // non-copying
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::RTORB_ptr &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_ch.cpp:52
+// be\be_visitor_exception/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::RTORB::MutexNotFound &); // copying version
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::RTORB::MutexNotFound*); // noncopying version
@@ -3422,7 +3422,7 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::RTOR
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::RTORB::MutexNotFound *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_exception/any_op_ch.cpp:52
+// be\be_visitor_exception/any_op_ch.cpp:52
 
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, const RTCORBA::RTORB::InvalidThreadpool &); // copying version
 TAO_RTCORBA_Export void operator<<= (CORBA::Any &, RTCORBA::RTORB::InvalidThreadpool*); // noncopying version
@@ -3430,13 +3430,13 @@ TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTCORBA::RTOR
 TAO_RTCORBA_Export CORBA::Boolean operator>>= (const CORBA::Any &, const RTCORBA::RTORB::InvalidThreadpool *&);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
+// be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_RTCORBA_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const RTCORBA::ThreadpoolLane &);
 TAO_RTCORBA_Export CORBA::Boolean operator>> (TAO_InputCDR &, RTCORBA::ThreadpoolLane &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:71
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_H_
 #define _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_H_
@@ -3453,19 +3453,19 @@ TAO_RTCORBA_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_RTCORBA_ThreadpoolLanes_H_ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_enum/cdr_op_ch.cpp:50
+// be\be_visitor_enum/cdr_op_ch.cpp:50
 
 TAO_RTCORBA_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const RTCORBA::PriorityModel &);
 TAO_RTCORBA_Export CORBA::Boolean operator>> (TAO_InputCDR &, RTCORBA::PriorityModel &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:54
+// be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_RTCORBA_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const RTCORBA::PriorityBand &);
 TAO_RTCORBA_Export CORBA::Boolean operator>> (TAO_InputCDR &, RTCORBA::PriorityBand &);
 
 // TAO_IDL - Generated from
-// be/be_visitor_sequence/cdr_op_ch.cpp:71
+// be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_RTCORBA_PriorityBands_H_
 #define _TAO_CDR_OP_RTCORBA_PriorityBands_H_
@@ -3482,13 +3482,13 @@ TAO_RTCORBA_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_RTCORBA_PriorityBands_H_ */
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:964
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "RTCORBAC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/RTCORBA/RTCORBA_includeC.h b/TAO/tao/RTCORBA/RTCORBA_includeC.h
index 27907711194..a37e92f1656 100644
--- a/TAO/tao/RTCORBA/RTCORBA_includeC.h
+++ b/TAO/tao/RTCORBA/RTCORBA_includeC.h
@@ -55,9 +55,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -86,7 +84,7 @@ namespace TAO
 // TAO_IDL - Generated from
 // .\be\be_codegen.cpp:1050
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/RTCORBA/RT_ORB.cpp b/TAO/tao/RTCORBA/RT_ORB.cpp
index e853862a9e4..78453c72188 100644
--- a/TAO/tao/RTCORBA/RT_ORB.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB.cpp
@@ -93,7 +93,7 @@ TAO_Named_RT_Mutex_Manager::create_mutex (ACE_ENV_SINGLE_ARG_DECL)
                     TAO_RT_Mutex (),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (RTCORBA::Mutex::_nil ());
@@ -173,7 +173,7 @@ TAO_Named_RT_Mutex_Manager::create_named_mutex (const char *name,
                         TAO_Named_RT_Mutex (name),
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
       ACE_CHECK_RETURN (RTCORBA::Mutex::_nil ());
@@ -250,14 +250,14 @@ TAO_RT_ORB::create_tcp_protocol_properties (CORBA::Long send_buffer_size,
                                         dont_route,
                                         no_delay,
                                         enable_network_priority),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (RTCORBA::TCPProtocolProperties::_nil ());
 
   return tmp;
 }
 
-RTCORBA::UnixDomainProtocolProperties_ptr 
+RTCORBA::UnixDomainProtocolProperties_ptr
 TAO_RT_ORB::create_unix_domain_protocol_properties (
                                                     CORBA::Long send_buffer_size,
                                                     CORBA::Long recv_buffer_size
@@ -269,14 +269,14 @@ TAO_RT_ORB::create_unix_domain_protocol_properties (
                     TAO_UnixDomain_Protocol_Properties (
                                                send_buffer_size,
                                                recv_buffer_size),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (RTCORBA::UnixDomainProtocolProperties::_nil ());
 
   return tmp;
 }
 
-RTCORBA::SharedMemoryProtocolProperties_ptr 
+RTCORBA::SharedMemoryProtocolProperties_ptr
 TAO_RT_ORB::create_shared_memory_protocol_properties (
                                                       CORBA::Long send_buffer_size,
                                                       CORBA::Long recv_buffer_size,
@@ -291,7 +291,7 @@ TAO_RT_ORB::create_shared_memory_protocol_properties (
 {
   TAO_SharedMemory_Protocol_Properties *tmp;
   ACE_NEW_THROW_EX (tmp,
-                    TAO_SharedMemory_Protocol_Properties (send_buffer_size,                                                          
+                    TAO_SharedMemory_Protocol_Properties (send_buffer_size,
                                                           recv_buffer_size,
                                                           keep_alive,
                                                           dont_route,
@@ -299,14 +299,14 @@ TAO_RT_ORB::create_shared_memory_protocol_properties (
                                                           preallocate_buffer_size,
                                                           mmap_filename,
                                                           mmap_lockname),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (RTCORBA::SharedMemoryProtocolProperties::_nil ());
-  
+
   return tmp;
 }
 
-RTCORBA::UserDatagramProtocolProperties_ptr 
+RTCORBA::UserDatagramProtocolProperties_ptr
 TAO_RT_ORB::create_user_datagram_protocol_properties (
                                                       CORBA::Boolean enable_network_priority
                                                       ACE_ENV_ARG_DECL)
@@ -316,14 +316,14 @@ TAO_RT_ORB::create_user_datagram_protocol_properties (
   ACE_NEW_THROW_EX (tmp,
                     TAO_UserDatagram_Protocol_Properties (
                                                  enable_network_priority),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (RTCORBA::UserDatagramProtocolProperties::_nil ());
 
   return tmp;
 }
 
-RTCORBA::StreamControlProtocolProperties_ptr 
+RTCORBA::StreamControlProtocolProperties_ptr
 TAO_RT_ORB::create_stream_control_protocol_properties (
                                                        CORBA::Long send_buffer_size,
                                                        CORBA::Long recv_buffer_size,
@@ -343,10 +343,10 @@ TAO_RT_ORB::create_stream_control_protocol_properties (
                                                   dont_route,
                                                   no_delay,
                                                   enable_network_priority),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (RTCORBA::StreamControlProtocolProperties::_nil ());
-  
+
   return tmp;
 }
 
@@ -409,7 +409,7 @@ TAO_RT_ORB::create_priority_model_policy (RTCORBA::PriorityModel priority_model,
   TAO_PriorityModelPolicy *tmp;
   ACE_NEW_THROW_EX (tmp,
                     TAO_PriorityModelPolicy (priority_model, server_priority),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (RTCORBA::PriorityModelPolicy::_nil ());
 
@@ -424,7 +424,7 @@ TAO_RT_ORB::create_threadpool_policy (RTCORBA::ThreadpoolId threadpool
   TAO_ThreadpoolPolicy *tmp;
   ACE_NEW_THROW_EX (tmp,
                     TAO_ThreadpoolPolicy (threadpool),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (RTCORBA::ThreadpoolPolicy::_nil ());
 
@@ -440,7 +440,7 @@ TAO_RT_ORB::create_priority_banded_connection_policy (const
   TAO_PriorityBandedConnectionPolicy *tmp;
   ACE_NEW_THROW_EX (tmp,
                     TAO_PriorityBandedConnectionPolicy (priority_bands),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (RTCORBA::PriorityBandedConnectionPolicy::_nil ());
 
@@ -454,7 +454,7 @@ TAO_RT_ORB::create_private_connection_policy (ACE_ENV_SINGLE_ARG_DECL)
   TAO_PrivateConnectionPolicy *tmp;
   ACE_NEW_THROW_EX (tmp,
                     TAO_PrivateConnectionPolicy (),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (RTCORBA::PrivateConnectionPolicy::_nil ());
 
@@ -469,7 +469,7 @@ TAO_RT_ORB::create_server_protocol_policy (const RTCORBA::ProtocolList & protoco
   TAO_ServerProtocolPolicy *tmp;
   ACE_NEW_THROW_EX (tmp,
                     TAO_ServerProtocolPolicy (protocols),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (RTCORBA::ServerProtocolPolicy::_nil ());
 
@@ -484,7 +484,7 @@ TAO_RT_ORB::create_client_protocol_policy (const RTCORBA::ProtocolList & protoco
   TAO_ClientProtocolPolicy *tmp;
   ACE_NEW_THROW_EX (tmp,
                     TAO_ClientProtocolPolicy (protocols),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (RTCORBA::ClientProtocolPolicy::_nil ());
 
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
index ec3e48e2520..27dc3ded6c0 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
@@ -107,7 +107,7 @@ TAO_RT_ORBInitializer::pre_init (
                     TAO_Priority_Mapping_Manager (pm),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
@@ -143,7 +143,7 @@ TAO_RT_ORBInitializer::pre_init (
                     TAO_Network_Priority_Mapping_Manager (npm),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
@@ -181,7 +181,7 @@ TAO_RT_ORBInitializer::pre_init (
                     TAO_RT_ORB (tao_info->orb_core ()),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
@@ -198,7 +198,7 @@ TAO_RT_ORBInitializer::pre_init (
                     TAO_RT_Current (tao_info->orb_core ()),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
index 83e195b4b99..f12970f7985 100644
--- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
@@ -171,7 +171,7 @@ TAO_RT_ORB_Loader::init (int argc,
                                                scope_policy),
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
       ACE_TRY_CHECK;
diff --git a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
index 12f3dafc8fa..7e5bd32fd68 100644
--- a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
+++ b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
@@ -62,7 +62,7 @@ TAO_RT_PolicyFactory::_create_policy (
                         TAO_PriorityModelPolicy,
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
       ACE_CHECK_RETURN (CORBA::Policy::_nil ());
@@ -76,7 +76,7 @@ TAO_RT_PolicyFactory::_create_policy (
                         TAO_PriorityBandedConnectionPolicy,
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
       ACE_CHECK_RETURN (CORBA::Policy::_nil ());
@@ -90,7 +90,7 @@ TAO_RT_PolicyFactory::_create_policy (
                         TAO_ClientProtocolPolicy,
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
-                            TAO_DEFAULT_MINOR_CODE,
+                            TAO::VMCID,
                             ENOMEM),
                           CORBA::COMPLETED_NO));
       ACE_CHECK_RETURN (CORBA::Policy::_nil ());
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp
index d66dfa8efb5..7adaebcf324 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.cpp
+++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp
@@ -97,7 +97,7 @@ TAO_PriorityModelPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
   TAO_PriorityModelPolicy* tmp;
   ACE_NEW_THROW_EX (tmp,
                     TAO_PriorityModelPolicy (*this),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
@@ -183,7 +183,7 @@ TAO_ThreadpoolPolicy::create (const CORBA::Any &val
   TAO_ThreadpoolPolicy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
                     TAO_ThreadpoolPolicy (value),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
@@ -211,7 +211,7 @@ TAO_ThreadpoolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
   TAO_ThreadpoolPolicy* tmp;
   ACE_NEW_THROW_EX (tmp,
                     TAO_ThreadpoolPolicy (*this),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
@@ -269,7 +269,7 @@ TAO_PrivateConnectionPolicy::create (const CORBA::Any &
   TAO_PrivateConnectionPolicy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
                     TAO_PrivateConnectionPolicy (),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
@@ -290,7 +290,7 @@ TAO_PrivateConnectionPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
   TAO_PrivateConnectionPolicy* tmp;
   ACE_NEW_THROW_EX (tmp,
                     TAO_PrivateConnectionPolicy (*this),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
@@ -360,7 +360,7 @@ TAO_PriorityBandedConnectionPolicy::create (const CORBA::Any &val
   TAO_PriorityBandedConnectionPolicy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
                     TAO_PriorityBandedConnectionPolicy (*value),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
@@ -374,7 +374,7 @@ TAO_PriorityBandedConnectionPolicy::priority_bands (ACE_ENV_SINGLE_ARG_DECL)
   RTCORBA::PriorityBands *tmp;
   ACE_NEW_THROW_EX (tmp,
                     RTCORBA::PriorityBands (this->priority_bands_),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
 
@@ -395,7 +395,7 @@ TAO_PriorityBandedConnectionPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
   TAO_PriorityBandedConnectionPolicy *tmp;
   ACE_NEW_THROW_EX (tmp,
                     TAO_PriorityBandedConnectionPolicy (*this),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
@@ -478,7 +478,7 @@ TAO_ServerProtocolPolicy::create (const CORBA::Any &val
   TAO_ServerProtocolPolicy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
                     TAO_ServerProtocolPolicy (*value),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
@@ -492,7 +492,7 @@ TAO_ServerProtocolPolicy::protocols (ACE_ENV_SINGLE_ARG_DECL)
   RTCORBA::ProtocolList *tmp;
   ACE_NEW_THROW_EX (tmp,
                     RTCORBA::ProtocolList (this->protocols_),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
 
@@ -513,7 +513,7 @@ TAO_ServerProtocolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
   TAO_ServerProtocolPolicy* tmp;
   ACE_NEW_THROW_EX (tmp,
                     TAO_ServerProtocolPolicy (*this),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
@@ -589,7 +589,7 @@ TAO_ClientProtocolPolicy::create (const CORBA::Any &val
   TAO_ClientProtocolPolicy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
                     TAO_ClientProtocolPolicy (*value),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
@@ -603,7 +603,7 @@ TAO_ClientProtocolPolicy::protocols (ACE_ENV_SINGLE_ARG_DECL)
   RTCORBA::ProtocolList *tmp;
   ACE_NEW_THROW_EX (tmp,
                     RTCORBA::ProtocolList (this->protocols_),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
 
@@ -624,7 +624,7 @@ TAO_ClientProtocolPolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
   TAO_ClientProtocolPolicy* tmp;
   ACE_NEW_THROW_EX (tmp,
                     TAO_ClientProtocolPolicy (*this),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (CORBA::Policy::_nil ());
 
diff --git a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
index dd75f7ba1bd..b28965a7891 100644
--- a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
+++ b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
@@ -32,7 +32,7 @@ TAO_RT_Stub_Factory::create_stub (const char *repository_id,
 
   ACE_NEW_THROW_EX (retval,
                     TAO_RT_Stub (repository_id, profiles, orb_core),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_MAYBE));
 
   ACE_CHECK_RETURN (retval);
diff --git a/TAO/tao/RTCORBA/diffs/RTCORBA.diff b/TAO/tao/RTCORBA/diffs/RTCORBA.diff
index 711f4cc1fcd..a2662c9a1f0 100644
--- a/TAO/tao/RTCORBA/diffs/RTCORBA.diff
+++ b/TAO/tao/RTCORBA/diffs/RTCORBA.diff
@@ -1,6 +1,5 @@
-// -*- C++ -*-
---- orig/RTCORBAC.h     2004-09-16 12:52:02.885009600 +0200
-+++ RTCORBAC.h  2004-09-16 12:36:01.362408000 +0200
+--- orig/RTCORBAC.h	2005-02-14 15:03:04.020758700 +0100
++++ RTCORBAC.h	2005-02-14 15:03:04.321190700 +0100
 @@ -36,12 +36,18 @@
  
  #include "ace/config-all.h"
@@ -20,16 +19,18 @@
  #include "tao/SystemException.h"
  #include "tao/Environment.h"
  #include "tao/Object.h"
-@@ -50,6 +56,8 @@
+@@ -50,7 +56,10 @@
  #include "tao/Seq_Var_T.h"
  #include "tao/Seq_Out_T.h"
  #include "tao/VarOut_T.h"
 +#include "tao/Encodable.h"
 +#include "tao/PolicyC.h"
  
++#include "tao/IOPC.h"
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
-@@ -532,6 +540,7 @@
+ #endif
+@@ -530,6 +539,7 @@
    
    class TAO_RTCORBA_Export ProtocolProperties
      : public virtual CORBA::Object
@@ -37,7 +38,7 @@
    {
    public:
      typedef ProtocolProperties_ptr _ptr_type;
-@@ -568,6 +577,9 @@
+@@ -566,6 +576,9 @@
      virtual const char* _interface_repository_id (void) const;
      virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
    
@@ -47,18 +48,18 @@
    protected:
      // Abstract or local interface only.
      ProtocolProperties (void);
---- orig/RTCORBAC.cpp   2004-09-16 12:52:02.885009600 +0200
-+++ RTCORBAC.cpp        2004-09-16 12:36:36.643139200 +0200
+--- orig/RTCORBAC.cpp	2005-02-14 15:03:04.020758700 +0100
++++ RTCORBAC.cpp	2005-02-14 15:03:04.331205100 +0100
 @@ -29,7 +29,7 @@
- // be/be_codegen.cpp:303
+ // be\be_codegen.cpp:302
  
  
 -#include "RTCORBAC.h"
 +#include "RTCORBA.h"
  #include "tao/CDR.h"
  #include "tao/Typecode.h"
- #include "tao/Any_Impl_T.h"
-@@ -56,6 +56,22 @@
+ #include "tao/Basic_Arguments.h"
+@@ -53,6 +53,22 @@
  {
  }
  
@@ -79,5 +80,16 @@
 +  return 1;
 +}
  
- // TAO_IDL - Generated from
- // be/be_visitor_typecode/typecode_defn.cpp:290
+ // TAO_IDL - Generated from 
+ // be\be_visitor_structure/structure_cs.cpp:66
+--- orig/RTCORBAA.cpp	2005-02-14 15:03:04.020758700 +0100
++++ RTCORBAA.cpp	2005-02-14 15:03:29.016701100 +0100
+@@ -25,7 +25,7 @@
+ // Information about TAO is available at:
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+ 
+-#include "RTCORBAC.h"
++#include "RTCORBA.h"
+ #include "tao/Typecode.h"
+ #include "tao/CDR.h"
+ #include "tao/Any.h"
diff --git a/TAO/tao/RTPortableServer/RTPortableServer.pidl b/TAO/tao/RTPortableServer/RTPortableServer.pidl
index 3e10b14cf66..2058dc1bf09 100644
--- a/TAO/tao/RTPortableServer/RTPortableServer.pidl
+++ b/TAO/tao/RTPortableServer/RTPortableServer.pidl
@@ -19,15 +19,14 @@
  *          -Wb,post_include="ace/post.h"
  *          RTPortableServer.pidl
  *
- *   2. Then apply the patches in tao/RTPortableServer/diffs to the
- *   generated code.
+ *   2. The generated files are ready to use
  */
 
 #ifndef _RT_PORTABLE_SERVER_IDL_
 #define _RT_PORTABLE_SERVER_IDL_
 
-#include "tao/PortableServer/PortableServer.pidl"
-#include "tao/RTCORBA/RTCORBA.pidl"
+#include "tao/PortableServer/PortableServer_include.pidl"
+#include "tao/RTCORBA/RTCORBA_include.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/RTPortableServer/RTPortableServerA.cpp b/TAO/tao/RTPortableServer/RTPortableServerA.cpp
index 2487ab3fc8a..46844097740 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerA.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServerA.cpp
@@ -83,14 +83,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<RTPortableServer::POA>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<RTPortableServer::POA>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.cpp b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
index 63edacd946e..c3b8e885827 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
@@ -43,7 +43,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -158,22 +158,22 @@ RTPortableServer::POA::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/PortableServer/POA:2.3"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/RTPortableServer/POA:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.h b/TAO/tao/RTPortableServer/RTPortableServerC.h
index d648ef41913..4db19fdde67 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.h
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.h
@@ -47,8 +47,8 @@
 #include "tao/Object.h"
 #include "tao/Objref_VarOut_T.h"
 
-#include "tao/PortableServer/PortableServerC.h"
-#include "tao/RTCORBA/RTCORBA.h"
+#include "tao/PortableServer/PortableServer_includeC.h"
+#include "tao/RTCORBA/RTCORBA_includeC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -72,7 +72,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from 
-// be\be_visitor_root/root_ch.cpp:63
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -89,7 +89,7 @@ namespace RTPortableServer
 {
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:603
+  // be\be_interface.cpp:598
 
 #if !defined (_RTPORTABLESERVER_POA__VAR_OUT_CH_)
 #define _RTPORTABLESERVER_POA__VAR_OUT_CH_
@@ -139,7 +139,7 @@ namespace RTPortableServer
     
     static POA_ptr _nil (void)
     {
-      return (POA_ptr)0;
+      return static_cast<POA_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
@@ -274,7 +274,7 @@ TAO_RTPortableServer_Export void operator<<= (CORBA::Any &, RTPortableServer::PO
 TAO_RTPortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, RTPortableServer::POA_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:963
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "RTPortableServerC.inl"
diff --git a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
index 7487e128b7d..a97308a22a2 100644
--- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
+++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
@@ -11,8 +11,8 @@ ACE_RCSID(RTPortableServer,
 #include "tao/ORB_Core.h"
 #include "tao/Object.h"
 #include "tao/Stub.h"
-#include "tao/PortableServer/Object_Adapter.h"
-#include "tao/PortableServer/POA.h"
+#include "tao/PortableServer/Servant_Upcall.h"
+#include "tao/PortableServer/Root_POA.h"
 #include "tao/RTCORBA/Thread_Pool.h"
 #include "tao/Profile.h"
 
@@ -31,15 +31,15 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object
 
   // Lookup the target POA.  Note that Object Adapter lock is held
   // until <servant_upcall> dies.
-  TAO_Object_Adapter::Servant_Upcall servant_upcall (orb_core);
-  TAO_POA *poa =
+  TAO::Portable_Server::Servant_Upcall servant_upcall (orb_core);
+  TAO_Root_POA *poa =
     servant_upcall.lookup_POA (object->_stubobj ()->object_key ()
                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Get the thread pool associated with this POA.
   TAO_Thread_Pool *target_thread_pool =
-    (TAO_Thread_Pool *) poa->thread_pool ();
+    static_cast <TAO_Thread_Pool *> (poa->thread_pool ());
 
   // If the target POA does not have a dedicated thread pool, then all
   // calls to it are collocated.
@@ -52,7 +52,7 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object
 
   // Get the lane for this thread.
   TAO_Thread_Lane *current_thread_lane =
-    (TAO_Thread_Lane *) tss.lane_;
+    static_cast <TAO_Thread_Lane *> (tss.lane_);
 
   TAO_Thread_Pool *current_thread_pool = 0;
 
@@ -77,20 +77,16 @@ TAO_RT_Collocation_Resolver::is_collocated (CORBA::Object_ptr object
   if (!current_thread_pool->with_lanes ())
     return 1;
 
-  // Grab the cached policies from the POA.
-  TAO_POA_Cached_Policies &cached_policies =
-    poa->cached_policies ();
-
   // Grab the priority model used by the POA.  Note that this cannot
   // be NOT_SPECIFIED because NOT_SPECIFIED is not allowed with thread
   // pool with lanes.
-  TAO_POA_Cached_Policies::PriorityModel priority_model =
-    cached_policies.priority_model ();
+  TAO::Portable_Server::Cached_Policies::PriorityModel priority_model =
+    poa->priority_model ();
 
   // If the policy is CLIENT_PROPAGATED, then we are collocated
   // because the current thread is of the correct priority :-) and
   // we'll simple use the current thread to run the upcall.
-  if (priority_model == TAO_POA_Cached_Policies::CLIENT_PROPAGATED)
+  if (priority_model == TAO::Portable_Server::Cached_Policies::CLIENT_PROPAGATED)
     return 1;
 
   // Locate the target servant.  We are really not interested in the
diff --git a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
index bcfa7a8dbe6..84338ec2566 100644
--- a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
+++ b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
@@ -5,6 +5,7 @@
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
 #include "tao/PortableServer/Object_Adapter.h"
+#include "tao/PortableServer/POA_Current.h"
 #include "tao/ORB_Core.h"
 #include "RT_Servant_Dispatcher.h"
 #include "RT_Policy_Validator.h"
@@ -14,7 +15,6 @@ ACE_RCSID (RTPortableServer,
            RT_Object_Adapter_Factory,
            "$Id$")
 
-
 TAO_RT_Object_Adapter_Factory::TAO_RT_Object_Adapter_Factory (void)
 {
 }
@@ -23,7 +23,7 @@ TAO_Adapter*
 TAO_RT_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core)
 {
   // Setup the POA_Current object in the ORB
-  CORBA::Object_var current = new TAO_POA_Current;
+  CORBA::Object_var current = new TAO::Portable_Server::POA_Current;
   orb_core->poa_current (current.in ());
 
   if (!orb_core->orb_params ()->disable_rt_collocation_resolver ())
@@ -43,14 +43,14 @@ TAO_RT_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core)
                   0);
 
   // Create and register the RT servant dispatcher.
-  TAO_RT_Servant_Dispatcher *rt_servant_dispatcher;
+  TAO_RT_Servant_Dispatcher *rt_servant_dispatcher = 0;
   ACE_NEW_RETURN (rt_servant_dispatcher,
                   TAO_RT_Servant_Dispatcher,
                   0);
   object_adapter->servant_dispatcher (rt_servant_dispatcher);
 
   // Create and add the RT policy validator.
-  TAO_POA_RT_Policy_Validator *rt_validator;
+  TAO_POA_RT_Policy_Validator *rt_validator = 0;
   ACE_NEW_RETURN (rt_validator,
                   TAO_POA_RT_Policy_Validator (*orb_core),
                   0);
diff --git a/TAO/tao/RTPortableServer/RT_POA.cpp b/TAO/tao/RTPortableServer/RT_POA.cpp
index 10c586283d2..43dd02f08cb 100644
--- a/TAO/tao/RTPortableServer/RT_POA.cpp
+++ b/TAO/tao/RTPortableServer/RT_POA.cpp
@@ -31,30 +31,28 @@
 # include "RT_POA.i"
 #endif /* ! __ACE_INLINE__ */
 
-
 ACE_RCSID (RTPortableServer,
            RT_POA,
            "$Id$")
 
-
-TAO_RT_POA::TAO_RT_POA (const TAO_POA::String &name,
+TAO_RT_POA::TAO_RT_POA (const TAO_Root_POA::String &name,
                         TAO_POA_Manager &poa_manager,
                         const TAO_POA_Policy_Set &policies,
-                        TAO_POA *parent,
+                        TAO_Root_POA *parent,
                         ACE_Lock &lock,
                         TAO_SYNCH_MUTEX &thread_lock,
                         TAO_ORB_Core &orb_core,
                         TAO_Object_Adapter *object_adapter
                         ACE_ENV_ARG_DECL)
-  : TAO_POA (name,
-             poa_manager,
-             policies,
-             parent,
-             lock,
-             thread_lock,
-             orb_core,
-             object_adapter
-             ACE_ENV_ARG_PARAMETER),
+  : TAO_Regular_POA (name,
+                     poa_manager,
+                     policies,
+                     parent,
+                     lock,
+                     thread_lock,
+                     orb_core,
+                     object_adapter
+                     ACE_ENV_ARG_PARAMETER),
   thread_pool_ (0)
 {
   ACE_CHECK;
@@ -69,11 +67,11 @@ TAO_RT_POA::~TAO_RT_POA (void)
 {
 }
 
-TAO_POA *
+TAO_Root_POA *
 TAO_RT_POA::new_POA (const String &name,
                      TAO_POA_Manager &poa_manager,
                      const TAO_POA_Policy_Set &policies,
-                     TAO_POA *parent,
+                     TAO_Root_POA *parent,
                      ACE_Lock &lock,
                      TAO_SYNCH_MUTEX &thread_lock,
                      TAO_ORB_Core &orb_core,
@@ -119,14 +117,14 @@ TAO_RT_POA::parse_rt_policies (TAO_POA_Policy_Set &policies
           priority_model->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
 
-        this->cached_policies ().priority_model (
-          TAO_POA_Cached_Policies::PriorityModel (rt_priority_model));
+        this->cached_policies_.priority_model (
+          TAO::Portable_Server::Cached_Policies::PriorityModel (rt_priority_model));
 
         RTCORBA::Priority priority =
           priority_model->server_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_CHECK;
 
-        this->cached_policies ().server_priority (priority);
+        this->cached_policies_.server_priority (priority);
       }
   }
 
@@ -188,8 +186,8 @@ TAO_RT_POA::validate_priority (RTCORBA::Priority priority
       ACE_CHECK;
 
       TAO_PriorityBandedConnectionPolicy *priority_bands_i =
-        ACE_dynamic_cast (TAO_PriorityBandedConnectionPolicy *,
-                          priority_bands.in ());
+        dynamic_cast <TAO_PriorityBandedConnectionPolicy *>
+                          (priority_bands.in ());
 
       if (priority_bands_i)
         {
@@ -231,7 +229,7 @@ TAO_RT_POA::validate_policies (ACE_ENV_SINGLE_ARG_DECL)
   // SERVER_DECLARED option for the PriorityModelPolicy then the ORB
   // shall raise a WrongPolicy user exception.
   if (this->cached_policies_.priority_model () !=
-      TAO_POA_Cached_Policies::SERVER_DECLARED)
+      TAO::Portable_Server::Cached_Policies::SERVER_DECLARED)
     {
       ACE_THROW (PortableServer::POA::WrongPolicy ());
     }
@@ -266,8 +264,7 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key,
   ACE_CHECK_RETURN (0);
 
   TAO_ServerProtocolPolicy *server_protocol =
-    ACE_dynamic_cast (TAO_ServerProtocolPolicy *,
-                      server_protocol_policy.in ());
+    dynamic_cast <TAO_ServerProtocolPolicy *> (server_protocol_policy.in ());
 
   // Filter for server protocol.
   TAO_Server_Protocol_Acceptor_Filter filter (server_protocol->protocols_rep ());
@@ -304,7 +301,7 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key,
         }
 
       return
-        this->TAO_POA::create_stub_object (object_key,
+        this->TAO_Regular_POA::create_stub_object (object_key,
                                            type_id,
                                            client_exposed_policies._retn (),
                                            &filter,
@@ -316,7 +313,7 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key,
   // the acceptors in the only thread lane that matches the priority
   // of the object.
   if (this->cached_policies_.priority_model () ==
-      TAO_POA_Cached_Policies::SERVER_DECLARED)
+      TAO::Portable_Server::Cached_Policies::SERVER_DECLARED)
     {
       TAO_Thread_Lane **lanes =
         this->thread_pool_->lanes ();
@@ -326,7 +323,7 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key,
            ++i)
         {
           if (lanes[i]->lane_priority () == priority)
-            return this->TAO_POA::create_stub_object (object_key,
+            return this->TAO_Regular_POA::create_stub_object (object_key,
                                                       type_id,
                                                       client_exposed_policies._retn (),
                                                       &filter,
@@ -352,8 +349,7 @@ TAO_RT_POA::key_to_stub_i (const TAO::ObjectKey &object_key,
   ACE_CHECK_RETURN (0);
 
   TAO_PriorityBandedConnectionPolicy *priority_bands_i =
-    ACE_dynamic_cast (TAO_PriorityBandedConnectionPolicy *,
-                      priority_bands.in ());
+    dynamic_cast <TAO_PriorityBandedConnectionPolicy *> (priority_bands.in ());
 
   return this->create_stub_object (object_key,
                                    type_id,
@@ -385,7 +381,7 @@ TAO_RT_POA::create_stub_object (const TAO::ObjectKey &object_key,
   // profiles than there are endpoints.  In some cases, there can be
   // less profiles than endpoints.
   int result =
-    mprofile.set (ACE_static_cast (CORBA::ULong, profile_count));
+    mprofile.set (static_cast <CORBA::ULong> (profile_count));
   if (result == -1)
     error = 1;
 
@@ -493,7 +489,7 @@ TAO_RT_POA::client_exposed_policies (CORBA::Short object_priority
   CORBA::PolicyList *client_exposed_policies = 0;
   ACE_NEW_THROW_EX (client_exposed_policies,
                     CORBA::PolicyList (),
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
 
@@ -511,7 +507,7 @@ TAO_RT_POA::client_exposed_policies (CORBA::Short object_priority
 
   if (poa_priority != TAO_INVALID_PRIORITY)
     {
-      TAO_POA_Cached_Policies::PriorityModel priority_model =
+      TAO::Portable_Server::Cached_Policies::PriorityModel priority_model =
         this->cached_policies_.priority_model ();
 
       // If the priority model is client propagated, let the client
@@ -519,7 +515,7 @@ TAO_RT_POA::client_exposed_policies (CORBA::Short object_priority
       // the priority model is server declared, tell the client the
       // servant's priority.
       CORBA::Short priority;
-      if (priority_model == TAO_POA_Cached_Policies::CLIENT_PROPAGATED)
+      if (priority_model == TAO::Portable_Server::Cached_Policies::CLIENT_PROPAGATED)
         priority = poa_priority;
       else
         priority = object_priority;
@@ -532,7 +528,7 @@ TAO_RT_POA::client_exposed_policies (CORBA::Short object_priority
       ACE_NEW_THROW_EX (priority_model_policy,
                         TAO_PriorityModelPolicy (RTCORBA::PriorityModel (priority_model),
                                                  priority),
-                        CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                        CORBA::NO_MEMORY (TAO::VMCID,
                                           CORBA::COMPLETED_NO));
       ACE_CHECK_RETURN (0);
 
@@ -553,7 +549,7 @@ TAO_RT_POA::create_POA (const char *adapter_name,
                    PortableServer::POA::AdapterAlreadyExists,
                    PortableServer::POA::InvalidPolicy))
 {
-  PortableServer::POA_ptr poa = this->TAO_POA::create_POA (adapter_name,
+  PortableServer::POA_ptr poa = this->TAO_Regular_POA::create_POA (adapter_name,
                                                            poa_manager,
                                                            policies
                                                            ACE_ENV_ARG_PARAMETER);
@@ -568,7 +564,7 @@ TAO_RT_POA::find_POA (const char *adapter_name,
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::AdapterNonExistent))
 {
-  PortableServer::POA_ptr poa = this->TAO_POA::find_POA (adapter_name,
+  PortableServer::POA_ptr poa = this->TAO_Regular_POA::find_POA (adapter_name,
                                                          activate_it
                                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (poa);
@@ -581,7 +577,7 @@ TAO_RT_POA::destroy (CORBA::Boolean etherealize_objects,
                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->TAO_POA::destroy (etherealize_objects,
+  this->TAO_Regular_POA::destroy (etherealize_objects,
                           wait_for_completion
                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -596,7 +592,7 @@ TAO_RT_POA::create_thread_policy (PortableServer::ThreadPolicyValue value
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ThreadPolicy_ptr policy =
-    this->TAO_POA::create_thread_policy (value
+    this->TAO_Regular_POA::create_thread_policy (value
                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (policy);
   return policy;
@@ -610,7 +606,7 @@ TAO_RT_POA::create_lifespan_policy (PortableServer::LifespanPolicyValue value
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::LifespanPolicy_ptr policy =
-    this->TAO_POA::create_lifespan_policy (value
+    this->TAO_Regular_POA::create_lifespan_policy (value
                                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (policy);
   return policy;
@@ -622,7 +618,7 @@ TAO_RT_POA::create_id_uniqueness_policy (PortableServer::IdUniquenessPolicyValue
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::IdUniquenessPolicy_ptr policy =
-    this->TAO_POA::create_id_uniqueness_policy (value
+    this->TAO_Regular_POA::create_id_uniqueness_policy (value
                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (policy);
   return policy;
@@ -635,7 +631,7 @@ TAO_RT_POA::create_id_assignment_policy (PortableServer::IdAssignmentPolicyValue
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::IdAssignmentPolicy_ptr policy =
-    this->TAO_POA::create_id_assignment_policy (value
+    this->TAO_Regular_POA::create_id_assignment_policy (value
                                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (policy);
   return policy;
@@ -650,7 +646,7 @@ TAO_RT_POA::create_implicit_activation_policy (PortableServer::ImplicitActivatio
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ImplicitActivationPolicy_ptr policy =
-    this->TAO_POA::create_implicit_activation_policy (value
+    this->TAO_Regular_POA::create_implicit_activation_policy (value
                                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (policy);
   return policy;
@@ -662,7 +658,7 @@ TAO_RT_POA::create_servant_retention_policy (PortableServer::ServantRetentionPol
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ServantRetentionPolicy_ptr policy =
-    this->TAO_POA::create_servant_retention_policy (value
+    this->TAO_Regular_POA::create_servant_retention_policy (value
                                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (policy);
   return policy;
@@ -675,7 +671,7 @@ TAO_RT_POA::create_request_processing_policy (PortableServer::RequestProcessingP
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::RequestProcessingPolicy_ptr policy =
-    this->TAO_POA::create_request_processing_policy (value
+    this->TAO_Regular_POA::create_request_processing_policy (value
                                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (policy);
   return policy;
@@ -689,7 +685,7 @@ TAO_RT_POA::the_name (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   char * name =
-    this->TAO_POA::the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->TAO_Regular_POA::the_name (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (name);
   return name;
 }
@@ -699,7 +695,7 @@ TAO_RT_POA::the_parent (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POA_ptr parent =
-    this->TAO_POA::the_parent (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->TAO_Regular_POA::the_parent (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (parent);
   return parent;
 }
@@ -709,7 +705,7 @@ TAO_RT_POA::the_children (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POAList *children =
-    this->TAO_POA::the_children (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->TAO_Regular_POA::the_children (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (children);
   return children;
 }
@@ -719,7 +715,7 @@ TAO_RT_POA::the_POAManager (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::POAManager_ptr poa_manager =
-    this->TAO_POA::the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->TAO_Regular_POA::the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (poa_manager);
   return poa_manager;
 }
@@ -732,7 +728,7 @@ TAO_RT_POA::the_activator (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::AdapterActivator_ptr activator =
-    this->TAO_POA::the_activator (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->TAO_Regular_POA::the_activator (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (activator);
   return activator;
 }
@@ -742,7 +738,7 @@ TAO_RT_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activato
                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->TAO_POA::the_activator (adapter_activator
+  this->TAO_Regular_POA::the_activator (adapter_activator
                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -753,7 +749,7 @@ TAO_RT_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_DECL)
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::ServantManager_ptr servant_manager =
-    this->TAO_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->TAO_Regular_POA::get_servant_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (servant_manager);
   return servant_manager;
 }
@@ -764,7 +760,7 @@ TAO_RT_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
-  this->TAO_POA::set_servant_manager (imgr
+  this->TAO_Regular_POA::set_servant_manager (imgr
                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -776,7 +772,7 @@ TAO_RT_POA::get_servant (ACE_ENV_SINGLE_ARG_DECL)
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::Servant servant =
-    this->TAO_POA::get_servant (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->TAO_Regular_POA::get_servant (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (servant);
   return servant;
 }
@@ -787,7 +783,7 @@ TAO_RT_POA::set_servant (PortableServer::Servant servant
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::POA::WrongPolicy))
 {
-  this->TAO_POA::set_servant (servant
+  this->TAO_Regular_POA::set_servant (servant
                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -802,7 +798,7 @@ TAO_RT_POA::activate_object (PortableServer::Servant p_servant
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::ObjectId *object_id =
-    this->TAO_POA::activate_object (p_servant
+    this->TAO_Regular_POA::activate_object (p_servant
                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (object_id);
   return object_id;
@@ -817,7 +813,7 @@ TAO_RT_POA::activate_object_with_id (const PortableServer::ObjectId &id,
                    PortableServer::POA::ObjectAlreadyActive,
                    PortableServer::POA::WrongPolicy))
 {
-  this->TAO_POA::activate_object_with_id (id,
+  this->TAO_Regular_POA::activate_object_with_id (id,
                                           p_servant
                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -830,7 +826,7 @@ TAO_RT_POA::deactivate_object (const PortableServer::ObjectId &oid
                    PortableServer::POA::ObjectNotActive,
                    PortableServer::POA::WrongPolicy))
 {
-  this->TAO_POA::deactivate_object (oid
+  this->TAO_Regular_POA::deactivate_object (oid
                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -842,7 +838,7 @@ TAO_RT_POA::create_reference (const char *intf
                    PortableServer::POA::WrongPolicy))
 {
   CORBA::Object_ptr obj =
-    this->TAO_POA::create_reference (intf
+    this->TAO_Regular_POA::create_reference (intf
                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (obj);
   return obj;
@@ -852,11 +848,10 @@ CORBA::Object_ptr
 TAO_RT_POA::create_reference_with_id (const PortableServer::ObjectId &oid,
                                       const char *intf
                                       ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableServer::POA::WrongPolicy))
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Object_ptr obj =
-    this->TAO_POA::create_reference_with_id (oid,
+    this->TAO_Regular_POA::create_reference_with_id (oid,
                                              intf
                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (obj);
@@ -871,7 +866,7 @@ TAO_RT_POA::servant_to_id (PortableServer::Servant p_servant
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::ObjectId *object_id =
-    this->TAO_POA::servant_to_id (p_servant
+    this->TAO_Regular_POA::servant_to_id (p_servant
                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (object_id);
   return object_id;
@@ -885,7 +880,7 @@ TAO_RT_POA::servant_to_reference (PortableServer::Servant p_servant
                    PortableServer::POA::WrongPolicy))
 {
   CORBA::Object_ptr obj =
-    this->TAO_POA::servant_to_reference (p_servant
+    this->TAO_Regular_POA::servant_to_reference (p_servant
                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (obj);
   return obj;
@@ -901,7 +896,7 @@ TAO_RT_POA::reference_to_servant (CORBA::Object_ptr reference
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::Servant servant =
-    this->TAO_POA::reference_to_servant (reference
+    this->TAO_Regular_POA::reference_to_servant (reference
                                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (servant);
   return servant;
@@ -915,7 +910,7 @@ TAO_RT_POA::reference_to_id (CORBA::Object_ptr reference
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::ObjectId *object_id =
-    this->TAO_POA::reference_to_id (reference
+    this->TAO_Regular_POA::reference_to_id (reference
                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (object_id);
   return object_id;
@@ -929,7 +924,7 @@ TAO_RT_POA::id_to_servant (const PortableServer::ObjectId &oid
                    PortableServer::POA::WrongPolicy))
 {
   PortableServer::Servant servant =
-    this->TAO_POA::id_to_servant (oid
+    this->TAO_Regular_POA::id_to_servant (oid
                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (servant);
   return servant;
@@ -943,7 +938,7 @@ TAO_RT_POA::id_to_reference (const PortableServer::ObjectId &oid
                    PortableServer::POA::WrongPolicy))
 {
   CORBA::Object_ptr obj =
-    this->TAO_POA::id_to_reference (oid
+    this->TAO_Regular_POA::id_to_reference (oid
                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (obj);
   return obj;
@@ -953,13 +948,7 @@ CORBA::OctetSeq *
 TAO_RT_POA::id (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->TAO_POA::id (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return this->TAO_Regular_POA::id (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTPortableServer/RT_POA.h b/TAO/tao/RTPortableServer/RT_POA.h
index 197857215b9..d3bbb2816d9 100644
--- a/TAO/tao/RTPortableServer/RT_POA.h
+++ b/TAO/tao/RTPortableServer/RT_POA.h
@@ -18,7 +18,7 @@
 
 #include "rtportableserver_export.h"
 
-#include "tao/PortableServer/POA.h"
+#include "tao/PortableServer/Regular_POA.h"
 #include "tao/orbconf.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
@@ -34,9 +34,7 @@
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -46,7 +44,7 @@ class TAO_PriorityBandedConnectionPolicy;
 
 class TAO_RTPortableServer_Export TAO_RT_POA :
   public virtual RTPortableServer::POA,
-  public virtual TAO_POA
+  public virtual TAO_Regular_POA
 {
 public:
 
@@ -207,8 +205,7 @@ public:
   CORBA::Object_ptr create_reference_with_id (const PortableServer::ObjectId &oid,
                                               const char *intf
                                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableServer::POA::WrongPolicy));
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::ObjectId *servant_to_id (PortableServer::Servant p_servant
                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
@@ -258,7 +255,7 @@ public:
   TAO_RT_POA (const String &name,
               TAO_POA_Manager &poa_manager,
               const TAO_POA_Policy_Set &policies,
-              TAO_POA *parent,
+              TAO_Root_POA *parent,
               ACE_Lock &lock,
               TAO_SYNCH_MUTEX &thread_lock,
               TAO_ORB_Core &orb_core,
@@ -272,10 +269,10 @@ public:
 protected:
 
   /// Template method for creating new POA's of this type.
-  virtual TAO_POA *new_POA (const String &name,
+  virtual TAO_Root_POA *new_POA (const String &name,
                             TAO_POA_Manager &poa_manager,
                             const TAO_POA_Policy_Set &policies,
-                            TAO_POA *parent,
+                            TAO_Root_POA *parent,
                             ACE_Lock &lock,
                             TAO_SYNCH_MUTEX &thread_lock,
                             TAO_ORB_Core &orb_core,
@@ -313,7 +310,7 @@ protected:
 
 };
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/RTPortableServer/RT_POA.i b/TAO/tao/RTPortableServer/RT_POA.i
index 07109328906..a0c51ad2e6d 100644
--- a/TAO/tao/RTPortableServer/RT_POA.i
+++ b/TAO/tao/RTPortableServer/RT_POA.i
@@ -2,6 +2,7 @@
 
 // Exception macros
 #include "tao/PortableServer/poa_macros.h"
+#include "tao/PortableServer/POA_Guard.h"
 #include "tao/Environment.h"
 
 ACE_INLINE CORBA::Object_ptr
@@ -67,11 +68,11 @@ TAO_RT_POA::activate_object_with_priority (PortableServer::Servant servant,
 
   while (1)
     {
-      int wait_occurred_restart_call = 0;      
+      int wait_occurred_restart_call = 0;
 
       // Lock access for the duration of this transaction.
       TAO_POA_GUARD_RETURN (0);
-      
+
       PortableServer::ObjectId *result =
         this->activate_object_i (servant,
                                  priority,
@@ -108,11 +109,11 @@ TAO_RT_POA::activate_object_with_id_and_priority (const PortableServer::ObjectId
 
   while (1)
     {
-      int wait_occurred_restart_call = 0;      
-      
+      int wait_occurred_restart_call = 0;
+
       // Lock access for the duration of this transaction.
       TAO_POA_GUARD;
-      
+
       this->activate_object_with_id_i (oid,
                                        servant,
                                        priority,
diff --git a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
index cdea3350ccd..97242642f66 100644
--- a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
+++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
@@ -2,8 +2,8 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "tao/PortableServer/PortableServerC.h"
 #include "tao/PortableServer/POA_Cached_Policies.h"
+#include "tao/PortableServer/PortableServer.h"
 #include "tao/RTCORBA/RT_Policy_i.h"
 #include "tao/RTCORBA/Thread_Pool.h"
 #include "tao/RTCORBA/RT_ORB.h"
@@ -89,8 +89,8 @@ TAO_POA_RT_Policy_Validator::validate_server_protocol (TAO_Policy_Set &policies
   ACE_CHECK;
 
   TAO_ServerProtocolPolicy *server_protocol =
-    ACE_dynamic_cast (TAO_ServerProtocolPolicy *,
-                      server_protocol_policy.in ());
+    dynamic_cast <TAO_ServerProtocolPolicy *>
+                      (server_protocol_policy.in ());
 
   RTCORBA::ProtocolList &protocols =
     server_protocol->protocols_rep ();
@@ -162,8 +162,8 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
   // Initialize to the default priority/priority model.
   CORBA::Short priority =
     TAO_INVALID_PRIORITY;
-  TAO_POA_Cached_Policies::PriorityModel rt_priority_model =
-    TAO_POA_Cached_Policies::NOT_SPECIFIED;
+  TAO::Portable_Server::Cached_Policies::PriorityModel rt_priority_model =
+    TAO::Portable_Server::Cached_Policies::NOT_SPECIFIED;
 
   CORBA::Policy_var policy =
     policies.get_cached_policy (TAO_CACHED_POLICY_PRIORITY_MODEL
@@ -181,7 +181,7 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
       ACE_CHECK;
 
       rt_priority_model =
-        TAO_POA_Cached_Policies::PriorityModel (
+        TAO::Portable_Server::Cached_Policies::PriorityModel (
           priority_model->priority_model (ACE_ENV_SINGLE_ARG_PARAMETER));
       ACE_CHECK;
 
@@ -233,7 +233,7 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
   if (bands_policy != 0)
     {
       // Checks 0.
-      if (rt_priority_model == TAO_POA_Cached_Policies::NOT_SPECIFIED)
+      if (rt_priority_model == TAO::Portable_Server::Cached_Policies::NOT_SPECIFIED)
         ACE_THROW (PortableServer::POA::InvalidPolicy ());
 
       RTCORBA::PriorityBands &bands =
@@ -262,7 +262,7 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
         }
 
       // Check 3.
-      if (rt_priority_model == TAO_POA_Cached_Policies::SERVER_DECLARED)
+      if (rt_priority_model == TAO::Portable_Server::Cached_Policies::SERVER_DECLARED)
         {
           int match = 0;
           for (CORBA::ULong i = 0; i < bands.length (); ++i)
@@ -324,7 +324,7 @@ TAO_POA_RT_Policy_Validator::validate_priorities (TAO_Policy_Set &policies
   // model is SERVER_DECLARED, make sure we have at least one thread
   // lane that can provide service for the specified SERVER_DECLARED
   // priority.
-  if (rt_priority_model == TAO_POA_Cached_Policies::SERVER_DECLARED)
+  if (rt_priority_model == TAO::Portable_Server::Cached_Policies::SERVER_DECLARED)
     {
       // If this POA is using the default thread pool (which doesn't
       // have lanes) or a thread pool without lanes, we are done with
@@ -580,8 +580,7 @@ TAO_POA_RT_Policy_Validator::extract_thread_pool (TAO_ORB_Core &orb_core,
   ACE_CHECK_RETURN (0);
 
   TAO_RT_ORB *tao_rt_orb =
-    ACE_dynamic_cast (TAO_RT_ORB *,
-                      rt_orb.in ());
+    dynamic_cast <TAO_RT_ORB *> (rt_orb.in ());
 
   TAO_Thread_Pool_Manager &tp_manager =
     tao_rt_orb->tp_manager ();
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
index 5ca6b1c1e94..cffae210ea4 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
@@ -22,17 +22,16 @@ ACE_RCSID (RTPortableServer,
            RT_Servant_Dispatcher,
            "$Id$")
 
-
 TAO_RT_Servant_Dispatcher::~TAO_RT_Servant_Dispatcher (void)
 {
 }
 
 void
 TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
-  TAO_POA &poa,
+  TAO_Root_POA &poa,
   CORBA::Short servant_priority,
   TAO_ServerRequest &req,
-  TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
+  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
   ACE_ENV_ARG_DECL)
 {
   TAO_Service_Context &request_service_context =
@@ -40,7 +39,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
   TAO_Service_Context &reply_service_context = req.reply_service_context ();
 
   TAO_Thread_Pool *thread_pool =
-    (TAO_Thread_Pool *) poa.thread_pool ();
+    static_cast <TAO_Thread_Pool *> (poa.thread_pool ());
 
   if (thread_pool != 0 &&
       thread_pool->with_lanes ())
@@ -57,7 +56,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
 
           /// Get the lane attribute in TSS.
           TAO_Thread_Lane *lane =
-            (TAO_Thread_Lane *) tss->lane_;
+            static_cast<TAO_Thread_Lane *> (tss->lane_);
 
           ACE_ASSERT (lane->pool ().id () ==
                       thread_pool->id ());
@@ -81,19 +80,17 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
 
   const char *priority_model;
   RTCORBA::Priority target_priority = TAO_INVALID_PRIORITY;
-  TAO_POA_Cached_Policies &cached_policies =
-    poa.cached_policies ();
 
   // NOT_SPECIFIED PriorityModel processing.
-  if (cached_policies.priority_model () ==
-      TAO_POA_Cached_Policies::NOT_SPECIFIED)
+  if (poa.priority_model () ==
+      TAO::Portable_Server::Cached_Policies::NOT_SPECIFIED)
     {
       priority_model = "RTCORBA::NOT_SPECIFIED";
     }
 
   // CLIENT_PROPAGATED PriorityModel processing.
-  else if (cached_policies.priority_model () ==
-      TAO_POA_Cached_Policies::CLIENT_PROPAGATED)
+  else if (poa.priority_model () ==
+      TAO::Portable_Server::Cached_Policies::CLIENT_PROPAGATED)
     {
       priority_model = "RTCORBA::CLIENT_PROPAGATED";
 
@@ -105,14 +102,14 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
                                                &context) == 1)
         {
           // Extract the target priority
-          TAO_InputCDR cdr (ACE_reinterpret_cast
-                            (const char*,
-                             context->context_data.get_buffer ()),
+          TAO_InputCDR cdr (reinterpret_cast
+                            <const char*>
+                             (context->context_data.get_buffer ()),
                             context->context_data.length ());
           CORBA::Boolean byte_order;
           if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
             ACE_THROW (CORBA::MARSHAL ());
-          cdr.reset_byte_order (ACE_static_cast(int,byte_order));
+          cdr.reset_byte_order (static_cast<int> (byte_order));
 
           if ((cdr >> target_priority) == 0)
             ACE_THROW (CORBA::MARSHAL ());
@@ -126,7 +123,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
         {
           // Use default priority if none came in the request.
           // (Request must have come from a non-RT ORB.)
-          target_priority = cached_policies.server_priority ();
+          target_priority = poa.server_priority ();
         }
     }
   else
@@ -213,7 +210,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
                                                CORBA::COMPLETED_NO));
 
           pre_invoke_state.state_ =
-            TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State::PRIORITY_RESET_REQUIRED;
+            TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State::PRIORITY_RESET_REQUIRED;
 
           if (TAO_debug_level > 0)
             {
@@ -269,13 +266,13 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
 }
 
 void
-TAO_RT_Servant_Dispatcher::pre_invoke_collocated_request (TAO_POA &poa,
+TAO_RT_Servant_Dispatcher::pre_invoke_collocated_request (TAO_Root_POA &poa,
                                                           CORBA::Short servant_priority,
-                                                          TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
+                                                          TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
                                                           ACE_ENV_ARG_DECL)
 {
   TAO_Thread_Pool *thread_pool =
-    (TAO_Thread_Pool *) poa.thread_pool ();
+    static_cast <TAO_Thread_Pool *> (poa.thread_pool ());
 
   if (thread_pool == 0 ||
       thread_pool->with_lanes ())
@@ -287,11 +284,8 @@ TAO_RT_Servant_Dispatcher::pre_invoke_collocated_request (TAO_POA &poa,
       return;
     }
 
-  TAO_POA_Cached_Policies &cached_policies =
-    poa.cached_policies ();
-
-  if (cached_policies.priority_model () !=
-      TAO_POA_Cached_Policies::SERVER_DECLARED ||
+  if (poa.priority_model () !=
+      TAO::Portable_Server::Cached_Policies::SERVER_DECLARED ||
       servant_priority == TAO_INVALID_PRIORITY)
     {
       //
@@ -327,20 +321,20 @@ TAO_RT_Servant_Dispatcher::pre_invoke_collocated_request (TAO_POA &poa,
                                            CORBA::COMPLETED_NO));
 
       pre_invoke_state.state_ =
-        TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State::PRIORITY_RESET_REQUIRED;
+        TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State::PRIORITY_RESET_REQUIRED;
     }
 }
 
 void
-TAO_RT_Servant_Dispatcher::post_invoke (TAO_POA &poa,
-                                        TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State &pre_invoke_state)
+TAO_RT_Servant_Dispatcher::post_invoke (TAO_Root_POA &poa,
+                                        TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state)
 
 {
   if (pre_invoke_state.state_ ==
-      TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State::PRIORITY_RESET_REQUIRED)
+      TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State::PRIORITY_RESET_REQUIRED)
     {
       pre_invoke_state.state_ =
-        TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State::NO_ACTION_REQUIRED;
+        TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State::NO_ACTION_REQUIRED;
 
       ACE_DECLARE_NEW_CORBA_ENV;
 
@@ -371,24 +365,23 @@ TAO_RT_Servant_Dispatcher::post_invoke (TAO_POA &poa,
     }
 }
 
-TAO_POA *
-TAO_RT_Servant_Dispatcher::create_POA (const ACE_CString &name,
-                                       TAO_POA_Manager &poa_manager,
-                                       const TAO_POA_Policy_Set &policies,
-                                       TAO_POA *parent,
-                                       ACE_Lock &lock,
-                                       TAO_SYNCH_MUTEX &thread_lock,
-                                       TAO_ORB_Core &orb_core,
-                                       TAO_Object_Adapter *object_adapter
-                                       ACE_ENV_ARG_DECL)
+TAO_Root_POA *
+TAO_RT_Servant_Dispatcher::create_Root_POA (const ACE_CString &name,
+                                            TAO_POA_Manager &poa_manager,
+                                            const TAO_POA_Policy_Set &policies,
+                                            ACE_Lock &lock,
+                                            TAO_SYNCH_MUTEX &thread_lock,
+                                            TAO_ORB_Core &orb_core,
+                                            TAO_Object_Adapter *object_adapter
+                                            ACE_ENV_ARG_DECL)
 {
-  TAO_RT_POA *poa;
+  TAO_RT_POA *poa = 0;
 
   ACE_NEW_THROW_EX (poa,
                     TAO_RT_POA (name,
                                 poa_manager,
                                 policies,
-                                parent,
+                                0,
                                 lock,
                                 thread_lock,
                                 orb_core,
diff --git a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
index d98684a4c92..64c083f008b 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.h
@@ -44,32 +44,31 @@ public:
   virtual ~TAO_RT_Servant_Dispatcher (void);
 
   /// Pre_invoke remote request.
-  void pre_invoke_remote_request (TAO_POA &poa,
+  void pre_invoke_remote_request (TAO_Root_POA &poa,
                                   CORBA::Short servant_priority,
                                   TAO_ServerRequest &req,
-								  TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
+                                  TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
                                   ACE_ENV_ARG_DECL);
 
   /// Pre_invoke collocated request.
-  void pre_invoke_collocated_request (TAO_POA &poa,
+  void pre_invoke_collocated_request (TAO_Root_POA &poa,
                                       CORBA::Short servant_priority,
-                                      TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
+                                      TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state
                                       ACE_ENV_ARG_DECL);
 
   /// Post_invoke request.
-  void post_invoke (TAO_POA &poa,
-                    TAO_Object_Adapter::Servant_Upcall::Pre_Invoke_State &pre_invoke_state);
+  void post_invoke (TAO_Root_POA &poa,
+                    TAO::Portable_Server::Servant_Upcall::Pre_Invoke_State &pre_invoke_state);
 
   /// Factory method for creating new POA's.
-  TAO_POA *create_POA (const ACE_CString &name,
-                       TAO_POA_Manager &poa_manager,
-                       const TAO_POA_Policy_Set &policies,
-                       TAO_POA *parent,
-                       ACE_Lock &lock,
-                       TAO_SYNCH_MUTEX &thread_lock,
-                       TAO_ORB_Core &orb_core,
-                       TAO_Object_Adapter *object_adapter
-                       ACE_ENV_ARG_DECL);
+  TAO_Root_POA *create_Root_POA (const ACE_CString &name,
+                                 TAO_POA_Manager &poa_manager,
+                                 const TAO_POA_Policy_Set &policies,
+                                 ACE_Lock &lock,
+                                 TAO_SYNCH_MUTEX &thread_lock,
+                                 TAO_ORB_Core &orb_core,
+                                 TAO_Object_Adapter *object_adapter
+                                 ACE_ENV_ARG_DECL);
 };
 
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/RTPortableServer/diffs/RTPortableServer.diff b/TAO/tao/RTPortableServer/diffs/RTPortableServer.diff
deleted file mode 100644
index 4f7089d6a77..00000000000
--- a/TAO/tao/RTPortableServer/diffs/RTPortableServer.diff
+++ /dev/null
@@ -1,129 +0,0 @@
---- orig/RTPortableServerC.h	2003-12-29 10:19:56.000000000 -0600
-+++ RTPortableServerC.h	2003-12-29 11:31:43.000000000 -0600
-@@ -45,8 +45,8 @@
- #include "tao/Object.h"
- #include "tao/Objref_VarOut_T.h"
- 
--#include "../PortableServer/PortableServerC.h"
--#include "../RTCORBA/RTCORBAC.h"
-+#include "tao/PortableServer/PortableServerC.h"
-+#include "tao/RTCORBA/RTCORBA.h"
- 
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
-@@ -228,11 +228,6 @@
- #endif /* end #if !defined */
-   
-   // TAO_IDL - Generated from
--  // be/be_visitor_typecode/typecode_decl.cpp:44
--  
--  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_POA;
--
--// TAO_IDL - Generated from
- // be/be_visitor_module/module_ch.cpp:66
- 
- } // module RTPortableServer
---- orig/RTPortableServerC.cpp	2003-12-29 10:19:56.000000000 -0600
-+++ RTPortableServerC.cpp	2003-12-29 11:29:44.000000000 -0600
-@@ -199,40 +199,6 @@
-   return 0;
- }
- 
--// TAO_IDL - Generated from
--// be/be_visitor_typecode/typecode_defn.cpp:284
--
--static const CORBA::Long _oc_RTPortableServer_POA[] =
--{
--    TAO_ENCAP_BYTE_ORDER, // byte order
--  37,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x6f6d672e), 
--  ACE_NTOHL (0x6f72672f), 
--  ACE_NTOHL (0x5254506f), 
--  ACE_NTOHL (0x72746162), 
--  ACE_NTOHL (0x6c655365), 
--  ACE_NTOHL (0x72766572), 
--  ACE_NTOHL (0x2f504f41), 
--  ACE_NTOHL (0x3a312e30), 
--  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTPortableServer/POA:1.0
--    4,
--  ACE_NTOHL (0x504f4100),  // name = POA
--  };
--
--static CORBA::TypeCode _tc_TAO_tc_RTPortableServer_POA (
--    CORBA::tk_objref,
--    sizeof (_oc_RTPortableServer_POA),
--    (char *) &_oc_RTPortableServer_POA,
--    0,
--    sizeof (RTPortableServer::POA)
--  );
--
--namespace RTPortableServer
--{
--  ::CORBA::TypeCode_ptr _tc_POA =
--    &_tc_TAO_tc_RTPortableServer_POA;
--}
- 
- // TAO_IDL - Generated from
- // be/be_visitor_root/root.cpp:1725
---- orig/RTPortableServerA.h	2003-12-29 10:19:56.000000000 -0600
-+++ RTPortableServerA.h	2003-12-29 11:29:01.000000000 -0600
-@@ -40,6 +40,14 @@
- #endif
- #define TAO_EXPORT_MACRO TAO_RTPortableServer_Export
- 
-+namespace RTPortableServer
-+{
-+  // TAO_IDL - Generated from
-+  // be/be_visitor_typecode/typecode_decl.cpp:44
-+
-+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_POA;
-+}
-+
- // TAO_IDL - Generated from
- // be/be_visitor_interface/any_op_ch.cpp:52
- 
---- orig/RTPortableServerA.cpp	2003-12-29 10:19:56.000000000 -0600
-+++ RTPortableServerA.cpp	2003-12-29 11:29:52.000000000 -0600
-@@ -32,6 +32,41 @@
- 
- // TAO_IDL - Generated from
- // be/be_visitor_interface/any_op_cs.cpp:50
-+// TAO_IDL - Generated from
-+// be/be_visitor_typecode/typecode_defn.cpp:284
-+
-+static const CORBA::Long _oc_RTPortableServer_POA[] =
-+{
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+  37,
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x6f6d672e),
-+  ACE_NTOHL (0x6f72672f),
-+  ACE_NTOHL (0x5254506f),
-+  ACE_NTOHL (0x72746162),
-+  ACE_NTOHL (0x6c655365),
-+  ACE_NTOHL (0x72766572),
-+  ACE_NTOHL (0x2f504f41),
-+  ACE_NTOHL (0x3a312e30),
-+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/RTPortableServer/POA:1.0
-+    4,
-+  ACE_NTOHL (0x504f4100),  // name = POA
-+  };
-+
-+static CORBA::TypeCode _tc_TAO_tc_RTPortableServer_POA (
-+    CORBA::tk_objref,
-+    sizeof (_oc_RTPortableServer_POA),
-+    (char *) &_oc_RTPortableServer_POA,
-+    0,
-+    sizeof (RTPortableServer::POA)
-+  );
-+
-+namespace RTPortableServer
-+{
-+  ::CORBA::TypeCode_ptr _tc_POA =
-+    &_tc_TAO_tc_RTPortableServer_POA;
-+}
-+
- 
- ACE_TEMPLATE_SPECIALIZATION
- CORBA::Boolean
diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp
index 8e915a6dfb1..d7f7e8b0db7 100644
--- a/TAO/tao/RTScheduling/Current.cpp
+++ b/TAO/tao/RTScheduling/Current.cpp
@@ -40,7 +40,7 @@ TAO_RTScheduler_Current::init (TAO_ORB_Core* orb
   ACE_NEW_THROW_EX (current,
                     TAO_RT_Current (orb),
                     CORBA::NO_MEMORY (CORBA::SystemException::_tao_minor_code (
-                                        TAO_DEFAULT_MINOR_CODE,
+                                        TAO::VMCID,
                                         ENOMEM),
                                       CORBA::COMPLETED_NO));
   this->rt_current_ = current;
@@ -83,7 +83,7 @@ TAO_RTScheduler_Current::begin_scheduling_segment (
                                                    &this->dt_hash_),
                         CORBA::NO_MEMORY (
                                           CORBA::SystemException::_tao_minor_code (
-                                          TAO_DEFAULT_MINOR_CODE,
+                                          TAO::VMCID,
                                           ENOMEM),
                                           CORBA::COMPLETED_NO));
       ACE_CHECK;
@@ -427,7 +427,7 @@ TAO_RTScheduler_Current_i::begin_scheduling_segment(
                                                      this),
                           CORBA::NO_MEMORY (
                                             CORBA::SystemException::_tao_minor_code (
-                                          TAO_DEFAULT_MINOR_CODE,
+                                          TAO::VMCID,
                                           ENOMEM),
                                           CORBA::COMPLETED_NO));
         ACE_CHECK;
diff --git a/TAO/tao/RTScheduling/Distributable_Thread.cpp b/TAO/tao/RTScheduling/Distributable_Thread.cpp
index 4147713647b..72b1336d456 100644
--- a/TAO/tao/RTScheduling/Distributable_Thread.cpp
+++ b/TAO/tao/RTScheduling/Distributable_Thread.cpp
@@ -36,7 +36,7 @@ TAO_DistributableThread_Factory::create_DT (void)
                     TAO_DistributableThread,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
diff --git a/TAO/tao/RTScheduling/RTScheduler.pidl b/TAO/tao/RTScheduling/RTScheduler.pidl
index e1525cc5576..03a903e14b0 100644
--- a/TAO/tao/RTScheduling/RTScheduler.pidl
+++ b/TAO/tao/RTScheduling/RTScheduler.pidl
@@ -14,7 +14,7 @@
 //   is:
 //
 //     tao_idl
-//        -o orig -Sa -Gp -Gd -Ge 1 -GT
+//        -o orig -GA -Sa -Gp -Gd -Ge 1 -GT
 //          -Wb,export_macro=TAO_RTScheduler_Export
 //          -Wb,export_include="rtscheduler_export.h"
 //          -Wb,pre_include="ace/pre.h"
@@ -26,8 +26,8 @@
 #ifndef TAO_RTSCHEDULER_PIDL
 #define TAO_RTSCHEDULER_PIDL
 
-#include "tao/RTCORBA/RTCORBA.pidl"
-#include "tao/PortableServer/PortableServer.pidl"
+#include "tao/RTCORBA/RTCORBA_include.pidl"
+#include "tao/PortableServer/PortableServer_include.pidl"
 #include "tao/PortableInterceptor.pidl"
 
 
diff --git a/TAO/tao/RTScheduling/RTSchedulerA.cpp b/TAO/tao/RTScheduling/RTSchedulerA.cpp
new file mode 100644
index 00000000000..25b7622a133
--- /dev/null
+++ b/TAO/tao/RTScheduling/RTSchedulerA.cpp
@@ -0,0 +1,344 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+
+#include "RTScheduler.h"
+#include "tao/Typecode.h"
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTScheduling_ThreadAction[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  34,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x52545363),
+  ACE_NTOHL (0x68656475),
+  ACE_NTOHL (0x6c696e67),
+  ACE_NTOHL (0x2f546872),
+  ACE_NTOHL (0x65616441),
+  ACE_NTOHL (0x6374696f),
+  ACE_NTOHL (0x6e3a312e),
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:RTScheduling/ThreadAction:1.0
+    13,
+  ACE_NTOHL (0x54687265),
+  ACE_NTOHL (0x61644163),
+  ACE_NTOHL (0x74696f6e),
+  ACE_NTOHL (0x0),  // name = ThreadAction
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTScheduling_ThreadAction (
+    CORBA::tk_objref,
+    sizeof (_oc_RTScheduling_ThreadAction),
+    (char *) &_oc_RTScheduling_ThreadAction,
+    0,
+    0
+  );
+
+namespace RTScheduling
+{
+  ::CORBA::TypeCode_ptr _tc_ThreadAction =
+    &_tc_TAO_tc_RTScheduling_ThreadAction;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTScheduling_DistributableThread_DT_State[] =
+{
+  TAO_ENCAP_BYTE_ORDER, // byte order
+  50,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x52545363),
+  ACE_NTOHL (0x68656475),
+  ACE_NTOHL (0x6c696e67),
+  ACE_NTOHL (0x2f446973),
+  ACE_NTOHL (0x74726962),
+  ACE_NTOHL (0x75746162),
+  ACE_NTOHL (0x6c655468),
+  ACE_NTOHL (0x72656164),
+  ACE_NTOHL (0x2f44545f),
+  ACE_NTOHL (0x53746174),
+  ACE_NTOHL (0x653a312e),
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:RTScheduling/DistributableThread/DT_State:1.0
+  9,
+  ACE_NTOHL (0x44545f53),
+  ACE_NTOHL (0x74617465),
+  ACE_NTOHL (0x0),  // name = DT_State
+  2, // member count
+  7,
+  ACE_NTOHL (0x41435449),
+  ACE_NTOHL (0x56450000),  // name = ACTIVE
+  10,
+  ACE_NTOHL (0x43414e43),
+  ACE_NTOHL (0x454c4c45),
+  ACE_NTOHL (0x44000000),  // name = CANCELLED
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTScheduling_DistributableThread_DT_State (
+    CORBA::tk_enum,
+    sizeof (_oc_RTScheduling_DistributableThread_DT_State),
+    (char *) &_oc_RTScheduling_DistributableThread_DT_State,
+    0,
+    0
+  );
+
+::CORBA::TypeCode_ptr RTScheduling::DistributableThread::_tc_DT_State =
+  &_tc_TAO_tc_RTScheduling_DistributableThread_DT_State;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTScheduling_DistributableThread[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  41,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x52545363),
+  ACE_NTOHL (0x68656475),
+  ACE_NTOHL (0x6c696e67),
+  ACE_NTOHL (0x2f446973),
+  ACE_NTOHL (0x74726962),
+  ACE_NTOHL (0x75746162),
+  ACE_NTOHL (0x6c655468),
+  ACE_NTOHL (0x72656164),
+  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x0),  // repository ID = IDL:RTScheduling/DistributableThread:1.0
+    20,
+  ACE_NTOHL (0x44697374),
+  ACE_NTOHL (0x72696275),
+  ACE_NTOHL (0x7461626c),
+  ACE_NTOHL (0x65546872),
+  ACE_NTOHL (0x65616400),  // name = DistributableThread
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTScheduling_DistributableThread (
+    CORBA::tk_objref,
+    sizeof (_oc_RTScheduling_DistributableThread),
+    (char *) &_oc_RTScheduling_DistributableThread,
+    0,
+    0
+  );
+
+namespace RTScheduling
+{
+  ::CORBA::TypeCode_ptr _tc_DistributableThread =
+    &_tc_TAO_tc_RTScheduling_DistributableThread;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTScheduling_Current_IdType[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  36,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x52545363),
+  ACE_NTOHL (0x68656475),
+  ACE_NTOHL (0x6c696e67),
+  ACE_NTOHL (0x2f437572),
+  ACE_NTOHL (0x72656e74),
+  ACE_NTOHL (0x2f496454),
+  ACE_NTOHL (0x7970653a),
+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:RTScheduling/Current/IdType:1.0
+    7,
+  ACE_NTOHL (0x49645479),
+  ACE_NTOHL (0x70650000),  // name = IdType
+    CORBA::tk_sequence, // typecode kind
+  12, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_octet,
+
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_RTScheduling_Current_IdType (
+    CORBA::tk_alias,
+    sizeof (_oc_RTScheduling_Current_IdType),
+    (char *) &_oc_RTScheduling_Current_IdType,
+    0,
+    0
+  );
+
+::CORBA::TypeCode_ptr RTScheduling::Current::_tc_IdType =
+  &_tc_TAO_tc_RTScheduling_Current_IdType;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTScheduling_Current_NameList[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  38,
+  ACE_NTOHL (0x49444c3a),
+  ACE_NTOHL (0x52545363),
+  ACE_NTOHL (0x68656475), 
+  ACE_NTOHL (0x6c696e67), 
+  ACE_NTOHL (0x2f437572), 
+  ACE_NTOHL (0x72656e74), 
+  ACE_NTOHL (0x2f4e616d), 
+  ACE_NTOHL (0x654c6973), 
+  ACE_NTOHL (0x743a312e), 
+  ACE_NTOHL (0x30000000),  // repository ID = IDL:RTScheduling/Current/NameList:1.0
+    9,
+  ACE_NTOHL (0x4e616d65), 
+  ACE_NTOHL (0x4c697374), 
+  ACE_NTOHL (0x0),  // name = NameList
+    CORBA::tk_sequence, // typecode kind
+  16, // encapsulation length
+    TAO_ENCAP_BYTE_ORDER, // byte order
+    CORBA::tk_string, 
+    0U, // string length
+    0U,
+
+};
+
+static CORBA::TypeCode _tc_TAO_tc_RTScheduling_Current_NameList (
+    CORBA::tk_alias,
+    sizeof (_oc_RTScheduling_Current_NameList),
+    (char *) &_oc_RTScheduling_Current_NameList,
+    0,
+    0
+  );
+
+::CORBA::TypeCode_ptr RTScheduling::Current::_tc_NameList =
+  &_tc_TAO_tc_RTScheduling_Current_NameList;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTScheduling_Current[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  29,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x52545363), 
+  ACE_NTOHL (0x68656475), 
+  ACE_NTOHL (0x6c696e67), 
+  ACE_NTOHL (0x2f437572), 
+  ACE_NTOHL (0x72656e74), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:RTScheduling/Current:1.0
+    8,
+  ACE_NTOHL (0x43757272), 
+  ACE_NTOHL (0x656e7400),  // name = Current
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTScheduling_Current (
+    CORBA::tk_objref,
+    sizeof (_oc_RTScheduling_Current),
+    (char *) &_oc_RTScheduling_Current,
+    0,
+    0
+  );
+
+namespace RTScheduling
+{
+  ::CORBA::TypeCode_ptr _tc_Current =
+    &_tc_TAO_tc_RTScheduling_Current;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTScheduling_ResourceManager[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  37,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x52545363), 
+  ACE_NTOHL (0x68656475), 
+  ACE_NTOHL (0x6c696e67), 
+  ACE_NTOHL (0x2f526573), 
+  ACE_NTOHL (0x6f757263), 
+  ACE_NTOHL (0x654d616e), 
+  ACE_NTOHL (0x61676572), 
+  ACE_NTOHL (0x3a312e30), 
+  ACE_NTOHL (0x0),  // repository ID = IDL:RTScheduling/ResourceManager:1.0
+    16,
+  ACE_NTOHL (0x5265736f), 
+  ACE_NTOHL (0x75726365), 
+  ACE_NTOHL (0x4d616e61), 
+  ACE_NTOHL (0x67657200),  // name = ResourceManager
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTScheduling_ResourceManager (
+    CORBA::tk_objref,
+    sizeof (_oc_RTScheduling_ResourceManager),
+    (char *) &_oc_RTScheduling_ResourceManager,
+    0,
+    0
+  );
+
+namespace RTScheduling
+{
+  ::CORBA::TypeCode_ptr _tc_ResourceManager =
+    &_tc_TAO_tc_RTScheduling_ResourceManager;
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:295
+
+static const CORBA::Long _oc_RTScheduling_Scheduler[] =
+{
+    TAO_ENCAP_BYTE_ORDER, // byte order
+  31,
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x52545363), 
+  ACE_NTOHL (0x68656475), 
+  ACE_NTOHL (0x6c696e67), 
+  ACE_NTOHL (0x2f536368), 
+  ACE_NTOHL (0x6564756c), 
+  ACE_NTOHL (0x65723a31), 
+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:RTScheduling/Scheduler:1.0
+    10,
+  ACE_NTOHL (0x53636865), 
+  ACE_NTOHL (0x64756c65), 
+  ACE_NTOHL (0x72000000),  // name = Scheduler
+  };
+
+static CORBA::TypeCode _tc_TAO_tc_RTScheduling_Scheduler (
+    CORBA::tk_objref,
+    sizeof (_oc_RTScheduling_Scheduler),
+    (char *) &_oc_RTScheduling_Scheduler,
+    0,
+    0
+  );
+
+namespace RTScheduling
+{
+  ::CORBA::TypeCode_ptr _tc_Scheduler =
+    &_tc_TAO_tc_RTScheduling_Scheduler;
+}
+
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/RTScheduling/RTSchedulerC.cpp b/TAO/tao/RTScheduling/RTSchedulerC.cpp
index c6c7627011c..ed71593d7ca 100644
--- a/TAO/tao/RTScheduling/RTSchedulerC.cpp
+++ b/TAO/tao/RTScheduling/RTSchedulerC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "RTScheduler.h"
@@ -41,22 +41,22 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "RTSchedulerC.i"
+#include "RTSchedulerC.inl"
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
 {
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
+  // be\be_visitor_arg_traits.cpp:433
 
 #if !defined (_CORBA_POLICYLIST__ARG_TRAITS_CS_)
 #define _CORBA_POLICYLIST__ARG_TRAITS_CS_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
   class TAO_RTScheduler_Export Arg_Traits<CORBA::PolicyList>
     : public
@@ -112,12 +112,6 @@ TAO::Objref_Traits<RTScheduling::ThreadAction>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*RTScheduling__TAO_ThreadAction_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 RTScheduling::ThreadAction::ThreadAction (void)
 {}
 
@@ -134,10 +128,10 @@ RTScheduling::ThreadAction::_narrow (
     {
       return ThreadAction::_nil ();
     }
-
+  
   ThreadAction_ptr proxy =
     dynamic_cast<ThreadAction_ptr> (_tao_objref);
-
+  
   return ThreadAction::_duplicate (proxy);
 }
 
@@ -151,10 +145,10 @@ RTScheduling::ThreadAction::_unchecked_narrow (
     {
       return ThreadAction::_nil ();
     }
-
+  
   ThreadAction_ptr proxy =
     dynamic_cast<ThreadAction_ptr> (_tao_objref);
-
+  
   return ThreadAction::_duplicate (proxy);
 }
 
@@ -165,7 +159,7 @@ RTScheduling::ThreadAction::_duplicate (ThreadAction_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -177,18 +171,18 @@ RTScheduling::ThreadAction::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:RTScheduling/ThreadAction:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -210,43 +204,6 @@ RTScheduling::ThreadAction::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTScheduling_ThreadAction[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x52545363),
-  ACE_NTOHL (0x68656475),
-  ACE_NTOHL (0x6c696e67),
-  ACE_NTOHL (0x2f546872),
-  ACE_NTOHL (0x65616441),
-  ACE_NTOHL (0x6374696f),
-  ACE_NTOHL (0x6e3a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:RTScheduling/ThreadAction:1.0
-    13,
-  ACE_NTOHL (0x54687265),
-  ACE_NTOHL (0x61644163),
-  ACE_NTOHL (0x74696f6e),
-  ACE_NTOHL (0x0),  // name = ThreadAction
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTScheduling_ThreadAction (
-    CORBA::tk_objref,
-    sizeof (_oc_RTScheduling_ThreadAction),
-    (char *) &_oc_RTScheduling_ThreadAction,
-    0,
-    sizeof (RTScheduling::ThreadAction)
-  );
-
-namespace RTScheduling
-{
-  ::CORBA::TypeCode_ptr _tc_ThreadAction =
-    &_tc_TAO_tc_RTScheduling_ThreadAction;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTScheduling::DistributableThread.
@@ -286,57 +243,6 @@ TAO::Objref_Traits<RTScheduling::DistributableThread>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*RTScheduling__TAO_DistributableThread_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTScheduling_DistributableThread_DT_State[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  50,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x52545363),
-  ACE_NTOHL (0x68656475),
-  ACE_NTOHL (0x6c696e67),
-  ACE_NTOHL (0x2f446973),
-  ACE_NTOHL (0x74726962),
-  ACE_NTOHL (0x75746162),
-  ACE_NTOHL (0x6c655468),
-  ACE_NTOHL (0x72656164),
-  ACE_NTOHL (0x2f44545f),
-  ACE_NTOHL (0x53746174),
-  ACE_NTOHL (0x653a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:RTScheduling/DistributableThread/DT_State:1.0
-  9,
-  ACE_NTOHL (0x44545f53),
-  ACE_NTOHL (0x74617465),
-  ACE_NTOHL (0x0),  // name = DT_State
-  2, // member count
-  7,
-  ACE_NTOHL (0x41435449),
-  ACE_NTOHL (0x56450000),  // name = ACTIVE
-  10,
-  ACE_NTOHL (0x43414e43),
-  ACE_NTOHL (0x454c4c45),
-  ACE_NTOHL (0x44000000),  // name = CANCELLED
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTScheduling_DistributableThread_DT_State (
-    CORBA::tk_enum,
-    sizeof (_oc_RTScheduling_DistributableThread_DT_State),
-    (char *) &_oc_RTScheduling_DistributableThread_DT_State,
-    0,
-    sizeof (RTScheduling::DistributableThread::DT_State)
-  );
-
-::CORBA::TypeCode_ptr RTScheduling::DistributableThread::_tc_DT_State =
-  &_tc_TAO_tc_RTScheduling_DistributableThread_DT_State;
-
 RTScheduling::DistributableThread::DistributableThread (void)
 {}
 
@@ -353,10 +259,10 @@ RTScheduling::DistributableThread::_narrow (
     {
       return DistributableThread::_nil ();
     }
-
+  
   DistributableThread_ptr proxy =
     dynamic_cast<DistributableThread_ptr> (_tao_objref);
-
+  
   return DistributableThread::_duplicate (proxy);
 }
 
@@ -370,10 +276,10 @@ RTScheduling::DistributableThread::_unchecked_narrow (
     {
       return DistributableThread::_nil ();
     }
-
+  
   DistributableThread_ptr proxy =
     dynamic_cast<DistributableThread_ptr> (_tao_objref);
-
+  
   return DistributableThread::_duplicate (proxy);
 }
 
@@ -384,7 +290,7 @@ RTScheduling::DistributableThread::_duplicate (DistributableThread_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -396,18 +302,18 @@ RTScheduling::DistributableThread::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:RTScheduling/DistributableThread:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -429,46 +335,6 @@ RTScheduling::DistributableThread::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTScheduling_DistributableThread[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  41,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x52545363),
-  ACE_NTOHL (0x68656475),
-  ACE_NTOHL (0x6c696e67),
-  ACE_NTOHL (0x2f446973),
-  ACE_NTOHL (0x74726962),
-  ACE_NTOHL (0x75746162),
-  ACE_NTOHL (0x6c655468),
-  ACE_NTOHL (0x72656164),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:RTScheduling/DistributableThread:1.0
-    20,
-  ACE_NTOHL (0x44697374),
-  ACE_NTOHL (0x72696275),
-  ACE_NTOHL (0x7461626c),
-  ACE_NTOHL (0x65546872),
-  ACE_NTOHL (0x65616400),  // name = DistributableThread
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTScheduling_DistributableThread (
-    CORBA::tk_objref,
-    sizeof (_oc_RTScheduling_DistributableThread),
-    (char *) &_oc_RTScheduling_DistributableThread,
-    0,
-    sizeof (RTScheduling::DistributableThread)
-  );
-
-namespace RTScheduling
-{
-  ::CORBA::TypeCode_ptr _tc_DistributableThread =
-    &_tc_TAO_tc_RTScheduling_DistributableThread;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTScheduling::Current.
@@ -508,13 +374,7 @@ TAO::Objref_Traits<RTScheduling::Current>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*RTScheduling__TAO_Current_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
 RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::UNSUPPORTED_SCHEDULING_DISCIPLINE (void)
@@ -547,14 +407,13 @@ RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::operator= (const ::RTS
 RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE *
 RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:RTScheduling/Current/UNSUPPORTED_SCHEDULING_DISCIPLINE:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (UNSUPPORTED_SCHEDULING_DISCIPLINE *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<UNSUPPORTED_SCHEDULING_DISCIPLINE *> (_tao_excp);
+}
+
+const RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE *
+RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const UNSUPPORTED_SCHEDULING_DISCIPLINE *> (_tao_excp);
 }
 
 CORBA::Exception *RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::_alloc (void)
@@ -600,46 +459,41 @@ void RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::_tao_decode (
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE::_type (void) const
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
   return ::RTScheduling::Current::_tc_UNSUPPORTED_SCHEDULING_DISCIPLINE;
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_RTScheduling_Current_UNSUPPORTED_SCHEDULING_DISCIPLINE[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   63,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x52545363),
-  ACE_NTOHL (0x68656475),
-  ACE_NTOHL (0x6c696e67),
-  ACE_NTOHL (0x2f437572),
-  ACE_NTOHL (0x72656e74),
-  ACE_NTOHL (0x2f554e53),
-  ACE_NTOHL (0x5550504f),
-  ACE_NTOHL (0x52544544),
-  ACE_NTOHL (0x5f534348),
-  ACE_NTOHL (0x4544554c),
-  ACE_NTOHL (0x494e475f),
-  ACE_NTOHL (0x44495343),
-  ACE_NTOHL (0x49504c49),
-  ACE_NTOHL (0x4e453a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x52545363), 
+  ACE_NTOHL (0x68656475), 
+  ACE_NTOHL (0x6c696e67), 
+  ACE_NTOHL (0x2f437572), 
+  ACE_NTOHL (0x72656e74), 
+  ACE_NTOHL (0x2f554e53), 
+  ACE_NTOHL (0x5550504f), 
+  ACE_NTOHL (0x52544544), 
+  ACE_NTOHL (0x5f534348), 
+  ACE_NTOHL (0x4544554c), 
+  ACE_NTOHL (0x494e475f), 
+  ACE_NTOHL (0x44495343), 
+  ACE_NTOHL (0x49504c49), 
+  ACE_NTOHL (0x4e453a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:RTScheduling/Current/UNSUPPORTED_SCHEDULING_DISCIPLINE:1.0
     34,
-  ACE_NTOHL (0x554e5355),
-  ACE_NTOHL (0x50504f52),
-  ACE_NTOHL (0x5445445f),
-  ACE_NTOHL (0x53434845),
-  ACE_NTOHL (0x44554c49),
-  ACE_NTOHL (0x4e475f44),
-  ACE_NTOHL (0x49534349),
-  ACE_NTOHL (0x504c494e),
+  ACE_NTOHL (0x554e5355), 
+  ACE_NTOHL (0x50504f52), 
+  ACE_NTOHL (0x5445445f), 
+  ACE_NTOHL (0x53434845), 
+  ACE_NTOHL (0x44554c49), 
+  ACE_NTOHL (0x4e475f44), 
+  ACE_NTOHL (0x49534349), 
+  ACE_NTOHL (0x504c494e), 
   ACE_NTOHL (0x45000000),  // name = UNSUPPORTED_SCHEDULING_DISCIPLINE
   0, // member count
   };
@@ -649,13 +503,13 @@ static CORBA::TypeCode _tc_TAO_tc_RTScheduling_Current_UNSUPPORTED_SCHEDULING_DI
     sizeof (_oc_RTScheduling_Current_UNSUPPORTED_SCHEDULING_DISCIPLINE),
     (char *) &_oc_RTScheduling_Current_UNSUPPORTED_SCHEDULING_DISCIPLINE,
     0,
-    sizeof (RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE)
+    0
   );
 
 ::CORBA::TypeCode_ptr RTScheduling::Current::_tc_UNSUPPORTED_SCHEDULING_DISCIPLINE =
   &_tc_TAO_tc_RTScheduling_Current_UNSUPPORTED_SCHEDULING_DISCIPLINE;
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_RTSCHEDULING_CURRENT_IDTYPE_CS_)
@@ -699,46 +553,7 @@ RTScheduling::Current::IdType::~IdType (void)
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTScheduling_Current_IdType[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  36,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x52545363),
-  ACE_NTOHL (0x68656475),
-  ACE_NTOHL (0x6c696e67),
-  ACE_NTOHL (0x2f437572),
-  ACE_NTOHL (0x72656e74),
-  ACE_NTOHL (0x2f496454),
-  ACE_NTOHL (0x7970653a),
-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:RTScheduling/Current/IdType:1.0
-    7,
-  ACE_NTOHL (0x49645479),
-  ACE_NTOHL (0x70650000),  // name = IdType
-    CORBA::tk_sequence, // typecode kind
-  12, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_octet,
-
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_RTScheduling_Current_IdType (
-    CORBA::tk_alias,
-    sizeof (_oc_RTScheduling_Current_IdType),
-    (char *) &_oc_RTScheduling_Current_IdType,
-    0,
-    sizeof (RTScheduling::Current::IdType)
-  );
-
-::CORBA::TypeCode_ptr RTScheduling::Current::_tc_IdType =
-  &_tc_TAO_tc_RTScheduling_Current_IdType;
-
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_RTSCHEDULING_CURRENT_NAMELIST_CS_)
@@ -776,47 +591,6 @@ RTScheduling::Current::NameList::~NameList (void)
 
 #endif /* end #if !defined */
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTScheduling_Current_NameList[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x52545363),
-  ACE_NTOHL (0x68656475),
-  ACE_NTOHL (0x6c696e67),
-  ACE_NTOHL (0x2f437572),
-  ACE_NTOHL (0x72656e74),
-  ACE_NTOHL (0x2f4e616d),
-  ACE_NTOHL (0x654c6973),
-  ACE_NTOHL (0x743a312e),
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:RTScheduling/Current/NameList:1.0
-    9,
-  ACE_NTOHL (0x4e616d65),
-  ACE_NTOHL (0x4c697374),
-  ACE_NTOHL (0x0),  // name = NameList
-    CORBA::tk_sequence, // typecode kind
-  16, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    CORBA::tk_string,
-    0U, // string length
-    0U,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_RTScheduling_Current_NameList (
-    CORBA::tk_alias,
-    sizeof (_oc_RTScheduling_Current_NameList),
-    (char *) &_oc_RTScheduling_Current_NameList,
-    0,
-    sizeof (RTScheduling::Current::NameList)
-  );
-
-::CORBA::TypeCode_ptr RTScheduling::Current::_tc_NameList =
-  &_tc_TAO_tc_RTScheduling_Current_NameList;
-
 RTScheduling::Current::Current (void)
 {}
 
@@ -833,10 +607,10 @@ RTScheduling::Current::_narrow (
     {
       return Current::_nil ();
     }
-
+  
   Current_ptr proxy =
     dynamic_cast<Current_ptr> (_tao_objref);
-
+  
   return Current::_duplicate (proxy);
 }
 
@@ -850,10 +624,10 @@ RTScheduling::Current::_unchecked_narrow (
     {
       return Current::_nil ();
     }
-
+  
   Current_ptr proxy =
     dynamic_cast<Current_ptr> (_tao_objref);
-
+  
   return Current::_duplicate (proxy);
 }
 
@@ -864,7 +638,7 @@ RTScheduling::Current::_duplicate (Current_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -876,26 +650,26 @@ RTScheduling::Current::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Current:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/RTCORBA/Current:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:RTScheduling/Current:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -917,40 +691,6 @@ RTScheduling::Current::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTScheduling_Current[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  29,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x52545363),
-  ACE_NTOHL (0x68656475),
-  ACE_NTOHL (0x6c696e67),
-  ACE_NTOHL (0x2f437572),
-  ACE_NTOHL (0x72656e74),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:RTScheduling/Current:1.0
-    8,
-  ACE_NTOHL (0x43757272),
-  ACE_NTOHL (0x656e7400),  // name = Current
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTScheduling_Current (
-    CORBA::tk_objref,
-    sizeof (_oc_RTScheduling_Current),
-    (char *) &_oc_RTScheduling_Current,
-    0,
-    sizeof (RTScheduling::Current)
-  );
-
-namespace RTScheduling
-{
-  ::CORBA::TypeCode_ptr _tc_Current =
-    &_tc_TAO_tc_RTScheduling_Current;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTScheduling::ResourceManager.
@@ -990,12 +730,6 @@ TAO::Objref_Traits<RTScheduling::ResourceManager>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*RTScheduling__TAO_ResourceManager_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 RTScheduling::ResourceManager::ResourceManager (void)
 {}
 
@@ -1012,10 +746,10 @@ RTScheduling::ResourceManager::_narrow (
     {
       return ResourceManager::_nil ();
     }
-
+  
   ResourceManager_ptr proxy =
     dynamic_cast<ResourceManager_ptr> (_tao_objref);
-
+  
   return ResourceManager::_duplicate (proxy);
 }
 
@@ -1029,10 +763,10 @@ RTScheduling::ResourceManager::_unchecked_narrow (
     {
       return ResourceManager::_nil ();
     }
-
+  
   ResourceManager_ptr proxy =
     dynamic_cast<ResourceManager_ptr> (_tao_objref);
-
+  
   return ResourceManager::_duplicate (proxy);
 }
 
@@ -1043,7 +777,7 @@ RTScheduling::ResourceManager::_duplicate (ResourceManager_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -1055,22 +789,22 @@ RTScheduling::ResourceManager::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/RTCORBA/Mutex:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:RTScheduling/ResourceManager:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1092,44 +826,6 @@ RTScheduling::ResourceManager::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTScheduling_ResourceManager[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  37,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x52545363),
-  ACE_NTOHL (0x68656475),
-  ACE_NTOHL (0x6c696e67),
-  ACE_NTOHL (0x2f526573),
-  ACE_NTOHL (0x6f757263),
-  ACE_NTOHL (0x654d616e),
-  ACE_NTOHL (0x61676572),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:RTScheduling/ResourceManager:1.0
-    16,
-  ACE_NTOHL (0x5265736f),
-  ACE_NTOHL (0x75726365),
-  ACE_NTOHL (0x4d616e61),
-  ACE_NTOHL (0x67657200),  // name = ResourceManager
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTScheduling_ResourceManager (
-    CORBA::tk_objref,
-    sizeof (_oc_RTScheduling_ResourceManager),
-    (char *) &_oc_RTScheduling_ResourceManager,
-    0,
-    sizeof (RTScheduling::ResourceManager)
-  );
-
-namespace RTScheduling
-{
-  ::CORBA::TypeCode_ptr _tc_ResourceManager =
-    &_tc_TAO_tc_RTScheduling_ResourceManager;
-}
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for RTScheduling::Scheduler.
@@ -1169,13 +865,7 @@ TAO::Objref_Traits<RTScheduling::Scheduler>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*RTScheduling__TAO_Scheduler_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
 RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::INCOMPATIBLE_SCHEDULING_DISCIPLINES (void)
@@ -1208,14 +898,13 @@ RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::operator= (const :
 RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES *
 RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::_downcast (CORBA::Exception *_tao_excp)
 {
-  if (!ACE_OS::strcmp ("IDL:RTScheduling/Scheduler/INCOMPATIBLE_SCHEDULING_DISCIPLINES:1.0", _tao_excp->_rep_id ()))
-    {
-      return ACE_dynamic_cast (INCOMPATIBLE_SCHEDULING_DISCIPLINES *, _tao_excp);
-    }
-  else
-    {
-      return 0;
-    }
+  return dynamic_cast<INCOMPATIBLE_SCHEDULING_DISCIPLINES *> (_tao_excp);
+}
+
+const RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES *
+RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::_downcast (CORBA::Exception const *_tao_excp)
+{
+  return dynamic_cast<const INCOMPATIBLE_SCHEDULING_DISCIPLINES *> (_tao_excp);
 }
 
 CORBA::Exception *RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::_alloc (void)
@@ -1261,47 +950,42 @@ void RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::_tao_decode (
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES::_type (void) const
 {
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("This TAO-specific method is now")
-              ACE_TEXT (" deprecated and will be removed")
-              ACE_TEXT (" in future versions.\n")));
-
   return ::RTScheduling::Scheduler::_tc_INCOMPATIBLE_SCHEDULING_DISCIPLINES;
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_RTScheduling_Scheduler_INCOMPATIBLE_SCHEDULING_DISCIPLINES[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   67,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x52545363),
-  ACE_NTOHL (0x68656475),
-  ACE_NTOHL (0x6c696e67),
-  ACE_NTOHL (0x2f536368),
-  ACE_NTOHL (0x6564756c),
-  ACE_NTOHL (0x65722f49),
-  ACE_NTOHL (0x4e434f4d),
-  ACE_NTOHL (0x50415449),
-  ACE_NTOHL (0x424c455f),
-  ACE_NTOHL (0x53434845),
-  ACE_NTOHL (0x44554c49),
-  ACE_NTOHL (0x4e475f44),
-  ACE_NTOHL (0x49534349),
-  ACE_NTOHL (0x504c494e),
-  ACE_NTOHL (0x45533a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x52545363), 
+  ACE_NTOHL (0x68656475), 
+  ACE_NTOHL (0x6c696e67), 
+  ACE_NTOHL (0x2f536368), 
+  ACE_NTOHL (0x6564756c), 
+  ACE_NTOHL (0x65722f49), 
+  ACE_NTOHL (0x4e434f4d), 
+  ACE_NTOHL (0x50415449), 
+  ACE_NTOHL (0x424c455f), 
+  ACE_NTOHL (0x53434845), 
+  ACE_NTOHL (0x44554c49), 
+  ACE_NTOHL (0x4e475f44), 
+  ACE_NTOHL (0x49534349), 
+  ACE_NTOHL (0x504c494e), 
+  ACE_NTOHL (0x45533a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:RTScheduling/Scheduler/INCOMPATIBLE_SCHEDULING_DISCIPLINES:1.0
     36,
-  ACE_NTOHL (0x494e434f),
-  ACE_NTOHL (0x4d504154),
-  ACE_NTOHL (0x49424c45),
-  ACE_NTOHL (0x5f534348),
-  ACE_NTOHL (0x4544554c),
-  ACE_NTOHL (0x494e475f),
-  ACE_NTOHL (0x44495343),
-  ACE_NTOHL (0x49504c49),
+  ACE_NTOHL (0x494e434f), 
+  ACE_NTOHL (0x4d504154), 
+  ACE_NTOHL (0x49424c45), 
+  ACE_NTOHL (0x5f534348), 
+  ACE_NTOHL (0x4544554c), 
+  ACE_NTOHL (0x494e475f), 
+  ACE_NTOHL (0x44495343), 
+  ACE_NTOHL (0x49504c49), 
   ACE_NTOHL (0x4e455300),  // name = INCOMPATIBLE_SCHEDULING_DISCIPLINES
   0, // member count
   };
@@ -1311,7 +995,7 @@ static CORBA::TypeCode _tc_TAO_tc_RTScheduling_Scheduler_INCOMPATIBLE_SCHEDULING
     sizeof (_oc_RTScheduling_Scheduler_INCOMPATIBLE_SCHEDULING_DISCIPLINES),
     (char *) &_oc_RTScheduling_Scheduler_INCOMPATIBLE_SCHEDULING_DISCIPLINES,
     0,
-    sizeof (RTScheduling::Scheduler::INCOMPATIBLE_SCHEDULING_DISCIPLINES)
+    0
   );
 
 ::CORBA::TypeCode_ptr RTScheduling::Scheduler::_tc_INCOMPATIBLE_SCHEDULING_DISCIPLINES =
@@ -1333,10 +1017,10 @@ RTScheduling::Scheduler::_narrow (
     {
       return Scheduler::_nil ();
     }
-
+  
   Scheduler_ptr proxy =
     dynamic_cast<Scheduler_ptr> (_tao_objref);
-
+  
   return Scheduler::_duplicate (proxy);
 }
 
@@ -1350,10 +1034,10 @@ RTScheduling::Scheduler::_unchecked_narrow (
     {
       return Scheduler::_nil ();
     }
-
+  
   Scheduler_ptr proxy =
     dynamic_cast<Scheduler_ptr> (_tao_objref);
-
+  
   return Scheduler::_duplicate (proxy);
 }
 
@@ -1364,7 +1048,7 @@ RTScheduling::Scheduler::_duplicate (Scheduler_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -1376,18 +1060,18 @@ RTScheduling::Scheduler::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:RTScheduling/Scheduler:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -1409,42 +1093,7 @@ RTScheduling::Scheduler::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
-
-static const CORBA::Long _oc_RTScheduling_Scheduler[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  31,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x52545363),
-  ACE_NTOHL (0x68656475),
-  ACE_NTOHL (0x6c696e67),
-  ACE_NTOHL (0x2f536368),
-  ACE_NTOHL (0x6564756c),
-  ACE_NTOHL (0x65723a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:RTScheduling/Scheduler:1.0
-    10,
-  ACE_NTOHL (0x53636865),
-  ACE_NTOHL (0x64756c65),
-  ACE_NTOHL (0x72000000),  // name = Scheduler
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_RTScheduling_Scheduler (
-    CORBA::tk_objref,
-    sizeof (_oc_RTScheduling_Scheduler),
-    (char *) &_oc_RTScheduling_Scheduler,
-    0,
-    sizeof (RTScheduling::Scheduler)
-  );
-
-namespace RTScheduling
-{
-  ::CORBA::TypeCode_ptr _tc_Scheduler =
-    &_tc_TAO_tc_RTScheduling_Scheduler;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
@@ -1471,7 +1120,7 @@ namespace RTScheduling
     TAO_Objref_Var_T<
         RTScheduling::ThreadAction
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         RTScheduling::ThreadAction
@@ -1486,7 +1135,7 @@ namespace RTScheduling
     TAO_Objref_Var_T<
         RTScheduling::DistributableThread
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         RTScheduling::DistributableThread
@@ -1539,7 +1188,7 @@ namespace RTScheduling
     TAO_Objref_Var_T<
         RTScheduling::Current
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         RTScheduling::Current
@@ -1554,7 +1203,7 @@ namespace RTScheduling
     TAO_Objref_Var_T<
         RTScheduling::ResourceManager
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         RTScheduling::ResourceManager
@@ -1569,7 +1218,7 @@ namespace RTScheduling
     TAO_Objref_Var_T<
         RTScheduling::Scheduler
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         RTScheduling::Scheduler
@@ -1600,7 +1249,7 @@ namespace RTScheduling
     TAO_Objref_Var_T< \
         RTScheduling::ThreadAction
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTScheduling::ThreadAction
@@ -1615,7 +1264,7 @@ namespace RTScheduling
     TAO_Objref_Var_T< \
         RTScheduling::DistributableThread
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTScheduling::DistributableThread
@@ -1668,7 +1317,7 @@ namespace RTScheduling
     TAO_Objref_Var_T< \
         RTScheduling::Current
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTScheduling::Current
@@ -1683,7 +1332,7 @@ namespace RTScheduling
     TAO_Objref_Var_T< \
         RTScheduling::ResourceManager
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTScheduling::ResourceManager
@@ -1698,11 +1347,10 @@ namespace RTScheduling
     TAO_Objref_Var_T< \
         RTScheduling::Scheduler
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         RTScheduling::Scheduler
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/RTScheduling/RTSchedulerC.h b/TAO/tao/RTScheduling/RTSchedulerC.h
index f695f3cb712..d96dde738de 100644
--- a/TAO/tao/RTScheduling/RTSchedulerC.h
+++ b/TAO/tao/RTScheduling/RTSchedulerC.h
@@ -26,20 +26,23 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_RTSCHEDULERC_H_
 #define _TAO_IDL_ORIG_RTSCHEDULERC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "rtscheduler_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Sequence_T.h"
@@ -47,8 +50,8 @@
 #include "tao/Seq_Var_T.h"
 #include "tao/Seq_Out_T.h"
 
-#include "tao/RTCORBA/RTCORBA.h"
-#include "tao/PortableServer/PortableServerC.h"
+#include "tao/RTCORBA/RTCORBA_includeC.h"
+#include "tao/PortableServer/PortableServer_includeC.h"
 #include "tao/PortableInterceptorC.h"
 
 #ifndef TAO_RTSCHEDULER_SAFE_INCLUDE
@@ -68,9 +71,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -79,7 +80,7 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from 
-// be\be_visitor_root/root_ch.cpp:63
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
@@ -97,6 +98,7 @@ namespace CORBA
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
+
   // Hand crafted
   typedef void* VoidData;
 
@@ -109,7 +111,7 @@ namespace RTScheduling
 {
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_RTSCHEDULING_THREADACTION__VAR_OUT_CH_)
 #define _RTSCHEDULING_THREADACTION__VAR_OUT_CH_
@@ -159,7 +161,7 @@ namespace RTScheduling
     
     static ThreadAction_ptr _nil (void)
     {
-      return (ThreadAction_ptr)0;
+      return static_cast<ThreadAction_ptr> (0);
     }
     
     
@@ -168,7 +170,7 @@ namespace RTScheduling
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void _cxx_do (
-        CORBA::VoidData data
+        ::CORBA::VoidData data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -207,7 +209,7 @@ namespace RTScheduling
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ThreadAction;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_RTSCHEDULING_DISTRIBUTABLETHREAD__VAR_OUT_CH_)
 #define _RTSCHEDULING_DISTRIBUTABLETHREAD__VAR_OUT_CH_
@@ -257,7 +259,7 @@ namespace RTScheduling
     
     static DistributableThread_ptr _nil (void)
     {
-      return (DistributableThread_ptr)0;
+      return static_cast<DistributableThread_ptr> (0);
     }
     
     
@@ -330,7 +332,7 @@ namespace RTScheduling
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_DistributableThread;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_RTSCHEDULING_CURRENT__VAR_OUT_CH_)
 #define _RTSCHEDULING_CURRENT__VAR_OUT_CH_
@@ -359,7 +361,7 @@ namespace RTScheduling
 #define _RTSCHEDULING_CURRENT_CH_
   
   class TAO_RTScheduler_Export Current
-    : public virtual RTCORBA::Current
+    : public virtual ::RTCORBA::Current
   {
   public:
     typedef Current_ptr _ptr_type;
@@ -380,7 +382,7 @@ namespace RTScheduling
     
     static Current_ptr _nil (void)
     {
-      return (Current_ptr)0;
+      return static_cast<Current_ptr> (0);
     }
     
     
@@ -389,13 +391,13 @@ namespace RTScheduling
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::RTScheduling::DistributableThread_ptr spawn (
-        RTScheduling::ThreadAction_ptr start,
-        CORBA::VoidData data,
+        ::RTScheduling::ThreadAction_ptr start,
+        ::CORBA::VoidData data,
         const char * name,
-        CORBA::Policy_ptr sched_param,
-        CORBA::Policy_ptr implicit_sched_param,
-        CORBA::ULong stack_size,
-        RTCORBA::Priority base_priority
+        ::CORBA::Policy_ptr sched_param,
+        ::CORBA::Policy_ptr implicit_sched_param,
+        ::CORBA::ULong stack_size,
+        ::RTCORBA::Priority base_priority
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -419,8 +421,10 @@ namespace RTScheduling
       UNSUPPORTED_SCHEDULING_DISCIPLINE &operator= (const UNSUPPORTED_SCHEDULING_DISCIPLINE &);
       
       static UNSUPPORTED_SCHEDULING_DISCIPLINE *_downcast (CORBA::Exception *);
+      static const UNSUPPORTED_SCHEDULING_DISCIPLINE *_downcast (CORBA::Exception const *);
+      
       static CORBA::Exception *_alloc (void);
-
+      
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -436,7 +440,7 @@ namespace RTScheduling
         );
       
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:125
+      // be\be_visitor_exception/exception_ch.cpp:127
       
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
@@ -453,13 +457,13 @@ namespace RTScheduling
     
     virtual void begin_scheduling_segment (
         const char * name,
-        CORBA::Policy_ptr sched_param,
-        CORBA::Policy_ptr implicit_sched_param
+        ::CORBA::Policy_ptr sched_param,
+        ::CORBA::Policy_ptr implicit_sched_param
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE
+        CORBA::SystemException,
+        ::RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -467,13 +471,13 @@ namespace RTScheduling
     
     virtual void update_scheduling_segment (
         const char * name,
-        CORBA::Policy_ptr sched_param,
-        CORBA::Policy_ptr implicit_sched_param
+        ::CORBA::Policy_ptr sched_param,
+        ::CORBA::Policy_ptr implicit_sched_param
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE
+        CORBA::SystemException,
+        ::RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -560,7 +564,7 @@ namespace RTScheduling
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual ::RTScheduling::DistributableThread_ptr lookup (
-        const RTScheduling::Current::IdType & id
+        const ::RTScheduling::Current::IdType & id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -678,7 +682,7 @@ namespace RTScheduling
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Current;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_RTSCHEDULING_RESOURCEMANAGER__VAR_OUT_CH_)
 #define _RTSCHEDULING_RESOURCEMANAGER__VAR_OUT_CH_
@@ -707,7 +711,7 @@ namespace RTScheduling
 #define _RTSCHEDULING_RESOURCEMANAGER_CH_
   
   class TAO_RTScheduler_Export ResourceManager
-    : public virtual RTCORBA::Mutex
+    : public virtual ::RTCORBA::Mutex
   {
   public:
     typedef ResourceManager_ptr _ptr_type;
@@ -728,7 +732,7 @@ namespace RTScheduling
     
     static ResourceManager_ptr _nil (void)
     {
-      return (ResourceManager_ptr)0;
+      return static_cast<ResourceManager_ptr> (0);
     }
     
     
@@ -765,7 +769,7 @@ namespace RTScheduling
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ResourceManager;
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_RTSCHEDULING_SCHEDULER__VAR_OUT_CH_)
 #define _RTSCHEDULING_SCHEDULER__VAR_OUT_CH_
@@ -815,7 +819,7 @@ namespace RTScheduling
     
     static Scheduler_ptr _nil (void)
     {
-      return (Scheduler_ptr)0;
+      return static_cast<Scheduler_ptr> (0);
     }
     
     
@@ -837,8 +841,10 @@ namespace RTScheduling
       INCOMPATIBLE_SCHEDULING_DISCIPLINES &operator= (const INCOMPATIBLE_SCHEDULING_DISCIPLINES &);
       
       static INCOMPATIBLE_SCHEDULING_DISCIPLINES *_downcast (CORBA::Exception *);
+      static const INCOMPATIBLE_SCHEDULING_DISCIPLINES *_downcast (CORBA::Exception const *);
+      
       static CORBA::Exception *_alloc (void);
-
+      
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -854,7 +860,7 @@ namespace RTScheduling
         );
       
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:125
+      // be\be_visitor_exception/exception_ch.cpp:127
       
       virtual CORBA::TypeCode_ptr _type (void) const;
     };
@@ -880,7 +886,7 @@ namespace RTScheduling
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void scheduling_policies (
-        const CORBA::PolicyList & scheduling_policies
+        const ::CORBA::PolicyList & scheduling_policies
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -912,7 +918,7 @@ namespace RTScheduling
     
     virtual ::RTScheduling::ResourceManager_ptr create_resource_manager (
         const char * name,
-        CORBA::Policy_ptr scheduling_parameter
+        ::CORBA::Policy_ptr scheduling_parameter
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -923,9 +929,9 @@ namespace RTScheduling
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void set_scheduling_parameter (
-        PortableServer::Servant & resource,
+        ::PortableServer::Servant & resource,
         const char * name,
-        CORBA::Policy_ptr scheduling_parameter
+        ::CORBA::Policy_ptr scheduling_parameter
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -936,52 +942,52 @@ namespace RTScheduling
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void begin_new_scheduling_segment (
-        const RTScheduling::Current::IdType & guid,
+        const ::RTScheduling::Current::IdType & guid,
         const char * name,
-        CORBA::Policy_ptr sched_param,
-        CORBA::Policy_ptr implicit_sched_param
+        ::CORBA::Policy_ptr sched_param,
+        ::CORBA::Policy_ptr implicit_sched_param
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE
+        CORBA::SystemException,
+        ::RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void begin_nested_scheduling_segment (
-        const RTScheduling::Current::IdType & guid,
+        const ::RTScheduling::Current::IdType & guid,
         const char * name,
-        CORBA::Policy_ptr sched_param,
-        CORBA::Policy_ptr implicit_sched_param
+        ::CORBA::Policy_ptr sched_param,
+        ::CORBA::Policy_ptr implicit_sched_param
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE
+        CORBA::SystemException,
+        ::RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void update_scheduling_segment (
-        const RTScheduling::Current::IdType & guid,
+        const ::RTScheduling::Current::IdType & guid,
         const char * name,
-        CORBA::Policy_ptr sched_param,
-        CORBA::Policy_ptr implicit_sched_param
+        ::CORBA::Policy_ptr sched_param,
+        ::CORBA::Policy_ptr implicit_sched_param
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE
+        CORBA::SystemException,
+        ::RTScheduling::Current::UNSUPPORTED_SCHEDULING_DISCIPLINE
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void end_scheduling_segment (
-        const RTScheduling::Current::IdType & guid,
+        const ::RTScheduling::Current::IdType & guid,
         const char * name
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
@@ -993,9 +999,9 @@ namespace RTScheduling
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void end_nested_scheduling_segment (
-        const RTScheduling::Current::IdType & guid,
+        const ::RTScheduling::Current::IdType & guid,
         const char * name,
-        CORBA::Policy_ptr outer_sched_param
+        ::CORBA::Policy_ptr outer_sched_param
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1006,35 +1012,35 @@ namespace RTScheduling
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void send_request (
-        PortableInterceptor::ClientRequestInfo_ptr ri
+        ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableInterceptor::ForwardRequest
+        CORBA::SystemException,
+        ::PortableInterceptor::ForwardRequest
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void receive_request (
-        PortableInterceptor::ServerRequestInfo_ptr ri,
-        RTScheduling::Current::IdType_out guid,
+        ::PortableInterceptor::ServerRequestInfo_ptr ri,
+        ::RTScheduling::Current::IdType_out guid,
         CORBA::String_out name,
-        CORBA::Policy_out sched_param,
-        CORBA::Policy_out implicit_sched_param
+        ::CORBA::Policy_out sched_param,
+        ::CORBA::Policy_out implicit_sched_param
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableInterceptor::ForwardRequest
+        CORBA::SystemException,
+        ::PortableInterceptor::ForwardRequest
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void send_reply (
-        PortableInterceptor::ServerRequestInfo_ptr ri
+        ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1045,43 +1051,43 @@ namespace RTScheduling
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void send_exception (
-        PortableInterceptor::ServerRequestInfo_ptr ri
+        ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableInterceptor::ForwardRequest
+        CORBA::SystemException,
+        ::PortableInterceptor::ForwardRequest
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void send_other (
-        PortableInterceptor::ServerRequestInfo_ptr ri
+        ::PortableInterceptor::ServerRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableInterceptor::ForwardRequest
+        CORBA::SystemException,
+        ::PortableInterceptor::ForwardRequest
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void send_poll (
-        PortableInterceptor::ClientRequestInfo_ptr ri
+        ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableInterceptor::ForwardRequest
+        CORBA::SystemException,
+        ::PortableInterceptor::ForwardRequest
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void receive_reply (
-        PortableInterceptor::ClientRequestInfo_ptr ri
+        ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1092,31 +1098,31 @@ namespace RTScheduling
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void receive_exception (
-        PortableInterceptor::ClientRequestInfo_ptr ri
+        ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableInterceptor::ForwardRequest
+        CORBA::SystemException,
+        ::PortableInterceptor::ForwardRequest
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void receive_other (
-        PortableInterceptor::ClientRequestInfo_ptr ri
+        ::PortableInterceptor::ClientRequestInfo_ptr ri
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        CORBA::SystemException
-        , PortableInterceptor::ForwardRequest
+        CORBA::SystemException,
+        ::PortableInterceptor::ForwardRequest
       )) = 0;
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
     virtual void cancel (
-        const RTScheduling::Current::IdType & guid
+        const ::RTScheduling::Current::IdType & guid
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
@@ -1170,17 +1176,17 @@ namespace TAO
 #define _RTSCHEDULING_THREADACTION__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTScheduler_Export Objref_Traits<RTScheduling::ThreadAction>
+  struct TAO_RTScheduler_Export Objref_Traits< ::RTScheduling::ThreadAction>
   {
-    static RTScheduling::ThreadAction_ptr duplicate (
-        RTScheduling::ThreadAction_ptr
+    static ::RTScheduling::ThreadAction_ptr duplicate (
+        ::RTScheduling::ThreadAction_ptr
       );
     static void release (
-        RTScheduling::ThreadAction_ptr
+        ::RTScheduling::ThreadAction_ptr
       );
-    static RTScheduling::ThreadAction_ptr nil (void);
+    static ::RTScheduling::ThreadAction_ptr nil (void);
     static CORBA::Boolean marshal (
-        RTScheduling::ThreadAction_ptr p,
+        ::RTScheduling::ThreadAction_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1191,17 +1197,17 @@ namespace TAO
 #define _RTSCHEDULING_DISTRIBUTABLETHREAD__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTScheduler_Export Objref_Traits<RTScheduling::DistributableThread>
+  struct TAO_RTScheduler_Export Objref_Traits< ::RTScheduling::DistributableThread>
   {
-    static RTScheduling::DistributableThread_ptr duplicate (
-        RTScheduling::DistributableThread_ptr
+    static ::RTScheduling::DistributableThread_ptr duplicate (
+        ::RTScheduling::DistributableThread_ptr
       );
     static void release (
-        RTScheduling::DistributableThread_ptr
+        ::RTScheduling::DistributableThread_ptr
       );
-    static RTScheduling::DistributableThread_ptr nil (void);
+    static ::RTScheduling::DistributableThread_ptr nil (void);
     static CORBA::Boolean marshal (
-        RTScheduling::DistributableThread_ptr p,
+        ::RTScheduling::DistributableThread_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1212,17 +1218,17 @@ namespace TAO
 #define _RTSCHEDULING_CURRENT__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTScheduler_Export Objref_Traits<RTScheduling::Current>
+  struct TAO_RTScheduler_Export Objref_Traits< ::RTScheduling::Current>
   {
-    static RTScheduling::Current_ptr duplicate (
-        RTScheduling::Current_ptr
+    static ::RTScheduling::Current_ptr duplicate (
+        ::RTScheduling::Current_ptr
       );
     static void release (
-        RTScheduling::Current_ptr
+        ::RTScheduling::Current_ptr
       );
-    static RTScheduling::Current_ptr nil (void);
+    static ::RTScheduling::Current_ptr nil (void);
     static CORBA::Boolean marshal (
-        RTScheduling::Current_ptr p,
+        ::RTScheduling::Current_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1233,17 +1239,17 @@ namespace TAO
 #define _RTSCHEDULING_RESOURCEMANAGER__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTScheduler_Export Objref_Traits<RTScheduling::ResourceManager>
+  struct TAO_RTScheduler_Export Objref_Traits< ::RTScheduling::ResourceManager>
   {
-    static RTScheduling::ResourceManager_ptr duplicate (
-        RTScheduling::ResourceManager_ptr
+    static ::RTScheduling::ResourceManager_ptr duplicate (
+        ::RTScheduling::ResourceManager_ptr
       );
     static void release (
-        RTScheduling::ResourceManager_ptr
+        ::RTScheduling::ResourceManager_ptr
       );
-    static RTScheduling::ResourceManager_ptr nil (void);
+    static ::RTScheduling::ResourceManager_ptr nil (void);
     static CORBA::Boolean marshal (
-        RTScheduling::ResourceManager_ptr p,
+        ::RTScheduling::ResourceManager_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1254,17 +1260,17 @@ namespace TAO
 #define _RTSCHEDULING_SCHEDULER__TRAITS_CH_
   
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_RTScheduler_Export Objref_Traits<RTScheduling::Scheduler>
+  struct TAO_RTScheduler_Export Objref_Traits< ::RTScheduling::Scheduler>
   {
-    static RTScheduling::Scheduler_ptr duplicate (
-        RTScheduling::Scheduler_ptr
+    static ::RTScheduling::Scheduler_ptr duplicate (
+        ::RTScheduling::Scheduler_ptr
       );
     static void release (
-        RTScheduling::Scheduler_ptr
+        ::RTScheduling::Scheduler_ptr
       );
-    static RTScheduling::Scheduler_ptr nil (void);
+    static ::RTScheduling::Scheduler_ptr nil (void);
     static CORBA::Boolean marshal (
-        RTScheduling::Scheduler_ptr p,
+        ::RTScheduling::Scheduler_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1273,13 +1279,13 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
-#include "RTSchedulerC.i"
+#include "RTSchedulerC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -1291,3 +1297,4 @@ namespace TAO
 
 #endif /* ifndef */
 
+
diff --git a/TAO/tao/RTScheduling/RTSchedulerC.i b/TAO/tao/RTScheduling/RTSchedulerC.i
deleted file mode 100644
index 38aa32569ba..00000000000
--- a/TAO/tao/RTScheduling/RTSchedulerC.i
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- 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
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       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/RTScheduling/RTSchedulerC.inl b/TAO/tao/RTScheduling/RTSchedulerC.inl
new file mode 100644
index 00000000000..c944d806c1f
--- /dev/null
+++ b/TAO/tao/RTScheduling/RTSchedulerC.inl
@@ -0,0 +1,27 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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/RTScheduling/RTScheduler_Initializer.cpp b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
index 219797643a0..e9c18aec522 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
@@ -58,7 +58,7 @@ void
                     TAO_RTScheduler_Current,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
@@ -83,7 +83,7 @@ void
                     Client_Interceptor,
                     CORBA::NO_MEMORY (
                         CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                         CORBA::COMPLETED_NO));
   ACE_CHECK;
@@ -97,7 +97,7 @@ void
                     Server_Interceptor (this->current_),
                     CORBA::NO_MEMORY (
                         CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                         CORBA::COMPLETED_NO));
   ACE_CHECK;
@@ -113,7 +113,7 @@ void
                     TAO_RTScheduler_Manager (tao_info->orb_core ()),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
index aefd86a9b1d..9c9cf4ba0ea 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
@@ -49,13 +49,13 @@ TAO_RTScheduler_Loader::init (int,
       ACE_NEW_THROW_EX (temp_orb_initializer,
                         TAO_RTScheduler_ORB_Initializer,
                         CORBA::NO_MEMORY (
-					  CORBA::SystemException::_tao_minor_code (
-										  TAO_DEFAULT_MINOR_CODE,
-										  ENOMEM),
+                          CORBA::SystemException::_tao_minor_code (
+                          TAO::VMCID,
+                          ENOMEM),
 					  CORBA::COMPLETED_NO));
       ACE_TRY_CHECK;
       orb_initializer = temp_orb_initializer;
-      
+
       PortableInterceptor::register_orb_initializer (orb_initializer.in ()
                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp
index 399d04a9748..47af7c3dfcb 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.cpp
+++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp
@@ -321,7 +321,7 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr
                                                this->current_->dt_hash ()),
                     CORBA::NO_MEMORY (
                            CORBA::SystemException::_tao_minor_code (
-                             TAO_DEFAULT_MINOR_CODE,
+                             TAO::VMCID,
                              ENOMEM),
                            CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/tao/RTScheduling/diffs/RTScheduler.diff b/TAO/tao/RTScheduling/diffs/RTScheduler.diff
index 85f168b8593..4e7479e6b2d 100644
--- a/TAO/tao/RTScheduling/diffs/RTScheduler.diff
+++ b/TAO/tao/RTScheduling/diffs/RTScheduler.diff
@@ -1,20 +1,7 @@
---- orig/RTSchedulerC.h	2003-12-29 10:11:07.000000000 -0600
-+++ RTSchedulerC.h	2003-12-29 10:14:38.000000000 -0600
-@@ -40,18 +40,15 @@
- #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
- #include "rtscheduler_export.h"
--#include "tao/CDR.h"
--#include "tao/Environment.h"
--#include "tao/Object.h"
--#include "tao/Sequence_T.h"
--#include "tao/Objref_VarOut_T.h"
--#include "tao/Seq_Var_T.h"
--#include "tao/Seq_Out_T.h"
- 
--#include "tao/RTCORBA/RTCORBAC.h"
-+#include "tao/RTCORBA/RTCORBA.h"
- #include "tao/PortableServer/PortableServerC.h"
+--- orig/RTSchedulerC.h	2005-02-14 15:00:39.953600300 +0100
++++ RTSchedulerC.h	2005-02-14 15:00:40.133859500 +0100
+@@ -54,6 +54,10 @@
+ #include "tao/PortableServer/PortableServer_includeC.h"
  #include "tao/PortableInterceptorC.h"
  
 +#ifndef TAO_RTSCHEDULER_SAFE_INCLUDE
@@ -24,22 +11,35 @@
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
  #endif
-@@ -94,6 +91,7 @@
- 
+@@ -95,6 +99,9 @@
  // TAO_IDL - Generated from
- // be/be_visitor_module/module_ch.cpp:66
-+  typedef void* VoidData;
+ // be\be_visitor_module/module_ch.cpp:66
  
++  // Hand crafted
++  typedef void* VoidData;
++
  } // module CORBA
  
---- orig/RTSchedulerC.cpp	2003-12-29 10:11:07.000000000 -0600
-+++ RTSchedulerC.cpp	2003-12-29 10:13:12.000000000 -0600
+ // TAO_IDL - Generated from
+--- orig/RTSchedulerC.cpp	2005-02-14 15:00:39.953600300 +0100
++++ RTSchedulerC.cpp	2005-02-14 15:00:40.153888300 +0100
 @@ -29,7 +29,7 @@
- // be/be_codegen.cpp:338
+ // be\be_codegen.cpp:302
  
  
 -#include "RTSchedulerC.h"
 +#include "RTScheduler.h"
+ #include "tao/CDR.h"
  #include "tao/ORB_Core.h"
  #include "tao/Typecode.h"
- #include "tao/Var_Size_Argument_T.h"
+--- orig/RTSchedulerA.cpp	2005-02-14 15:00:39.953600300 +0100
++++ RTSchedulerA.cpp	2005-02-14 15:00:53.903659500 +0100
+@@ -25,7 +25,7 @@
+ // Information about TAO is available at:
+ //     http://www.cs.wustl.edu/~schmidt/TAO.html
+ 
+-#include "RTSchedulerC.h"
++#include "RTScheduler.h"
+ #include "tao/Typecode.h"
+ 
+ // TAO_IDL - Generated from
diff --git a/TAO/tao/Sequence.cpp b/TAO/tao/Sequence.cpp
index dc753c2fb34..e806e220410 100644
--- a/TAO/tao/Sequence.cpp
+++ b/TAO/tao/Sequence.cpp
@@ -183,7 +183,7 @@ TAO_Unbounded_String_Sequence::operator= (
 
   TAO_Unbounded_Base_Sequence::operator= (rhs);
 
-  char ** tmp1 = ACE_reinterpret_cast (char **, this->buffer_);
+  char ** tmp1 = reinterpret_cast <char **> (this->buffer_);
   char ** const tmp2 = ACE_reinterpret_cast (char ** ACE_CAST_CONST,
                                              rhs.buffer_);
 
@@ -251,8 +251,7 @@ TAO_Unbounded_String_Sequence::_tao_any_destructor (
   )
 {
   TAO_Unbounded_String_Sequence * tmp =
-    ACE_static_cast (TAO_Unbounded_String_Sequence *,
-                     _tao_void_pointer);
+    static_cast <TAO_Unbounded_String_Sequence *> (_tao_void_pointer);
   delete tmp;
 }
 
@@ -272,7 +271,7 @@ TAO_Unbounded_String_Sequence::get_buffer (CORBA::Boolean orphan)
         }
       else
         {
-          result = ACE_reinterpret_cast (char **, this->buffer_);
+          result = reinterpret_cast <char **> (this->buffer_);
         }
     }
   else // if (orphan == 1)
@@ -281,7 +280,7 @@ TAO_Unbounded_String_Sequence::get_buffer (CORBA::Boolean orphan)
         {
           // We set the state back to default and relinquish
           // ownership.
-          result = ACE_reinterpret_cast (char **, this->buffer_);
+          result = reinterpret_cast <char **> (this->buffer_);
           this->maximum_ = 0;
           this->length_ = 0;
           this->buffer_ = 0;
@@ -306,7 +305,7 @@ TAO_Unbounded_String_Sequence::_allocate_buffer (CORBA::ULong length)
 
   if (this->buffer_ != 0)
     {
-      char ** old = ACE_reinterpret_cast (char **, this->buffer_);
+      char ** old = reinterpret_cast <char **> (this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
@@ -342,7 +341,7 @@ TAO_Unbounded_String_Sequence::_deallocate_buffer (void)
       return;
     }
 
-  char ** tmp = ACE_reinterpret_cast (char **, this->buffer_);
+  char ** tmp = reinterpret_cast <char **> (this->buffer_);
 
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
@@ -361,8 +360,7 @@ void
 TAO_Unbounded_String_Sequence::_shrink_buffer (CORBA::ULong nl,
                                                CORBA::ULong ol)
 {
-  char ** tmp = ACE_reinterpret_cast (char **,
-                                      this->buffer_);
+  char ** tmp = reinterpret_cast <char **> (this->buffer_);
 
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
@@ -379,8 +377,7 @@ TAO_Unbounded_String_Sequence::replace (CORBA::ULong maximum,
 {
   if (this->release_ == 1)
     {
-      char ** tmp = ACE_reinterpret_cast (char **,
-                                          this->buffer_);
+      char ** tmp = reinterpret_cast <char **> (this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
@@ -454,8 +451,7 @@ TAO_Unbounded_WString_Sequence::operator= (
 
   if (this->release_)
     {
-      CORBA::WChar ** tmp = ACE_reinterpret_cast (CORBA::WChar **,
-                                                  this->buffer_);
+      CORBA::WChar ** tmp = reinterpret_cast <CORBA::WChar **> (this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
@@ -486,8 +482,7 @@ TAO_Unbounded_WString_Sequence::operator= (
 
   TAO_Unbounded_Base_Sequence::operator= (rhs);
 
-  CORBA::WChar ** tmp1 = ACE_reinterpret_cast (CORBA::WChar **,
-                                               this->buffer_);
+  CORBA::WChar ** tmp1 = reinterpret_cast <CORBA::WChar **> (this->buffer_);
   CORBA::WChar ** const tmp2 =
     ACE_reinterpret_cast (CORBA::WChar ** ACE_CAST_CONST,
                           rhs.buffer_);
diff --git a/TAO/tao/Sequence_T.cpp b/TAO/tao/Sequence_T.cpp
index 9f538db1292..f3a23d998e7 100644
--- a/TAO/tao/Sequence_T.cpp
+++ b/TAO/tao/Sequence_T.cpp
@@ -28,7 +28,7 @@ TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence (
     {
       T * tmp1 = TAO_Unbounded_Sequence<T>::allocbuf (this->maximum_);
       T * const tmp2 =
-        ACE_reinterpret_cast (T * ACE_CAST_CONST, rhs.buffer_);
+        reinterpret_cast <T * ACE_CAST_CONST> (rhs.buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
@@ -57,8 +57,7 @@ TAO_Unbounded_Sequence<T>::operator= (const TAO_Unbounded_Sequence<T> & rhs)
       if (this->maximum_ < rhs.maximum_)
         {
           // Free the old buffer.
-          T * tmp = ACE_reinterpret_cast (T *,
-                                          this->buffer_);
+          T * tmp = reinterpret_cast <T *> (this->buffer_);
           TAO_Unbounded_Sequence<T>::freebuf (tmp);
           this->buffer_ =
             TAO_Unbounded_Sequence<T>::allocbuf (rhs.maximum_);
@@ -79,10 +78,8 @@ TAO_Unbounded_Sequence<T>::operator= (const TAO_Unbounded_Sequence<T> & rhs)
 
   TAO_Unbounded_Base_Sequence::operator= (rhs);
 
-  T * tmp1 = ACE_reinterpret_cast (T *,
-                                   this->buffer_);
-  T * const tmp2 = ACE_reinterpret_cast (T * ACE_CAST_CONST,
-                                         rhs.buffer_);
+  T * tmp1 = reinterpret_cast <T *> (this->buffer_);
+  T * const tmp2 = reinterpret_cast <T * ACE_CAST_CONST> (rhs.buffer_);
 
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
@@ -106,8 +103,7 @@ TAO_Unbounded_Sequence<T>::_allocate_buffer (CORBA::ULong length)
 
   if (this->buffer_ != 0)
     {
-      T * old = ACE_reinterpret_cast (T *,
-                                      this->buffer_);
+      T * old = reinterpret_cast <T *> (this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
@@ -132,8 +128,7 @@ TAO_Unbounded_Sequence<T>::_deallocate_buffer (void)
       return;
     }
 
-  T * tmp = ACE_reinterpret_cast (T *,
-                                  this->buffer_);
+  T * tmp = reinterpret_cast <T *> (this->buffer_);
 
   TAO_Unbounded_Sequence<T>::freebuf (tmp);
   this->buffer_ = 0;
@@ -162,14 +157,12 @@ TAO_Unbounded_Sequence<T>::get_buffer (CORBA::Boolean orphan)
         }
       else
         {
-          result = ACE_reinterpret_cast (T *,
-                                         this->buffer_);
+          result = reinterpret_cast <T *> (this->buffer_);
         }
     }
   else
     {
-      result = ACE_reinterpret_cast (T *,
-                                     this->buffer_);
+      result = reinterpret_cast <T *> (this->buffer_);
 
       if (this->release_ != 0)
         {
@@ -191,8 +184,7 @@ T &
 TAO_Unbounded_Sequence<T>::operator[] (CORBA::ULong i)
 {
   TAO_SEQUENCE_ASSERT (i, this->maximum_);
-  T * tmp = ACE_reinterpret_cast (T *,
-                                  this->buffer_);
+  T * tmp = reinterpret_cast <T *> (this->buffer_);
   return tmp[i];
 }
 
@@ -203,8 +195,7 @@ const T &
 TAO_Unbounded_Sequence<T>::operator[] (CORBA::ULong i) const
 {
   TAO_SEQUENCE_ASSERT (i, this->maximum_);
-  T * const tmp = ACE_reinterpret_cast (T * ACE_CAST_CONST,
-                                        this->buffer_);
+  T * const tmp = reinterpret_cast <T * ACE_CAST_CONST> (this->buffer_);
   return tmp[i];
 }
 
@@ -220,7 +211,7 @@ TAO_Unbounded_Sequence<T>::replace (CORBA::ULong max,
 
   if (this->buffer_ && this->release_ == 1)
     {
-      T * tmp = ACE_reinterpret_cast (T *, this->buffer_);
+      T * tmp = reinterpret_cast <T *> (this->buffer_);
       TAO_Unbounded_Sequence<T>::freebuf (tmp);
     }
 
@@ -242,9 +233,7 @@ TAO_Bounded_Sequence<T, MAX>::TAO_Bounded_Sequence (
     {
       T * tmp1 = TAO_Bounded_Sequence<T,MAX>::allocbuf (MAX);
 
-      T * const tmp2 =
-        ACE_reinterpret_cast (T * ACE_CAST_CONST,
-                              rhs.buffer_);
+      T * const tmp2 = reinterpret_cast <T * ACE_CAST_CONST> (rhs.buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
@@ -290,8 +279,8 @@ TAO_Bounded_Sequence<T,MAX>::operator= (
 
   TAO_Bounded_Base_Sequence::operator= (rhs);
 
-  T * tmp1 = ACE_reinterpret_cast (T *, this->buffer_);
-  T * const tmp2 = ACE_reinterpret_cast (T * ACE_CAST_CONST, rhs.buffer_);
+  T * tmp1 = reinterpret_cast <T *> (this->buffer_);
+  T * const tmp2 = reinterpret_cast <T * ACE_CAST_CONST> (rhs.buffer_);
 
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
@@ -325,8 +314,7 @@ TAO_Bounded_Sequence<T, MAX>::_deallocate_buffer (void)
       return;
     }
 
-  T * tmp = ACE_reinterpret_cast (T *,
-                                  this->buffer_);
+  T * tmp = reinterpret_cast <T *> (this->buffer_);
   TAO_Bounded_Sequence<T, MAX>::freebuf (tmp);
   this->buffer_ = 0;
   this->length_  = 0;
@@ -351,8 +339,7 @@ TAO_Bounded_Sequence<T, MAX>::get_buffer (CORBA::Boolean orphan)
         }
       else
         {
-          result =
-            ACE_reinterpret_cast (T*, this->buffer_);
+          result = reinterpret_cast <T*> (this->buffer_);
         }
     }
   else // if (orphan == 1)
@@ -361,7 +348,7 @@ TAO_Bounded_Sequence<T, MAX>::get_buffer (CORBA::Boolean orphan)
         {
           // We set the state back to default and relinquish
           // ownership.
-          result = ACE_reinterpret_cast(T*,this->buffer_);
+          result = reinterpret_cast <T*> (this->buffer_);
           this->maximum_ = 0;
           this->length_ = 0;
           this->buffer_ = 0;
@@ -384,7 +371,7 @@ TAO_Bounded_Sequence<T,MAX>::replace (CORBA::ULong max,
 
   if (this->buffer_ && this->release_ == 1)
     {
-      T * tmp = ACE_reinterpret_cast (T *, this->buffer_);
+      T * tmp = reinterpret_cast <T *> (this->buffer_);
       TAO_Bounded_Sequence<T,MAX>::freebuf (tmp);
     }
 
@@ -580,8 +567,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::TAO_Unbounded_Object_Sequence (
         TAO_Unbounded_Object_Sequence<T,T_var>::allocbuf (
             this->maximum_
           );
-      T ** const tmp2 =
-        ACE_reinterpret_cast (T ** ACE_CAST_CONST, rhs.buffer_);
+      T ** const tmp2 = reinterpret_cast <T ** ACE_CAST_CONST> (rhs.buffer_);
 
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         {
@@ -616,8 +602,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::operator= (
 
   if (this->release_)
     {
-      T ** tmp = ACE_reinterpret_cast (T **,
-                                       this->buffer_);
+      T ** tmp = reinterpret_cast <T **> (this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         {
@@ -651,8 +636,8 @@ TAO_Unbounded_Object_Sequence<T,T_var>::operator= (
 
   TAO_Unbounded_Base_Sequence::operator= (rhs);
 
-  T ** tmp1 = ACE_reinterpret_cast (T **, this->buffer_);
-  T ** const tmp2 = ACE_reinterpret_cast (T ** ACE_CAST_CONST, rhs.buffer_);
+  T ** tmp1 = reinterpret_cast <T **> (this->buffer_);
+  T ** const tmp2 = reinterpret_cast <T ** ACE_CAST_CONST> (rhs.buffer_);
 
   for (CORBA::ULong i = 0; i < rhs.length_; ++i)
     {
@@ -716,8 +701,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_allocate_buffer (
 
   if (this->buffer_ != 0)
     {
-      T ** old = ACE_reinterpret_cast (T **,
-                                       this->buffer_);
+      T ** old = reinterpret_cast <T **> (this->buffer_);
 
       for (CORBA::ULong i = 0; i < this->length_; ++i)
         // Only call duplicate when we did not own the previous
@@ -754,8 +738,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_deallocate_buffer (
       return;
     }
 
-  T ** tmp = ACE_reinterpret_cast (T **,
-                                   this->buffer_);
+  T ** tmp = reinterpret_cast <T **> (this->buffer_);
 
   for (CORBA::ULong i = 0; i < this->length_; ++i)
     {
@@ -777,8 +760,7 @@ TAO_Unbounded_Object_Sequence<T,T_var>::_shrink_buffer (
     CORBA::ULong ol
   )
 {
-  T ** tmp = ACE_static_cast (T **,
-                              this->buffer_);
+  T ** tmp = static_cast <T **> (this->buffer_);
 
   for (CORBA::ULong i = nl; i < ol; ++i)
     {
@@ -811,9 +793,7 @@ TAO_Bounded_Object_Sequence<T,T_var,MAX>::TAO_Bounded_Object_Sequence (
       T ** tmp1 =
         TAO_Bounded_Object_Sequence<T,T_var,MAX>::allocbuf (MAX);
 
-      T ** const tmp2 =
-        ACE_reinterpret_cast (T** ACE_CAST_CONST,
-                              rhs.buffer_);
+      T ** const tmp2 = reinterpret_cast <T** ACE_CAST_CONST> (rhs.buffer_);
 
       for (CORBA::ULong i = 0; i < rhs.length_; ++i)
         {
diff --git a/TAO/tao/ServicesC.cpp b/TAO/tao/ServicesC.cpp
index 1b73e8ef277..a08a6b3758e 100644
--- a/TAO/tao/ServicesC.cpp
+++ b/TAO/tao/ServicesC.cpp
@@ -42,7 +42,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -224,7 +224,7 @@ CORBA::Boolean operator<< (
       return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -241,7 +241,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -250,7 +250,7 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
@@ -258,7 +258,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ServiceOptionSeq_CPP_ */
@@ -279,7 +279,7 @@ CORBA::Boolean operator<< (
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -289,7 +289,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -306,7 +306,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -315,11 +315,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -330,7 +330,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ServiceDetailSeq_CPP_ */
diff --git a/TAO/tao/ServicesC.h b/TAO/tao/ServicesC.h
index ffa6f7f68e1..b8ace277bdf 100644
--- a/TAO/tao/ServicesC.h
+++ b/TAO/tao/ServicesC.h
@@ -78,7 +78,7 @@ namespace CORBA
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::UShort ServiceType;
   typedef CORBA::UShort_out ServiceType_out;
@@ -89,7 +89,7 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceType;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::ULong ServiceOption;
   typedef CORBA::ULong_out ServiceOption_out;
@@ -100,7 +100,7 @@ namespace CORBA
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceOption;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::ULong ServiceDetailType;
   typedef CORBA::ULong_out ServiceDetailType_out;
diff --git a/TAO/tao/ShortSeqC.cpp b/TAO/tao/ShortSeqC.cpp
index 1a3e8fe82bf..fef6d6ceb63 100644
--- a/TAO/tao/ShortSeqC.cpp
+++ b/TAO/tao/ShortSeqC.cpp
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -121,7 +121,7 @@ CORBA::Boolean operator<< (
       return strm.write_short_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -138,7 +138,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -147,7 +147,7 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
@@ -155,7 +155,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ShortSeq_CPP_ */
diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp
index 54cc6fc956e..54910624a03 100644
--- a/TAO/tao/Strategies/DIOP_Connector.cpp
+++ b/TAO/tao/Strategies/DIOP_Connector.cpp
@@ -192,7 +192,7 @@ TAO_DIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
                     TAO_DIOP_Profile (this->orb_core ()),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
diff --git a/TAO/tao/Strategies/DIOP_Profile.cpp b/TAO/tao/Strategies/DIOP_Profile.cpp
index e301e3b3aa1..6b556eab16d 100644
--- a/TAO/tao/Strategies/DIOP_Profile.cpp
+++ b/TAO/tao/Strategies/DIOP_Profile.cpp
@@ -130,7 +130,7 @@ TAO_DIOP_Profile::parse_string_i (const char *ior
       // No object key delimiter or no hostname specified.
       ACE_THROW (CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
-                     TAO_DEFAULT_MINOR_CODE,
+                     TAO::VMCID,
                      EINVAL),
                    CORBA::COMPLETED_NO));
     }
@@ -145,7 +145,7 @@ TAO_DIOP_Profile::parse_string_i (const char *ior
       // No hostname specified!  It is required by the spec.
       ACE_THROW (CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
-                     TAO_DEFAULT_MINOR_CODE,
+                     TAO::VMCID,
                      EINVAL),
                    CORBA::COMPLETED_NO));
     }
@@ -199,7 +199,7 @@ TAO_DIOP_Profile::parse_string_i (const char *ior
           // @@ What's the right exception to throw here?
           ACE_THROW (CORBA::INV_OBJREF (
                        CORBA::SystemException::_tao_minor_code (
-                         TAO_DEFAULT_MINOR_CODE,
+                         TAO::VMCID,
                          EINVAL),
                        CORBA::COMPLETED_NO));
         }
diff --git a/TAO/tao/Strategies/SCIOP_Connector.cpp b/TAO/tao/Strategies/SCIOP_Connector.cpp
index 1f476dc6185..f70dea4539d 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connector.cpp
@@ -387,7 +387,7 @@ TAO_SCIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
                     TAO_SCIOP_Profile (this->orb_core ()),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp
index 06b991b58c7..275e6fce242 100644
--- a/TAO/tao/Strategies/SCIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SCIOP_Profile.cpp
@@ -149,7 +149,7 @@ TAO_SCIOP_Profile::parse_string_i (const char *ior
       // No object key delimiter or no hostname specified.
       ACE_THROW (CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
-                     TAO_DEFAULT_MINOR_CODE,
+                     TAO::VMCID,
                      EINVAL),
                    CORBA::COMPLETED_NO));
     }
@@ -164,7 +164,7 @@ TAO_SCIOP_Profile::parse_string_i (const char *ior
       // No hostname specified!  It is required by the spec.
       ACE_THROW (CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
-                     TAO_DEFAULT_MINOR_CODE,
+                     TAO::VMCID,
                      EINVAL),
                    CORBA::COMPLETED_NO));
     }
@@ -218,7 +218,7 @@ TAO_SCIOP_Profile::parse_string_i (const char *ior
           // @@ What's the right exception to throw here?
           ACE_THROW (CORBA::INV_OBJREF (
                        CORBA::SystemException::_tao_minor_code (
-                         TAO_DEFAULT_MINOR_CODE,
+                         TAO::VMCID,
                          EINVAL),
                        CORBA::COMPLETED_NO));
         }
diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp
index 28eb945a4f7..8685141a481 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp
@@ -302,7 +302,7 @@ TAO_SHMIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
                     TAO_SHMIOP_Profile (this->orb_core ()),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK_RETURN (0);
diff --git a/TAO/tao/Strategies/SHMIOP_Profile.cpp b/TAO/tao/Strategies/SHMIOP_Profile.cpp
index 8576e88d261..db66c5aa82d 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -140,7 +140,7 @@ TAO_SHMIOP_Profile::parse_string_i (const char *string
       // No host/port delimiter!
       ACE_THROW (CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
-                     TAO_DEFAULT_MINOR_CODE,
+                     TAO::VMCID,
                      EINVAL),
                    CORBA::COMPLETED_NO));
     }
@@ -152,7 +152,7 @@ TAO_SHMIOP_Profile::parse_string_i (const char *string
       // No object key delimiter!
       ACE_THROW (CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
-                     TAO_DEFAULT_MINOR_CODE,
+                     TAO::VMCID,
                      EINVAL),
                    CORBA::COMPLETED_NO));
     }
@@ -180,7 +180,7 @@ TAO_SHMIOP_Profile::parse_string_i (const char *string
         {
           ACE_THROW (CORBA::INV_OBJREF (
               CORBA::SystemException::_tao_minor_code (
-                  TAO_DEFAULT_MINOR_CODE,
+                  TAO::VMCID,
                   EINVAL),
               CORBA::COMPLETED_NO));
         }
@@ -222,7 +222,7 @@ TAO_SHMIOP_Profile::parse_string_i (const char *string
             // @@ What's the right exception to throw here?
             ACE_THROW (CORBA::INV_OBJREF (
                          CORBA::SystemException::_tao_minor_code (
-                           TAO_DEFAULT_MINOR_CODE,
+                           TAO::VMCID,
                            EINVAL),
                          CORBA::COMPLETED_NO));
           }
@@ -248,7 +248,7 @@ TAO_SHMIOP_Profile::parse_string_i (const char *string
       // @@ What's the right exception to throw here?
       ACE_THROW (CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
-                     TAO_DEFAULT_MINOR_CODE,
+                     TAO::VMCID,
                      EINVAL),
                    CORBA::COMPLETED_NO));
     }
diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp
index 9258c6ddf11..45a6f3de8f8 100644
--- a/TAO/tao/Strategies/UIOP_Connector.cpp
+++ b/TAO/tao/Strategies/UIOP_Connector.cpp
@@ -131,7 +131,7 @@ TAO_UIOP_Connector::corbaloc_scan (const char *str, size_t &len
   return this->make_profile (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-               
+
 int
 TAO_UIOP_Connector::set_validate_endpoint (TAO_Endpoint *endpoint)
 {
@@ -355,7 +355,7 @@ TAO_UIOP_Connector::make_profile (ACE_ENV_SINGLE_ARG_DECL)
                     TAO_UIOP_Profile (this->orb_core ()),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
 
diff --git a/TAO/tao/Strategies/UIOP_Profile.cpp b/TAO/tao/Strategies/UIOP_Profile.cpp
index a04757d7225..bd90fabe68a 100644
--- a/TAO/tao/Strategies/UIOP_Profile.cpp
+++ b/TAO/tao/Strategies/UIOP_Profile.cpp
@@ -144,7 +144,7 @@ TAO_UIOP_Profile::parse_string_i (const char *string
     {
       ACE_THROW (CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
-                     TAO_DEFAULT_MINOR_CODE,
+                     TAO::VMCID,
                      EINVAL),
                    CORBA::COMPLETED_NO));
       // No rendezvous point specified
@@ -161,7 +161,7 @@ TAO_UIOP_Profile::parse_string_i (const char *string
     {
       ACE_THROW (CORBA::INV_OBJREF (
                    CORBA::SystemException::_tao_minor_code (
-                     TAO_DEFAULT_MINOR_CODE,
+                     TAO::VMCID,
                      EINVAL),
                    CORBA::COMPLETED_NO));
     }
diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp
index 4fde6dfa205..1c4b42c09f7 100644
--- a/TAO/tao/StringSeqC.cpp
+++ b/TAO/tao/StringSeqC.cpp
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -112,7 +112,7 @@ CORBA::Boolean operator<< (
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -122,7 +122,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -139,7 +139,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -148,11 +148,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -164,7 +164,7 @@ CORBA::Boolean operator>> (
   
   }
 
-return 0;
+return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_StringSeq_CPP_ */
diff --git a/TAO/tao/StringSeqC.inl b/TAO/tao/StringSeqC.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/tao/StringSeqC.inl
+++ b/TAO/tao/StringSeqC.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp
index 165f09e3bca..16c6ffe2205 100644
--- a/TAO/tao/SystemException.cpp
+++ b/TAO/tao/SystemException.cpp
@@ -289,7 +289,7 @@ CORBA::SystemException::_info (void) const
 
   const CORBA::ULong VMCID = this->minor () & 0xFFFFF000u;
 
-  if (VMCID == TAO_DEFAULT_MINOR_CODE)
+  if (VMCID == TAO::VMCID)
     {
       // @@ Move the following code to a subroutine, it is too long already!
       const char *location;
diff --git a/TAO/tao/TAOA.cpp b/TAO/tao/TAOA.cpp
index a17fa7630fb..8c542dfdc09 100644
--- a/TAO/tao/TAOA.cpp
+++ b/TAO/tao/TAOA.cpp
@@ -292,14 +292,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp
index bdc8ee96460..1342ee8c09c 100644
--- a/TAO/tao/TAOC.cpp
+++ b/TAO/tao/TAOC.cpp
@@ -42,7 +42,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -170,22 +170,22 @@ TAO::BufferingConstraintPolicy::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Policy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:tao/TAO/BufferingConstraintPolicy:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h
index c1e1fd6a10c..aa41c3d410c 100644
--- a/TAO/tao/TAOC.h
+++ b/TAO/tao/TAOC.h
@@ -91,7 +91,7 @@ namespace TAO
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::UShort BufferingConstraintMode;
   typedef CORBA::UShort_out BufferingConstraintMode_out;
@@ -211,7 +211,7 @@ namespace TAO
     
     static BufferingConstraintPolicy_ptr _nil (void)
     {
-      return (BufferingConstraintPolicy_ptr)0;
+      return static_cast<BufferingConstraintPolicy_ptr> (0);
     }
     
     static void _tao_any_destructor (void *);
diff --git a/TAO/tao/Tagged_Components.h b/TAO/tao/Tagged_Components.h
index d23a960b4c3..aed3109e1df 100644
--- a/TAO/tao/Tagged_Components.h
+++ b/TAO/tao/Tagged_Components.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/IOPC.h"
+#include "tao/IOP_IORC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tao/TimeBaseC.cpp b/TAO/tao/TimeBaseC.cpp
index 848c25e0e5c..cb1686062ca 100644
--- a/TAO/tao/TimeBaseC.cpp
+++ b/TAO/tao/TimeBaseC.cpp
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/TimeBaseC.h b/TAO/tao/TimeBaseC.h
index 67c69d339af..9f9fbc8c350 100644
--- a/TAO/tao/TimeBaseC.h
+++ b/TAO/tao/TimeBaseC.h
@@ -73,7 +73,7 @@ namespace TimeBase
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::ULongLong TimeT;
   typedef CORBA::ULongLong_out TimeT_out;
@@ -84,7 +84,7 @@ namespace TimeBase
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TimeT;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef TimeT InaccuracyT;
   typedef TimeT_out InaccuracyT_out;
@@ -95,7 +95,7 @@ namespace TimeBase
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_InaccuracyT;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
+  // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::Short TdfT;
   typedef CORBA::Short_out TdfT_out;
@@ -213,7 +213,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TimeBase::IntervalT
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TimeBase::IntervalT &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:963
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "TimeBaseC.inl"
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl b/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl
index 6065e109e52..eee564824c9 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory.pidl
@@ -28,7 +28,7 @@
 //   2. Generate the code. The command used to generate code from this
 //   IDL file is:
 //
-//     tao_idl -o orig -Sc -Ge 1 -GT -I../.. -ci "C.inl" \
+//     tao_idl -o orig -Sc -Ge 1 -GT -I../.. \
 //          -Wb,export_macro=TAO_TypeCodeFactory_Export \
 //          -Wb,export_include=typecodefactory_export.h \
 //          -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
index c6700c8118b..45f9c2dbda9 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
@@ -26,17 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:323
+// be\be_codegen.cpp:302
 
 
 #include "TypeCodeFactoryC.h"
 #include "tao/CDR.h"
 #include "tao/Any_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 "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -48,358 +43,11 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
 {
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:582
-
-#if !defined (_CORBA_ANY__ARG_TRAITS_CS_)
-#define _CORBA_ANY__ARG_TRAITS_CS_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::Any>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::Any,
-            CORBA::Any_var,
-            CORBA::Any_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:537
-
-#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_CS_)
-#define _CORBA_DEFINITIONKIND__ARG_TRAITS_CS_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::DefinitionKind>
-    : public
-        Basic_Arg_Traits_T<
-            CORBA::DefinitionKind
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINER__ARG_TRAITS_CS_)
-#define _CORBA_CONTAINER__ARG_TRAITS_CS_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::Container>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::Container_ptr,
-            CORBA::Container_var,
-            CORBA::Container_out,
-            TAO::Objref_Traits<CORBA::Container>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_CS_)
-#define _CORBA_IDLTYPE__ARG_TRAITS_CS_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::IDLType>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::IDLType_ptr,
-            CORBA::IDLType_var,
-            CORBA::IDLType_out,
-            TAO::Objref_Traits<CORBA::IDLType>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
-
-#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::InterfaceDefSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::InterfaceDefSeq,
-            CORBA::InterfaceDefSeq_var,
-            CORBA::InterfaceDefSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_CS_)
-#define _CORBA_VALUEDEF__ARG_TRAITS_CS_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::ValueDef>
-    : public
-        Object_Arg_Traits_T<
-            CORBA::ValueDef_ptr,
-            CORBA::ValueDef_var,
-            CORBA::ValueDef_out,
-            TAO::Objref_Traits<CORBA::ValueDef>
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
-
-#if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::ValueDefSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::ValueDefSeq,
-            CORBA::ValueDefSeq_var,
-            CORBA::ValueDefSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_CS_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::AbstractInterfaceDefSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::AbstractInterfaceDefSeq,
-            CORBA::AbstractInterfaceDefSeq_var,
-            CORBA::AbstractInterfaceDefSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
-
-#if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::StructMemberSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::StructMemberSeq,
-            CORBA::StructMemberSeq_var,
-            CORBA::StructMemberSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
-
-#if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::InitializerSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::InitializerSeq,
-            CORBA::InitializerSeq_var,
-            CORBA::InitializerSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
-
-#if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::ExtInitializerSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::ExtInitializerSeq,
-            CORBA::ExtInitializerSeq_var,
-            CORBA::ExtInitializerSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
-
-#if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::UnionMemberSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::UnionMemberSeq,
-            CORBA::UnionMemberSeq_var,
-            CORBA::UnionMemberSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
-
-#if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::EnumMemberSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::EnumMemberSeq,
-            CORBA::EnumMemberSeq_var,
-            CORBA::EnumMemberSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:537
-
-#if !defined (_CORBA_PRIMITIVEKIND__ARG_TRAITS_CS_)
-#define _CORBA_PRIMITIVEKIND__ARG_TRAITS_CS_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::PrimitiveKind>
-    : public
-        Basic_Arg_Traits_T<
-            CORBA::PrimitiveKind
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
-
-#if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::ExceptionDefSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::ExceptionDefSeq,
-            CORBA::ExceptionDefSeq_var,
-            CORBA::ExceptionDefSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:537
-
-#if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_CS_)
-#define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_CS_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::AttributeMode>
-    : public
-        Basic_Arg_Traits_T<
-            CORBA::AttributeMode
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:537
-
-#if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_CS_)
-#define _CORBA_OPERATIONMODE__ARG_TRAITS_CS_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::OperationMode>
-    : public
-        Basic_Arg_Traits_T<
-            CORBA::OperationMode
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
-
-#if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_)
-#define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::ParDescriptionSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::ParDescriptionSeq,
-            CORBA::ParDescriptionSeq_var,
-            CORBA::ParDescriptionSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:379
-
-#if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_CS_)
-#define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_CS_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  class TAO_TypeCodeFactory_Export Arg_Traits<CORBA::ContextIdSeq>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::ContextIdSeq,
-            CORBA::ContextIdSeq_var,
-            CORBA::ContextIdSeq_out
-          >
-  {
-  };
-
-#endif /* end #if !defined */
 }
 
 
@@ -443,23 +91,17 @@ TAO::Objref_Traits<CORBA::TypeCodeFactory>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*CORBA__TAO_TypeCodeFactory_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
 CORBA::TypeCodeFactory::TypeCodeFactory (void)
 {}
 
 CORBA::TypeCodeFactory::~TypeCodeFactory (void)
 {}
 
-void
+void 
 CORBA::TypeCodeFactory::_tao_any_destructor (void *_tao_void_pointer)
 {
   TypeCodeFactory *_tao_tmp_pointer =
-    ACE_static_cast (TypeCodeFactory *, _tao_void_pointer);
+    static_cast<TypeCodeFactory *> (_tao_void_pointer);
   CORBA::release (_tao_tmp_pointer);
 }
 
@@ -473,10 +115,10 @@ CORBA::TypeCodeFactory::_narrow (
     {
       return TypeCodeFactory::_nil ();
     }
-
+  
   TypeCodeFactory_ptr proxy =
     dynamic_cast<TypeCodeFactory_ptr> (_tao_objref);
-
+  
   return TypeCodeFactory::_duplicate (proxy);
 }
 
@@ -490,10 +132,10 @@ CORBA::TypeCodeFactory::_unchecked_narrow (
     {
       return TypeCodeFactory::_nil ();
     }
-
+  
   TypeCodeFactory_ptr proxy =
     dynamic_cast<TypeCodeFactory_ptr> (_tao_objref);
-
+  
   return TypeCodeFactory::_duplicate (proxy);
 }
 
@@ -504,7 +146,7 @@ CORBA::TypeCodeFactory::_duplicate (TypeCodeFactory_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -516,18 +158,18 @@ CORBA::TypeCodeFactory::_is_a (
 {
   if (
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/TypeCodeFactory:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/LocalObject:1.0"
         ) ||
       !ACE_OS::strcmp (
-          (char *)value,
+          value,
           "IDL:omg.org/CORBA/Object:1.0"
         )
-     )
+    )
     {
       return 1; // success using local knowledge
     }
@@ -549,26 +191,26 @@ CORBA::TypeCodeFactory::marshal (TAO_OutputCDR &)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_TypeCodeFactory[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   38,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5479),
-  ACE_NTOHL (0x7065436f),
-  ACE_NTOHL (0x64654661),
-  ACE_NTOHL (0x63746f72),
-  ACE_NTOHL (0x793a312e),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5479), 
+  ACE_NTOHL (0x7065436f), 
+  ACE_NTOHL (0x64654661), 
+  ACE_NTOHL (0x63746f72), 
+  ACE_NTOHL (0x793a312e), 
   ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/TypeCodeFactory:1.0
     16,
-  ACE_NTOHL (0x54797065),
-  ACE_NTOHL (0x436f6465),
-  ACE_NTOHL (0x46616374),
+  ACE_NTOHL (0x54797065), 
+  ACE_NTOHL (0x436f6465), 
+  ACE_NTOHL (0x46616374), 
   ACE_NTOHL (0x6f727900),  // name = TypeCodeFactory
   };
 
@@ -577,7 +219,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_TypeCodeFactory (
     sizeof (_oc_CORBA_TypeCodeFactory),
     (char *) &_oc_CORBA_TypeCodeFactory,
     0,
-    sizeof (CORBA::TypeCodeFactory)
+    0
   );
 
 namespace CORBA
@@ -603,14 +245,14 @@ ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<CORBA::TypeCodeFactory>::marshal_value (TAO_OutputCDR &)
 {
-  return 0;
+  return false;
 }
 
 ACE_TEMPLATE_SPECIALIZATION
 CORBA::Boolean
 TAO::Any_Impl_T<CORBA::TypeCodeFactory>::demarshal_value (TAO_InputCDR &)
 {
-  return 0;
+  return false;
 }
 
 // Copying insertion.
@@ -656,254 +298,10 @@ operator>>= (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1628
+// be\be_visitor_root/root.cpp:1629
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
-#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_DEFINITIONKIND__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::DefinitionKind>;
-
-  template class TAO::Basic_Arg_Traits_T<CORBA::DefinitionKind>;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINER__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_CONTAINER__ARG_TRAITS_TMPLINST_CS_
-
-  template class
-    TAO::Arg_Traits<
-        CORBA::Container
-      >;
-
-  template class
-    TAO::Object_Arg_Traits_T<
-        CORBA::Container_ptr,
-        CORBA::Container_var,
-        CORBA::Container_out,
-        TAO::Objref_Traits<CORBA::Container>
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_IDLTYPE__ARG_TRAITS_TMPLINST_CS_
-
-  template class
-    TAO::Arg_Traits<
-        CORBA::IDLType
-      >;
-
-  template class
-    TAO::Object_Arg_Traits_T<
-        CORBA::IDLType_ptr,
-        CORBA::IDLType_var,
-        CORBA::IDLType_out,
-        TAO::Objref_Traits<CORBA::IDLType>
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::InterfaceDefSeq>;
-
-  template class
-    TAO::Var_Size_Arg_Traits_T<
-        CORBA::InterfaceDefSeq,
-        CORBA::InterfaceDefSeq_var,
-        CORBA::InterfaceDefSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_VALUEDEF__ARG_TRAITS_TMPLINST_CS_
-
-  template class
-    TAO::Arg_Traits<
-        CORBA::ValueDef
-      >;
-
-  template class
-    TAO::Object_Arg_Traits_T<
-        CORBA::ValueDef_ptr,
-        CORBA::ValueDef_var,
-        CORBA::ValueDef_out,
-        TAO::Objref_Traits<CORBA::ValueDef>
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::ValueDefSeq>;
-
-  template class
-    TAO::Var_Size_Arg_Traits_T<
-        CORBA::ValueDefSeq,
-        CORBA::ValueDefSeq_var,
-        CORBA::ValueDefSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::AbstractInterfaceDefSeq>;
-
-  template class
-    TAO::Var_Size_Arg_Traits_T<
-        CORBA::AbstractInterfaceDefSeq,
-        CORBA::AbstractInterfaceDefSeq_var,
-        CORBA::AbstractInterfaceDefSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::StructMemberSeq>;
-
-  template class
-    TAO::Var_Size_Arg_Traits_T<
-        CORBA::StructMemberSeq,
-        CORBA::StructMemberSeq_var,
-        CORBA::StructMemberSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::InitializerSeq>;
-
-  template class
-    TAO::Var_Size_Arg_Traits_T<
-        CORBA::InitializerSeq,
-        CORBA::InitializerSeq_var,
-        CORBA::InitializerSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::ExtInitializerSeq>;
-
-  template class
-    TAO::Var_Size_Arg_Traits_T<
-        CORBA::ExtInitializerSeq,
-        CORBA::ExtInitializerSeq_var,
-        CORBA::ExtInitializerSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::UnionMemberSeq>;
-
-  template class
-    TAO::Var_Size_Arg_Traits_T<
-        CORBA::UnionMemberSeq,
-        CORBA::UnionMemberSeq_var,
-        CORBA::UnionMemberSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::EnumMemberSeq>;
-
-  template class
-    TAO::Var_Size_Arg_Traits_T<
-        CORBA::EnumMemberSeq,
-        CORBA::EnumMemberSeq_var,
-        CORBA::EnumMemberSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_PRIMITIVEKIND__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_PRIMITIVEKIND__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::PrimitiveKind>;
-
-  template class TAO::Basic_Arg_Traits_T<CORBA::PrimitiveKind>;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::ExceptionDefSeq>;
-
-  template class
-    TAO::Var_Size_Arg_Traits_T<
-        CORBA::ExceptionDefSeq,
-        CORBA::ExceptionDefSeq_var,
-        CORBA::ExceptionDefSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::AttributeMode>;
-
-  template class TAO::Basic_Arg_Traits_T<CORBA::AttributeMode>;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_OPERATIONMODE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::OperationMode>;
-
-  template class TAO::Basic_Arg_Traits_T<CORBA::OperationMode>;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::ParDescriptionSeq>;
-
-  template class
-    TAO::Var_Size_Arg_Traits_T<
-        CORBA::ParDescriptionSeq,
-        CORBA::ParDescriptionSeq_var,
-        CORBA::ParDescriptionSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-  template class TAO::Arg_Traits<CORBA::ContextIdSeq>;
-
-  template class
-    TAO::Var_Size_Arg_Traits_T<
-        CORBA::ContextIdSeq,
-        CORBA::ContextIdSeq_var,
-        CORBA::ContextIdSeq_out
-      >;
-
-#endif /* end #if !defined */
-
   template class
     TAO::Objref_Traits<
         CORBA::TypeCodeFactory
@@ -913,7 +311,7 @@ operator>>= (
     TAO_Objref_Var_T<
         CORBA::TypeCodeFactory
       >;
-
+  
   template class
     TAO_Objref_Out_T<
         CORBA::TypeCodeFactory
@@ -926,250 +324,6 @@ operator>>= (
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 
-#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_DEFINITIONKIND__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::DefinitionKind>
-
-# pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::DefinitionKind>
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINER__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_CONTAINER__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate \
-    TAO::Arg_Traits< \
-        CORBA::Container \
-      >
-
-# pragma instantiate \
-    TAO::Object_Arg_Traits_T< \
-        CORBA::Container_ptr, \
-        CORBA::Container_var, \
-        CORBA::Container_out, \
-        TAO::Objref_Traits<CORBA::Container> \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_IDLTYPE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate \
-    TAO::Arg_Traits< \
-        CORBA::IDLType \
-      >
-
-# pragma instantiate \
-    TAO::Object_Arg_Traits_T< \
-        CORBA::IDLType_ptr, \
-        CORBA::IDLType_var, \
-        CORBA::IDLType_out, \
-        TAO::Objref_Traits<CORBA::IDLType> \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::InterfaceDefSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits_T< \
-        CORBA::InterfaceDefSeq, \
-        CORBA::InterfaceDefSeq_var, \
-        CORBA::InterfaceDefSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_VALUEDEF__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate \
-    TAO::Arg_Traits< \
-        CORBA::ValueDef \
-      >
-
-# pragma instantiate \
-    TAO::Object_Arg_Traits_T< \
-        CORBA::ValueDef_ptr, \
-        CORBA::ValueDef_var, \
-        CORBA::ValueDef_out, \
-        TAO::Objref_Traits<CORBA::ValueDef> \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::ValueDefSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits_T< \
-        CORBA::ValueDefSeq, \
-        CORBA::ValueDefSeq_var, \
-        CORBA::ValueDefSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::AbstractInterfaceDefSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits_T< \
-        CORBA::AbstractInterfaceDefSeq, \
-        CORBA::AbstractInterfaceDefSeq_var, \
-        CORBA::AbstractInterfaceDefSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::StructMemberSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits_T< \
-        CORBA::StructMemberSeq, \
-        CORBA::StructMemberSeq_var, \
-        CORBA::StructMemberSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::InitializerSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits_T< \
-        CORBA::InitializerSeq, \
-        CORBA::InitializerSeq_var, \
-        CORBA::InitializerSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::ExtInitializerSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits_T< \
-        CORBA::ExtInitializerSeq, \
-        CORBA::ExtInitializerSeq_var, \
-        CORBA::ExtInitializerSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::UnionMemberSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits_T< \
-        CORBA::UnionMemberSeq, \
-        CORBA::UnionMemberSeq_var, \
-        CORBA::UnionMemberSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::EnumMemberSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits_T< \
-        CORBA::EnumMemberSeq, \
-        CORBA::EnumMemberSeq_var, \
-        CORBA::EnumMemberSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_PRIMITIVEKIND__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_PRIMITIVEKIND__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::PrimitiveKind>
-
-# pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::PrimitiveKind>
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::ExceptionDefSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits_T< \
-        CORBA::ExceptionDefSeq, \
-        CORBA::ExceptionDefSeq_var, \
-        CORBA::ExceptionDefSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::AttributeMode>
-
-# pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::AttributeMode>
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_OPERATIONMODE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::OperationMode>
-
-# pragma instantiate TAO::Basic_Arg_Traits_T<CORBA::OperationMode>
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::ParDescriptionSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits_T< \
-        CORBA::ParDescriptionSeq, \
-        CORBA::ParDescriptionSeq_var, \
-        CORBA::ParDescriptionSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_)
-#define _CORBA_SEQUENCE__ARG_TRAITS_TMPLINST_CS_
-
-# pragma instantiate TAO::Arg_Traits<CORBA::ContextIdSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_Arg_Traits_T< \
-        CORBA::ContextIdSeq, \
-        CORBA::ContextIdSeq_var, \
-        CORBA::ContextIdSeq_out \
-      >
-
-#endif /* end #if !defined */
-
 # pragma instantiate \
     TAO::Objref_Traits< \
         CORBA::TypeCodeFactory \
@@ -1179,7 +333,7 @@ operator>>= (
     TAO_Objref_Var_T< \
         CORBA::TypeCodeFactory
       >
-
+  
 # pragma instantiate \
     TAO_Objref_Out_T< \
         CORBA::TypeCodeFactory
@@ -1190,4 +344,4 @@ operator>>= (
         CORBA::TypeCodeFactory \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
index 9c179ba0312..5f5ca440e56 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
@@ -26,20 +26,23 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:171
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_TYPECODEFACTORYC_H_
 #define _TAO_IDL_ORIG_TYPECODEFACTORYC_H_
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ORB.h"
+
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "typecodefactory_export.h"
+#include "tao/ORB.h"
+#include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
 #include "tao/Typecode.h"
@@ -60,9 +63,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -70,13 +71,13 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from
-// be\be_visitor_root/root_ch.cpp:63
+// TAO_IDL - Generated from 
+// be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
 {
   class Collocation_Proxy_Broker;
-
+  
   template<typename T> class Narrow_Utils;
   template<typename T> class AbstractBase_Narrow_Utils;
 }
@@ -86,22 +87,22 @@ namespace TAO
 
 namespace CORBA
 {
-
+  
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:611
+  // be\be_interface.cpp:598
 
 #if !defined (_CORBA_TYPECODEFACTORY__VAR_OUT_CH_)
 #define _CORBA_TYPECODEFACTORY__VAR_OUT_CH_
-
+  
   class TypeCodeFactory;
   typedef TypeCodeFactory *TypeCodeFactory_ptr;
-
+  
   typedef
     TAO_Objref_Var_T<
         TypeCodeFactory
       >
     TypeCodeFactory_var;
-
+  
   typedef
     TAO_Objref_Out_T<
         TypeCodeFactory
@@ -109,109 +110,109 @@ namespace CORBA
     TypeCodeFactory_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_TYPECODEFACTORY_CH_)
 #define _CORBA_TYPECODEFACTORY_CH_
-
+  
   class TAO_TypeCodeFactory_Export TypeCodeFactory
     : public virtual CORBA::Object
   {
   public:
     typedef TypeCodeFactory_ptr _ptr_type;
     typedef TypeCodeFactory_var _var_type;
-
+    
     // The static operations.
     static TypeCodeFactory_ptr _duplicate (TypeCodeFactory_ptr obj);
-
+    
     static TypeCodeFactory_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TypeCodeFactory_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-
+    
     static TypeCodeFactory_ptr _nil (void)
     {
-      return (TypeCodeFactory_ptr)0;
+      return static_cast<TypeCodeFactory_ptr> (0);
     }
-
+    
     static void _tao_any_destructor (void *);
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_struct_tc (
         const char * id,
         const char * name,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_union_tc (
         const char * id,
         const char * name,
-        CORBA::TypeCode_ptr discriminator_type,
-        const CORBA::UnionMemberSeq & members
+        ::CORBA::TypeCode_ptr discriminator_type,
+        const ::CORBA::UnionMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_enum_tc (
         const char * id,
         const char * name,
-        const CORBA::EnumMemberSeq & members
+        const ::CORBA::EnumMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_alias_tc (
         const char * id,
         const char * name,
-        CORBA::TypeCode_ptr original_type
+        ::CORBA::TypeCode_ptr original_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_exception_tc (
         const char * id,
         const char * name,
-        const CORBA::StructMemberSeq & members
+        const ::CORBA::StructMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_interface_tc (
         const char * id,
         const char * name
@@ -220,96 +221,96 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_string_tc (
-        CORBA::ULong bound
+        ::CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_wstring_tc (
-        CORBA::ULong bound
+        ::CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_fixed_tc (
-        CORBA::UShort digits,
-        CORBA::UShort scale
+        ::CORBA::UShort digits,
+        ::CORBA::UShort scale
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_sequence_tc (
-        CORBA::ULong bound,
-        CORBA::TypeCode_ptr element_type
+        ::CORBA::ULong bound,
+        ::CORBA::TypeCode_ptr element_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_array_tc (
-        CORBA::ULong length,
-        CORBA::TypeCode_ptr element_type
+        ::CORBA::ULong length,
+        ::CORBA::TypeCode_ptr element_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_value_tc (
         const char * id,
         const char * name,
-        CORBA::ValueModifier type_modifier,
-        CORBA::TypeCode_ptr concrete_base,
-        const CORBA::ValueMemberSeq & members
+        ::CORBA::ValueModifier type_modifier,
+        ::CORBA::TypeCode_ptr concrete_base,
+        const ::CORBA::ValueMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_value_box_tc (
         const char * id,
         const char * name,
-        CORBA::TypeCode_ptr boxed_type
+        ::CORBA::TypeCode_ptr boxed_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_native_tc (
         const char * id,
         const char * name
@@ -318,10 +319,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_recursive_tc (
         const char * id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -329,10 +330,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_abstract_interface_tc (
         const char * id,
         const char * name
@@ -341,10 +342,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_local_interface_tc (
         const char * id,
         const char * name
@@ -353,10 +354,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_component_tc (
         const char * id,
         const char * name
@@ -365,10 +366,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_home_tc (
         const char * id,
         const char * name
@@ -377,51 +378,51 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-
+    
     virtual CORBA::TypeCode_ptr create_event_tc (
         const char * id,
         const char * name,
-        CORBA::ValueModifier type_modifier,
-        CORBA::TypeCode_ptr concrete_base,
-        const CORBA::ValueMemberSeq & members
+        ::CORBA::ValueModifier type_modifier,
+        ::CORBA::TypeCode_ptr concrete_base,
+        const ::CORBA::ValueMemberSeq & members
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-
+    
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:208
-
+    
     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:
     // Abstract or local interface only.
     TypeCodeFactory (void);
-
+    
     virtual ~TypeCodeFactory (void);
-
+  
   private:
     // Private and unimplemented for concrete interfaces.
     TypeCodeFactory (const TypeCodeFactory &);
-
+    
     void operator= (const TypeCodeFactory &);
   };
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TypeCodeFactory;
 
 // TAO_IDL - Generated from
@@ -438,19 +439,19 @@ namespace TAO
 
 #if !defined (_CORBA_TYPECODEFACTORY__TRAITS_CH_)
 #define _CORBA_TYPECODEFACTORY__TRAITS_CH_
-
+  
   ACE_TEMPLATE_SPECIALIZATION
-  struct TAO_TypeCodeFactory_Export Objref_Traits<CORBA::TypeCodeFactory>
+  struct TAO_TypeCodeFactory_Export Objref_Traits< ::CORBA::TypeCodeFactory>
   {
-    static CORBA::TypeCodeFactory_ptr duplicate (
-        CORBA::TypeCodeFactory_ptr
+    static ::CORBA::TypeCodeFactory_ptr duplicate (
+        ::CORBA::TypeCodeFactory_ptr
       );
     static void release (
-        CORBA::TypeCodeFactory_ptr
+        ::CORBA::TypeCodeFactory_ptr
       );
-    static CORBA::TypeCodeFactory_ptr nil (void);
+    static ::CORBA::TypeCodeFactory_ptr nil (void);
     static CORBA::Boolean marshal (
-        CORBA::TypeCodeFactory_ptr p,
+        ::CORBA::TypeCodeFactory_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -466,13 +467,13 @@ TAO_TypeCodeFactory_Export void operator<<= (CORBA::Any &, CORBA::TypeCodeFactor
 TAO_TypeCodeFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::TypeCodeFactory_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:978
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "TypeCodeFactoryC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
@@ -483,3 +484,5 @@ TAO_TypeCodeFactory_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
+
+
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl
index 38aa32569ba..c944d806c1f 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.inl
@@ -25,4 +25,3 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
index d5c7725b71d..c43c9e17de5 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
@@ -433,7 +433,7 @@ TAO_TypeCodeFactory_i::create_fixed_tc (
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE,
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (TAO::VMCID,
                                          CORBA::COMPLETED_NO),
                     CORBA::TypeCode::_nil ());
 }
@@ -774,12 +774,12 @@ TAO_TypeCodeFactory_i::compute_default_label (
             {
               TAO::Any_Impl *impl = members[i].label.impl ();
               TAO_InputCDR for_reading (static_cast<ACE_Message_Block *> (0));
-              
+
               if (impl->encoded ())
                 {
                   TAO::Unknown_IDL_Type *unk =
                     dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-                    
+
                   // We don't want unk's rd_ptr to move, in case
                   // we are shared by another Any, so we use this
                   // to copy the state, not the buffer.
@@ -792,7 +792,7 @@ TAO_TypeCodeFactory_i::compute_default_label (
                   TAO_InputCDR tmp (out);
                   for_reading = tmp;
                 }
-                
+
               for_reading.read_ulong (u.enum_val);
 
               if (u.enum_val == dv.enum_val)
@@ -1448,12 +1448,12 @@ TAO_TypeCodeFactory_i::unique_label_values (const CORBA::UnionMemberSeq &members
             {
               TAO::Any_Impl *impl = members[i].label.impl ();
               TAO_InputCDR for_reading (static_cast<ACE_Message_Block *> (0));
-              
+
               if (impl->encoded ())
                 {
                   TAO::Unknown_IDL_Type *unk =
                     dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-                    
+
                   // We don't want unk's rd_ptr to move, in case
                   // we are shared by another Any, so we use this
                   // to copy the state, not the buffer.
@@ -1466,7 +1466,7 @@ TAO_TypeCodeFactory_i::unique_label_values (const CORBA::UnionMemberSeq &members
                   TAO_InputCDR tmp (out);
                   for_reading = tmp;
                 }
-                
+
               for_reading.read_ulong (s.enum_val);
 
               if (checker.insert (s.enum_val) != 0)
diff --git a/TAO/tao/TypeCodeFactory_Adapter.h b/TAO/tao/TypeCodeFactory_Adapter.h
index f7732120b18..776521743d9 100644
--- a/TAO/tao/TypeCodeFactory_Adapter.h
+++ b/TAO/tao/TypeCodeFactory_Adapter.h
@@ -21,8 +21,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/SystemException.h"
-#include "tao/OBV_Constants.h"
-#include "tao/default_environment.h"
+#include "tao/Environment.h"
+#include "tao/ValueModifierC.h"
 
 namespace CORBA
 {
diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp
index 680ae5f94b6..86bd9cc8dae 100644
--- a/TAO/tao/Typecode.cpp
+++ b/TAO/tao/Typecode.cpp
@@ -22,6 +22,7 @@
 #include "ORB_Constants.h"
 #include "SystemException.h"
 #include "orb_typesC.h"
+#include "ValueModifierC.h"
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
     || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
@@ -55,12 +56,7 @@ CORBA::TypeCode::Bounds::Bounds (void)
 CORBA::TypeCode::Bounds*
 CORBA::TypeCode::Bounds::_downcast (CORBA::Exception *ex)
 {
-  if (ex->_is_a ("IDL:omg.org/CORBA/TypeCode/Bounds:1.0"))
-    {
-      return ACE_dynamic_cast (CORBA::TypeCode::Bounds*, ex);
-    }
-
-  return 0;
+   return dynamic_cast <CORBA::TypeCode::Bounds*> (ex);
 }
 
 CORBA::Exception *
@@ -116,9 +112,7 @@ CORBA::TypeCode::BadKind::BadKind (void)
 CORBA::TypeCode::BadKind*
 CORBA::TypeCode::BadKind::_downcast (CORBA::Exception *ex)
 {
-  if (ex->_is_a ("IDL:omg.org/CORBA/TypeCode/BadKind:1.0"))
-    return ACE_dynamic_cast (CORBA::TypeCode::BadKind*, ex);
-  return 0;
+  return dynamic_cast <CORBA::TypeCode::BadKind*> (ex);
 }
 
 CORBA::Exception *
@@ -236,8 +230,7 @@ CORBA::TypeCode::TypeCode (CORBA::TCKind kind,
       // @@ The typecode buffer contain the encapsulation byte order
       // in the first byte...
       const CORBA::Octet *ptr =
-        ACE_reinterpret_cast (const CORBA::Octet *,
-                              buffer);
+        reinterpret_cast <const CORBA::Octet *> (buffer);
       this->byte_order_ = *ptr;
 
       // allocate a buffer which will accomodate our entire encapsulation
@@ -255,7 +248,7 @@ CORBA::TypeCode::TypeCode (CORBA::TCKind kind,
       // length_ is of size_t which, on 64-bit platforms, is 64 bits.
       // The value to be copied is expected to be 32-bit.  We will cast
       // the value down to a CORBA::ULong and copy that.
-      CORBA::ULong length = ACE_static_cast (CORBA::ULong, this->length_);
+      CORBA::ULong length = static_cast <CORBA::ULong> (this->length_);
 
       (void) ACE_OS::memcpy (start, &this->kind_, lsize);
       (void) ACE_OS::memcpy (start + lsize, &length, lsize);
@@ -274,7 +267,7 @@ CORBA::TypeCode::TypeCode (CORBA::TCKind kind,
       // with our parent. We know that our parent's buffer was
       // properly aligned.
       const CORBA::Octet *ptr =
-        ACE_reinterpret_cast (const CORBA::Octet *, buffer);
+        reinterpret_cast <const CORBA::Octet *> (buffer);
       this->byte_order_ = *ptr;
 
       this->buffer_ = buffer;
@@ -853,8 +846,7 @@ CORBA::TypeCode::equ_common (CORBA::TypeCode_ptr tc,
   if (equiv_only)
     {
       CORBA::TypeCode_var rcvr =
-        CORBA::TypeCode::_duplicate (ACE_const_cast (CORBA::TypeCode *,
-                                                     this));
+        CORBA::TypeCode::_duplicate (const_cast <CORBA::TypeCode *> (this));
 
       CORBA::Boolean status = (this->kind_ == CORBA::tk_alias);
 
@@ -875,8 +867,7 @@ CORBA::TypeCode::equ_common (CORBA::TypeCode_ptr tc,
       // Added by Bala to check for leaks as content_type duplicates the
       // pointers
       CORBA::TypeCode_var tcvar =
-        CORBA::TypeCode::_duplicate (ACE_const_cast (CORBA::TypeCode *,
-                                                     tc));
+        CORBA::TypeCode::_duplicate (const_cast <CORBA::TypeCode *> (tc));
 
       while (status)
         {
@@ -1899,7 +1890,7 @@ CORBA::TypeCode::private_id (ACE_ENV_SINGLE_ARG_DECL) const
           }
 
         this->private_state_->tc_id_known_ = 1;
-        this->private_state_->tc_id_ = (ACE_const_cast (char *, buffer_)
+        this->private_state_->tc_id_ = (const_cast <char *> (buffer_)
                                         + 4    // skip byte order
                                         // flag and padding
                                         + 4);  // skip (strlen + 1)
@@ -2068,8 +2059,7 @@ CORBA::TypeCode::private_member_count (ACE_ENV_SINGLE_ARG_DECL) const
                               0);
           }
 
-        tc_kind = ACE_static_cast (CORBA::TCKind,
-                                   tc_kind_holder);
+        tc_kind = static_cast <CORBA::TCKind> (tc_kind_holder);
 
         // The tc_kind can be either tk_null or tk_value.
         // In the latter case we should skip encapsulation or
@@ -2320,7 +2310,7 @@ CORBA::TypeCode::private_member_type (CORBA::ULong slot
                             CORBA::TypeCode::_nil ());
         }
 
-      tc_kind = ACE_static_cast (CORBA::TCKind, tc_kind_holder);
+      tc_kind = static_cast <CORBA::TCKind> (tc_kind_holder);
 
       // The tc_kind can be either tk_null or tk_value.
       // In the latter case we should skip encapsulation or
@@ -2590,7 +2580,7 @@ CORBA::TypeCode::private_member_name (CORBA::ULong slot
                               0);
           }
 
-        tc_kind = ACE_static_cast (CORBA::TCKind, tc_kind_holder);
+        tc_kind = static_cast <CORBA::TCKind> (tc_kind_holder);
 
         // The tc_kind can be either tk_null or tk_value.
         // In the latter case we should skip encapsulation or
@@ -2768,9 +2758,8 @@ CORBA::TypeCode::private_member_label (CORBA::ULong n
       CORBA::TypeCode_ptr label_tc;
 
       const CORBA::ULong slot =
-        ACE_static_cast (
-          CORBA::ULong,
-          this->private_default_index_i (ACE_ENV_SINGLE_ARG_PARAMETER));
+        static_cast <CORBA::ULong>
+          (this->private_default_index_i (ACE_ENV_SINGLE_ARG_PARAMETER));
       ACE_CHECK_RETURN (0);
 
       // If we are computing the label for the default index,
@@ -2779,7 +2768,7 @@ CORBA::TypeCode::private_member_label (CORBA::ULong n
         {
           label_tc = CORBA::_tc_octet;
 
-          if (out.write_octet (ACE_static_cast (CORBA::Octet, 0)) == 0)
+          if (out.write_octet (static_cast <CORBA::Octet> (0)) == 0)
             {
               return 0;
             }
@@ -3407,7 +3396,7 @@ CORBA::TypeCode::_tao_decode (const CORBA::TypeCode *parent,
                                 // @@ TODO
                                 // Here we lose the parent
                                 // typecode...
-                                ACE_const_cast(CORBA::TypeCode*,parent)));
+                                const_cast <CORBA::TypeCode*> (parent)));
       return;
     }
 
@@ -3455,12 +3444,12 @@ CORBA::TypeCode::_tao_decode (const CORBA::TypeCode *parent,
             CORBA::Long _oc_bounded_string [] =
             {TAO_ENCAP_BYTE_ORDER, 0};
             // Bounded string. Save the bounds
-            _oc_bounded_string [1] = (CORBA::Long) bound;
+            _oc_bounded_string [1] = static_cast <CORBA::Long> (bound);
             ACE_NEW (x,
                      CORBA::TypeCode (
-                        ACE_static_cast(CORBA::TCKind, kind),
+                        static_cast <CORBA::TCKind> (kind),
                         8,
-                        ACE_reinterpret_cast(char*,_oc_bounded_string),
+                        reinterpret_cast <char*> (_oc_bounded_string),
                         0,
                         sizeof (CORBA::String_var),
                         0
@@ -3510,7 +3499,7 @@ CORBA::TypeCode::_tao_decode (const CORBA::TypeCode *parent,
                                   cdr.rd_ptr (),
                                   0,
                                   0,
-                                  ACE_const_cast (CORBA::TypeCode*,parent)));
+                                  const_cast <CORBA::TypeCode*> (parent)));
         // skip length number of bytes in the stream, otherwise we may
         // leave the stream in an undefined state
         (void) cdr.skip_bytes (length);
@@ -3546,7 +3535,7 @@ CORBA::TypeCode::unalias (ACE_ENV_SINGLE_ARG_DECL)
 void
 CORBA::TypeCode::_tao_any_destructor (void *x)
 {
-  CORBA::TypeCode_ptr tmp = ACE_static_cast (CORBA::TypeCode_ptr, x);
+  CORBA::TypeCode_ptr tmp = static_cast <CORBA::TypeCode_ptr> (x);
   CORBA::release (tmp);
 }
 
@@ -3764,9 +3753,9 @@ operator<< (TAO_OutputCDR& cdr, const CORBA::TypeCode *x)
     case CORBA::tk_home:
     case CORBA::tk_event:
       {
-        CORBA::ULong xlen = ACE_static_cast (CORBA::ULong, x->length_);
+        CORBA::ULong xlen = static_cast <CORBA::ULong> (x->length_);
         if (!cdr.write_ulong (xlen)
-            || !cdr.write_octet_array ((CORBA::Octet*)x->buffer_,
+            || !cdr.write_octet_array ((CORBA::Octet*) x->buffer_,
                                        xlen))
           {
             return 0;
diff --git a/TAO/tao/Typecode.h b/TAO/tao/Typecode.h
index 6a639b38ccb..2742445fa66 100644
--- a/TAO/tao/Typecode.h
+++ b/TAO/tao/Typecode.h
@@ -34,7 +34,7 @@
 #include "tao/Object_Argument_T.h"
 #include "tao/Arg_Traits_T.h"
 #include "tao/TC_Constants_Forward.h"
-#include "tao/OBV_Constants.h"
+#include "tao/VisibilityC.h"
 #include "tao/CORBA_methods.h"
 #include "tao/Sequence_T.h"
 #include "tao/Typecode_typesC.h"
diff --git a/TAO/tao/Typecode_Constants.cpp b/TAO/tao/Typecode_Constants.cpp
index 021f2815601..57d20d38389 100644
--- a/TAO/tao/Typecode_Constants.cpp
+++ b/TAO/tao/Typecode_Constants.cpp
@@ -93,10 +93,6 @@ namespace CORBA
   TypeCode_ptr CORBA::TypeCode::_tc_BadKind = 0;
   TypeCode_ptr  _tc_exception_type = 0;
 
-  // Some more typecodes in the CORBA namespace. We keep adding
-  // to this list as we find more and more things being introduced
-  // to the CORBA namespace.
-
 #if (TAO_HAS_MINIMUM_CORBA == 0)
      TypeCode_ptr  _tc_NamedValue = 0;
 #endif /* TAO_HAS_MINIMUM_CORBA */
diff --git a/TAO/tao/Typecode_typesC.cpp b/TAO/tao/Typecode_typesC.cpp
index 4b24fdc68a2..c1415e9f01b 100644
--- a/TAO/tao/Typecode_typesC.cpp
+++ b/TAO/tao/Typecode_typesC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:301
+// be\be_codegen.cpp:302
 
 
 #include "Typecode_typesC.h"
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
diff --git a/TAO/tao/Typecode_typesC.h b/TAO/tao/Typecode_typesC.h
index 41d16a38444..ac765cc7218 100644
--- a/TAO/tao/Typecode_typesC.h
+++ b/TAO/tao/Typecode_typesC.h
@@ -71,6 +71,10 @@
 
 namespace CORBA
 {
+
+  // TAO_IDL - Generated from
+  // be\be_interface.cpp:598
+
   // TAO_IDL - Generated from
   // be\be_visitor_enum/enum_ch.cpp:57
 
@@ -142,7 +146,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::TCKind &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TCKind &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:958
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "Typecode_typesC.inl"
diff --git a/TAO/tao/ULongLongSeqC.cpp b/TAO/tao/ULongLongSeqC.cpp
index b536857964e..c3fe583ee53 100644
--- a/TAO/tao/ULongLongSeqC.cpp
+++ b/TAO/tao/ULongLongSeqC.cpp
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -121,7 +121,7 @@ CORBA::Boolean operator<< (
       return strm.write_ulonglong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -138,7 +138,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -147,7 +147,7 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
@@ -155,7 +155,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ULongLongSeq_CPP_ */
diff --git a/TAO/tao/ULongSeqC.cpp b/TAO/tao/ULongSeqC.cpp
index 9d8b43281e3..2c2fcc733b6 100644
--- a/TAO/tao/ULongSeqC.cpp
+++ b/TAO/tao/ULongSeqC.cpp
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -121,7 +121,7 @@ CORBA::Boolean operator<< (
       return strm.write_ulong_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -138,7 +138,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -147,7 +147,7 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
@@ -155,7 +155,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_ULongSeq_CPP_ */
diff --git a/TAO/tao/UShortSeqC.cpp b/TAO/tao/UShortSeqC.cpp
index f3cf5dcfc09..92565b8ebf5 100644
--- a/TAO/tao/UShortSeqC.cpp
+++ b/TAO/tao/UShortSeqC.cpp
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -121,7 +121,7 @@ CORBA::Boolean operator<< (
       return strm.write_ushort_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -138,7 +138,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -147,7 +147,7 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
@@ -155,7 +155,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_UShortSeq_CPP_ */
diff --git a/TAO/tao/Utils.mpc b/TAO/tao/Utils.mpc
index fa0b92d3964..423012a91c9 100644
--- a/TAO/tao/Utils.mpc
+++ b/TAO/tao/Utils.mpc
@@ -1,4 +1,4 @@
-//$Id$
+// $Id$
 project : taolib, core, portableserver {
   sharedname    = TAO_Utils
   dynamicflags  = TAO_UTILS_BUILD_DLL
@@ -9,7 +9,6 @@ project : taolib, core, portableserver {
 
   Header_Files {
     Utils
-//    Auto_Functor.h
   }
 
   Inline_Files {
@@ -18,9 +17,6 @@ project : taolib, core, portableserver {
 
   Template_Files {
     Utils
-//    RIR_Narrow.cpp
-//    Servant_Var.cpp
-//    Server_Main.cpp
   }
 
   Resource_Files {
diff --git a/TAO/tao/PortableServer/ORB_Manager.cpp b/TAO/tao/Utils/ORB_Manager.cpp
index 8df8245970d..08618700659 100644
--- a/TAO/tao/PortableServer/ORB_Manager.cpp
+++ b/TAO/tao/Utils/ORB_Manager.cpp
@@ -12,12 +12,16 @@
 
 #include "ORB_Manager.h"
 
+#include "tao/PortableServer/POAManagerC.h"
+#include "tao/PortableServer/IdAssignmentPolicyC.h"
+#include "tao/PortableServer/LifespanPolicyC.h"
+
 #include "tao/Environment.h"
 #include "tao/ORBInitializer_Registry.h"
 
 #include "ace/Log_Msg.h"
 
-ACE_RCSID (tao,
+ACE_RCSID (PortableServer,
            ORB_Manager,
            "$Id$")
 
diff --git a/TAO/tao/PortableServer/ORB_Manager.h b/TAO/tao/Utils/ORB_Manager.h
index e8124acb59d..a181e1c5d12 100644
--- a/TAO/tao/PortableServer/ORB_Manager.h
+++ b/TAO/tao/Utils/ORB_Manager.h
@@ -14,7 +14,8 @@
 #define TAO_ORB_MANAGER_H
 #include /**/ "ace/pre.h"
 
-#include "PortableServer.h"
+#include "utils_export.h"
+#include "tao/PortableServer/PortableServer.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,7 +33,7 @@
  * CORBA applications.  It's just a wrapper and doesn't do
  * anything special within the ORB itself.
  */
-class TAO_PortableServer_Export TAO_ORB_Manager
+class TAO_UTILS_Export TAO_ORB_Manager
 {
 public:
   // = Initialization and termination methods.
@@ -56,20 +57,24 @@ public:
                    PortableServer::POA_ptr poa = 0,
                    PortableServer::POAManager_ptr poa_manager = 0);
 
-  /** Initialize the ORB/root POA, using the supplied command line
-   *  arguments or the default ORB components.
+  /**
+   * Initialize the ORB/root POA, using the supplied command line
+   * arguments or the default ORB components.
    *
-   *  @return -1 on failure, 0 on success
+   * @retval -1 Failure
+   * @retval 0 Success
    */
   int init (int &argc,
             char *argv[]
             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  /** Initialize the ORB/root POA, using the supplied command line
-    * arguments or the default ORB components.
-    *
-    * @return -1 on failure, 0 on success
-    */
+  /**
+   * Initialize the ORB/root POA, using the supplied command line
+   * arguments or the default ORB components.
+   *
+   * @retval -1 Failure
+   * @retval 0 Success
+   */
   int init (int &argc,
             char *argv[],
             const char *orb_name
@@ -77,10 +82,11 @@ public:
 
   /**
    * Creates a child poa under the root poa with PERSISTENT and
-   * USER_ID policies.  Call this if you want a <child_poa> with the
+   * USER_ID policies.  Call this if you want a @c child_poa with the
    * above policies, otherwise call init.
    *
-   * @return -1 on failure, 0 on success
+   * @retval -1 Failure
+   * @retval 0 Success
    */
   int init_child_poa (int &argc,
                       char *argv[],
@@ -89,8 +95,11 @@ public:
 
   /**
    * Creates a child poa under the root poa with PERSISTENT and
-   * USER_ID policies.  Call this if you want a <child_poa> with the
-   * above policies, otherwise call init.  Returns -1 on failure.
+   * USER_ID policies.  Call this if you want a @a child_poa with the
+   * above policies, otherwise call init.
+   *
+   * @retval -1 Failure
+   * @retval 0 Success
    */
   int init_child_poa (int &argc,
                       char *argv[],
@@ -98,9 +107,11 @@ public:
                       const char *orb_name
                       ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  /** Shut down.  Invoke the destroy() methods on the orb and poa.
+  /**
+   * Shut down.  Invoke the destroy() methods on the orb and poa.
    *
-   * @return -1 on failure, 0 on success
+   * @retval -1 Failure
+   * @retval 0 Success
    */
   int fini (ACE_ENV_SINGLE_ARG_DECL);
 
@@ -116,7 +127,8 @@ public:
    *  service incoming requests while waiting for a result of CORBA
    *  call on a server.
    *
-   *  @return -1 on failure, 0 on success
+   * @retval -1 Failure
+   * @retval 0 Success
    */
   int activate_poa_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
@@ -133,7 +145,7 @@ public:
 
   /** Deactivate object in RootPOA.
    *
-   *  @param id  a string representation of the Object ID
+   *  @param id  A string representation of the Object ID
    *             of the servant to deactivate in the POA
    */
   void deactivate (const char *id
@@ -157,21 +169,28 @@ public:
                                   PortableServer::Servant servant
                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  /** Deactivate object in child POA.
+  /**
+   * Deactivate object in child POA.
    *
-   *  @param id  string representation of the object ID, which represents
-   *             the object to deactivate in the POA
+   * @param id  string representation of the object ID, which represents
+   *            the object to deactivate in the POA
    */
   void deactivate_under_child_poa (const char *id
                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
-  /** Run the ORB event loop with the specified <tv> time value.
+  /**
+   * Run the ORB event loop with the specified @a tv time value.
    *
    * @param tv  the time interval for how long to run the ORB event loop.
-   * @return -1 on failure, 0 on success
+   * @retval -1 Failure
+   * @retval 0 Success
    */
   int run (ACE_Time_Value &tv
            ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+
+  /**
+   * Run the ORB event loop.
+   */
   int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
   /**
@@ -180,8 +199,8 @@ public:
    * this function duplicates the orb return value before returning
    * it.
    *
-   * @return orb  ORB pointer which has been duplicated, so caller
-   *              must release pointer when done.
+   * @return ORB pointer which has been duplicated, so caller
+   *         must release pointer when done.
    */
   CORBA::ORB_ptr orb (void);
 
@@ -190,8 +209,8 @@ public:
    * memory management rules of return values from functions, this
    * function duplicates the poa return value before returning it.
    *
-   * @return poa  Root POA pointer which has been duplicated.  Caller
-   *              must release pointer when done.
+   * @return Root POA pointer which has been duplicated.  Caller
+   *         must release pointer when done.
    */
   PortableServer::POA_ptr root_poa (void);
 
diff --git a/TAO/tao/ValueModifier.pidl b/TAO/tao/ValueModifier.pidl
new file mode 100644
index 00000000000..b20683cc279
--- /dev/null
+++ b/TAO/tao/ValueModifier.pidl
@@ -0,0 +1,36 @@
+// -*- IDL -*-
+
+// ================================================================
+/**
+ *  @file   ValueModifier.pidl
+ *
+ * $Id$
+ *
+ *   This file was used to generate the code in ValueModifierC.* The command
+ *   used to generate code is:
+ *
+ *     tao_idl
+ *        -o orig -Ge 1 -GT -Sc -St
+ *          -Wb,export_macro=TAO_Export
+ *          -Wb,export_include="tao/TAO_Export.h"
+ *          -Wb,pre_include="ace/pre.h"
+ *          -Wb,post_include="ace/post.h"
+ *          ValueModifier.pidl
+ */
+// ================================================================
+
+#ifndef TAO_VALUEMODIFIER_PIDL
+#define TAO_VALUEMODIFIER_PIDL
+
+#pragma prefix "omg.org"
+
+module CORBA
+{
+  typedef short ValueModifier;
+  const ValueModifier VM_NONE = 0;
+  const ValueModifier VM_CUSTOM = 1;
+  const ValueModifier VM_ABSTRACT = 2;
+  const ValueModifier VM_TRUNCATABLE = 3;
+};
+
+#endif /* TAO_VALUEMODIFIER_PIDL */
diff --git a/TAO/tao/IOP_IORC.i b/TAO/tao/ValueModifierC.cpp
index 38aa32569ba..d4d13c2af5e 100644
--- a/TAO/tao/IOP_IORC.i
+++ b/TAO/tao/ValueModifierC.cpp
@@ -25,4 +25,26 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:302
+
+
+#include "ValueModifierC.h"
+#include "tao/CDR.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if !defined (__ACE_INLINE__)
+#include "ValueModifierC.inl"
+#endif /* !defined INLINE */
+
+// TAO_IDL - Generated from
+// be\be_visitor_arg_traits.cpp:66
+
+// Arg traits specializations.
+namespace TAO
+{
+}
 
diff --git a/TAO/tao/ValueModifierC.h b/TAO/tao/ValueModifierC.h
new file mode 100644
index 00000000000..7ac3eef1821
--- /dev/null
+++ b/TAO/tao/ValueModifierC.h
@@ -0,0 +1,132 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:153
+
+#ifndef _TAO_IDL_ORIG_VALUEMODIFIERC_H_
+#define _TAO_IDL_ORIG_VALUEMODIFIERC_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/TAO_Export.h"
+#include "tao/ORB.h"
+#include "tao/Environment.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#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
+
+namespace CORBA
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typedef/typedef_ch.cpp:379
+  
+  typedef CORBA::Short ValueModifier;
+  typedef CORBA::Short_out ValueModifier_out;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ValueModifier VM_NONE = 0;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ValueModifier VM_CUSTOM = 1;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ValueModifier VM_ABSTRACT = 2;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::ValueModifier VM_TRUNCATABLE = 3;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:66
+
+} // module CORBA
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:59
+
+// Traits specializations.
+namespace TAO
+{
+}
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:961
+
+#if defined (__ACE_INLINE__)
+#include "ValueModifierC.inl"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/ValueModifierC.inl b/TAO/tao/ValueModifierC.inl
new file mode 100644
index 00000000000..c944d806c1f
--- /dev/null
+++ b/TAO/tao/ValueModifierC.inl
@@ -0,0 +1,27 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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/ValueModifierS.h b/TAO/tao/ValueModifierS.h
new file mode 100644
index 00000000000..7b3f0169c84
--- /dev/null
+++ b/TAO/tao/ValueModifierS.h
@@ -0,0 +1,77 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:390
+
+#ifndef _TAO_IDL_ORIG_VALUEMODIFIERS_H_
+#define _TAO_IDL_ORIG_VALUEMODIFIERS_H_
+
+#include /**/ "ace/pre.h"
+
+#include "ValueModifierC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:49
+
+namespace POA_CORBA
+{
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:80
+
+} // module CORBA
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:997
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/Visibility.pidl b/TAO/tao/Visibility.pidl
new file mode 100644
index 00000000000..57d78505646
--- /dev/null
+++ b/TAO/tao/Visibility.pidl
@@ -0,0 +1,34 @@
+// -*- IDL -*-
+
+// ================================================================
+/**
+ *  @file   Visibility.pidl
+ *
+ * $Id$
+ *
+ *   This file was used to generate the code in VisibiltyC.* The command
+ *   used to generate code is:
+ *
+ *     tao_idl
+ *        -o orig -Ge 1 -GT -Sc -St
+ *          -Wb,export_macro=TAO_Export
+ *          -Wb,export_include="tao/TAO_Export.h"
+ *          -Wb,pre_include="ace/pre.h"
+ *          -Wb,post_include="ace/post.h"
+ *          Visibilty.pidl
+ */
+// ================================================================
+
+#ifndef TAO_VISIBILITY_PIDL
+#define TAO_VISIBILITY_PIDL
+
+#pragma prefix "omg.org"
+
+module CORBA
+{
+  typedef short Visibility;
+  const Visibility PRIVATE_MEMBER = 0;
+  const Visibility PUBLIC_MEMBER = 1;
+};
+
+#endif /* TAO_VISIBILITY_PIDL */
diff --git a/TAO/tao/IOP_CodecC.i b/TAO/tao/VisibilityC.cpp
index 38aa32569ba..e2d0fa97309 100644
--- a/TAO/tao/IOP_CodecC.i
+++ b/TAO/tao/VisibilityC.cpp
@@ -25,4 +25,26 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:302
+
+
+#include "VisibilityC.h"
+#include "tao/CDR.h"
+
+#if defined (__BORLANDC__)
+#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#endif /* __BORLANDC__ */
+
+#if !defined (__ACE_INLINE__)
+#include "VisibilityC.inl"
+#endif /* !defined INLINE */
+
+// TAO_IDL - Generated from
+// be\be_visitor_arg_traits.cpp:66
+
+// Arg traits specializations.
+namespace TAO
+{
+}
 
diff --git a/TAO/tao/VisibilityC.h b/TAO/tao/VisibilityC.h
new file mode 100644
index 00000000000..b7822f64465
--- /dev/null
+++ b/TAO/tao/VisibilityC.h
@@ -0,0 +1,122 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:153
+
+#ifndef _TAO_IDL_ORIG_VISIBILITYC_H_
+#define _TAO_IDL_ORIG_VISIBILITYC_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/TAO_Export.h"
+#include "tao/ORB.h"
+#include "tao/Environment.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO TAO_Export
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO TAO_Export
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#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
+
+namespace CORBA
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typedef/typedef_ch.cpp:379
+  
+  typedef CORBA::Short Visibility;
+  typedef CORBA::Short_out Visibility_out;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Visibility PRIVATE_MEMBER = 0;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_constant/constant_ch.cpp:52
+  
+  const CORBA::Visibility PUBLIC_MEMBER = 1;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:66
+
+} // module CORBA
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:59
+
+// Traits specializations.
+namespace TAO
+{
+}
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:961
+
+#if defined (__ACE_INLINE__)
+#include "VisibilityC.inl"
+#endif /* defined INLINE */
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/VisibilityC.inl b/TAO/tao/VisibilityC.inl
new file mode 100644
index 00000000000..c944d806c1f
--- /dev/null
+++ b/TAO/tao/VisibilityC.inl
@@ -0,0 +1,27 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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/VisibilityS.h b/TAO/tao/VisibilityS.h
new file mode 100644
index 00000000000..1fbc77d6c1d
--- /dev/null
+++ b/TAO/tao/VisibilityS.h
@@ -0,0 +1,77 @@
+// -*- 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
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       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
+// be\be_codegen.cpp:390
+
+#ifndef _TAO_IDL_ORIG_VISIBILITYS_H_
+#define _TAO_IDL_ORIG_VISIBILITYS_H_
+
+#include /**/ "ace/pre.h"
+
+#include "VisibilityC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:49
+
+namespace POA_CORBA
+{
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:80
+
+} // module CORBA
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:997
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/WCharSeqC.cpp b/TAO/tao/WCharSeqC.cpp
index a1a24890566..638bd294eea 100644
--- a/TAO/tao/WCharSeqC.cpp
+++ b/TAO/tao/WCharSeqC.cpp
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -121,7 +121,7 @@ CORBA::Boolean operator<< (
       return strm.write_wchar_array (_tao_sequence.get_buffer (), _tao_sequence.length ());
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -138,7 +138,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -147,7 +147,7 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
@@ -155,7 +155,7 @@ CORBA::Boolean operator>> (
     
     }
   
-  return 0;
+  return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_WCharSeq_CPP_ */
diff --git a/TAO/tao/WStringSeqC.cpp b/TAO/tao/WStringSeqC.cpp
index 3b1993086ee..6461f0baedb 100644
--- a/TAO/tao/WStringSeqC.cpp
+++ b/TAO/tao/WStringSeqC.cpp
@@ -41,7 +41,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -112,7 +112,7 @@ CORBA::Boolean operator<< (
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -122,7 +122,7 @@ CORBA::Boolean operator<< (
       return _tao_marshal_flag;
     }
   
-  return 0;
+  return false;
 }
 
 CORBA::Boolean operator>> (
@@ -139,7 +139,7 @@ CORBA::Boolean operator>> (
       // of the stream. (See bug 58.)
       if (_tao_seq_len > strm.length ())
         {
-          return 0;
+          return false;
         }
       
       // Set the length of the sequence.
@@ -148,11 +148,11 @@ CORBA::Boolean operator>> (
       // If length is 0 we return true.
       if (0 >= _tao_seq_len) 
         {
-          return 1;
+          return true;
         }
       
       // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = 1;
+      CORBA::Boolean _tao_marshal_flag = true;
       
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
@@ -164,7 +164,7 @@ CORBA::Boolean operator>> (
   
   }
 
-return 0;
+return false;
 }
 
 #endif /* _TAO_CDR_OP_CORBA_WStringSeq_CPP_ */
diff --git a/TAO/tao/WrongTransactionA.cpp b/TAO/tao/WrongTransactionA.cpp
index 3e8018321cb..5b6befdf429 100644
--- a/TAO/tao/WrongTransactionA.cpp
+++ b/TAO/tao/WrongTransactionA.cpp
@@ -42,9 +42,9 @@ TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>::demarshal_value (
 {
   CORBA::String_var id;
   
-  if ((cdr >> id.out ()) == 0)
+  if (!(cdr >> id.out ()))
     {
-      return 0;
+      return false;
     }
   
   ACE_TRY_NEW_ENV
@@ -54,11 +54,11 @@ TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>::demarshal_value (
     }
   ACE_CATCHANY
     {
-      return 0;
+      return false;
     }
   ACE_ENDTRY;
   
-  return 1;
+  return true;
 }
 
 // Copying insertion.
diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp
index 2f9a0ad1257..d6f756bfb92 100644
--- a/TAO/tao/WrongTransactionC.cpp
+++ b/TAO/tao/WrongTransactionC.cpp
@@ -44,7 +44,7 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:65
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
@@ -205,15 +205,8 @@ CORBA::Boolean operator<< (
     const CORBA::WrongTransaction &_tao_aggregate
   )
 {
-  // First marshal the repository ID.
-  if (strm << _tao_aggregate._rep_id ())
-    {
-      return 1;
-    }
-  else
-    {
-      return 0;
-    }
+  // Marshal the repository ID.
+  return (strm << _tao_aggregate._rep_id ());
 }
 
 CORBA::Boolean operator>> (
@@ -221,7 +214,7 @@ CORBA::Boolean operator>> (
     CORBA::WrongTransaction&
   )
 {
-  return 1;
+  return true;
 }
 
 // TAO_IDL - Generated from
diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h
index 2f8be3d1c85..4090b12287f 100644
--- a/TAO/tao/WrongTransactionC.h
+++ b/TAO/tao/WrongTransactionC.h
@@ -149,7 +149,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::WrongTransac
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::WrongTransaction &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:963
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "WrongTransactionC.inl"
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index 0cff519fb79..a15ee8c758b 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -32,7 +32,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TC_Constants_Forward.h"
-#include "tao/OBV_Constants.h"
 #include "tao/CORBA_methods.h"
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/default_environment.h b/TAO/tao/default_environment.h
index ec261119089..45ded1f6f06 100644
--- a/TAO/tao/default_environment.h
+++ b/TAO/tao/default_environment.h
@@ -28,7 +28,7 @@ namespace CORBA
 
 /// Provide a simple function to access the TSS default
 /// environment. This will be used in TAO wherever we have a default
-/// environement.
+/// environment.
 /**
  * @note We tried with CORBA::default_environment() and others.
  */
diff --git a/TAO/tao/default_server.cpp b/TAO/tao/default_server.cpp
index 9e3da844ee4..c74c5065ef7 100644
--- a/TAO/tao/default_server.cpp
+++ b/TAO/tao/default_server.cpp
@@ -380,10 +380,6 @@ TAO_Default_Server_Strategy_Factory::report_option_value_error (
              option_value, option_name));
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 ACE_STATIC_SVC_DEFINE (TAO_Default_Server_Strategy_Factory,
                        ACE_TEXT ("Server_Strategy_Factory"),
                        ACE_SVC_OBJ_T,
diff --git a/TAO/tao/diffs/Domain.diff b/TAO/tao/diffs/Domain.diff
index 518b0d7acb2..dc9c0df787f 100644
--- a/TAO/tao/diffs/Domain.diff
+++ b/TAO/tao/diffs/Domain.diff
@@ -1,80 +1,10 @@
---- orig/DomainC.cpp	2003-11-20 18:47:47.000000000 -0600
-+++ DomainC.cpp	2003-11-20 18:55:45.000000000 -0600
-@@ -30,13 +30,17 @@
+--- orig/DomainC.h	2005-02-11 12:21:05.659990400 +0100
++++ DomainC.h	2005-02-11 12:58:02.918251200 +0100
+@@ -51,7 +51,6 @@
+ #include "tao/Seq_Out_T.h"
  
+ #include "tao/PolicyC.h"
+-#include "tao/InterfaceDefC.h"
  
- #include "DomainC.h"
--#include "tao/Exception_Data.h"
--#include "tao/Invocation_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 "IFR_Client_Adapter.h"
-+#include "Exception_Data.h"
-+#include "Invocation_Adapter.h"
-+#include "Object_T.h"
-+#include "Basic_Arguments.h"
-+#include "Object_Argument_T.h"
-+#include "Special_Basic_Arguments.h"
-+#include "ORB_Core.h"
- #include "ace/OS_NS_string.h"
-+#include "ace/Dynamic_Service.h"
-+
- 
- #if defined (__BORLANDC__)
- #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-@@ -48,6 +52,40 @@
- 
- // TAO_IDL - Generated from
- // be/be_visitor_arg_traits.cpp:62
-+// TAO specific stuff.
-+namespace CORBA
-+{
-+  class InterfaceDef;
-+  typedef InterfaceDef *InterfaceDef_ptr;
-+  typedef TAO_Objref_Var_T<InterfaceDef> InterfaceDef_var;
-+  typedef TAO_Objref_Out_T<InterfaceDef> InterfaceDef_out;
-+}
-+
-+ACE_TEMPLATE_SPECIALIZATION
-+void
-+TAO::In_Object_Argument_T<CORBA::InterfaceDef_ptr>::interceptor_param (Dynamic::Parameter & p)
-+{
-+  TAO_IFR_Client_Adapter *adapter =
-+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
-+        TAO_ORB_Core::ifr_client_adapter_name ()
-+      );
-+
-+  adapter->interfacedef_any_insert (p.argument, this->x_);
-+  p.mode = CORBA::PARAM_IN;
-+}
-+
-+ACE_TEMPLATE_SPECIALIZATION
-+CORBA::Boolean
-+TAO::In_Object_Argument_T<CORBA::InterfaceDef_ptr>::marshal (TAO_OutputCDR & cdr)
-+{
-+  TAO_IFR_Client_Adapter *adapter =
-+    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
-+        TAO_ORB_Core::ifr_client_adapter_name ()
-+      );
-+
-+  return adapter->interfacedef_cdr_insert (cdr, this->x_);
-+}
-+
- 
- // Arg traits specializations.
- namespace TAO
-@@ -683,12 +721,6 @@
- #endif /* end #if !defined */
- 
-   template class
--    TAO::Ret_Object_Argument_T<
--        CORBA::Policy_ptr,
--        CORBA::Policy_var
--      >;
--
--  template class
-     TAO::Objref_Traits<
-         CORBA::DomainManager
-       >;
+ #if defined (TAO_EXPORT_MACRO)
+ #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/diffs/IOP_Codec.diff b/TAO/tao/diffs/IOP_Codec.diff
deleted file mode 100644
index d8a9393d069..00000000000
--- a/TAO/tao/diffs/IOP_Codec.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- orig/IOP_CodecC.h	2003-04-27 09:41:09.000000000 -0500
-+++ ./IOP_CodecC.h	2003-04-27 10:09:46.000000000 -0500
-@@ -30,17 +30,16 @@
- 
- #ifndef _TAO_IDL_ORIG_IOP_CODECC_H_
- #define _TAO_IDL_ORIG_IOP_CODECC_H_
--
- #include "ace/pre.h"
--
--#include "tao/corba.h"
-+#include "tao/corbafwd.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
--
--
--#include "TAO_Export.h"
-+#include "tao/TAO_Export.h"
-+#include "tao/Any_T.h"
-+#include "tao/VarOut_T.h"
-+#include "tao/Any_T.h"
- 
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/diffs/IOP_IOR.diff b/TAO/tao/diffs/IOP_IOR.diff
deleted file mode 100644
index 15b54f4aaf9..00000000000
--- a/TAO/tao/diffs/IOP_IOR.diff
+++ /dev/null
@@ -1,2226 +0,0 @@
---- orig/IOP_IORC.h	2003-12-24 13:30:24.000000000 -0600
-+++ IOP_IORC.h	2003-12-24 13:13:36.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -33,21 +33,15 @@
- 
- #include /**/ "ace/pre.h"
- 
--#include "tao/ORB.h"
-+#include "OctetSeqC.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
--#include "TAO_Export.h"
--#include "tao/CDR.h"
--#include "tao/Environment.h"
--#include "tao/Sequence_T.h"
--#include "tao/Seq_Var_T.h"
--#include "tao/Seq_Out_T.h"
- #include "tao/VarOut_T.h"
-+#include "tao/CDR.h"
- 
--#include "OctetSeqC.h"
- 
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
-@@ -85,11 +79,6 @@
-   typedef CORBA::ULong_out ProfileId_out;
-   
-   // TAO_IDL - Generated from
--  // be/be_visitor_typecode/typecode_decl.cpp:44
--  
--  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProfileId;
--  
--  // TAO_IDL - Generated from
-   // be/be_visitor_constant/constant_ch.cpp:52
-   
-   const IOP::ProfileId TAG_INTERNET_IOP = 0U;
-@@ -130,11 +119,6 @@
-   };
-   
-   // TAO_IDL - Generated from
--  // be/be_visitor_typecode/typecode_decl.cpp:44
--  
--  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedProfile;
--  
--  // TAO_IDL - Generated from
-   // be/be_type.cpp:258
-   
-   struct IOR;
-@@ -198,22 +182,12 @@
-   };
-   
-   // TAO_IDL - Generated from
--  // be/be_visitor_typecode/typecode_decl.cpp:44
--  
--  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IOR;
--  
--  // TAO_IDL - Generated from
-   // be/be_visitor_typedef/typedef_ch.cpp:342
-   
-   typedef CORBA::ULong ComponentId;
-   typedef CORBA::ULong_out ComponentId_out;
-   
-   // TAO_IDL - Generated from
--  // be/be_visitor_typecode/typecode_decl.cpp:44
--  
--  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ComponentId;
--  
--  // TAO_IDL - Generated from
-   // be/be_type.cpp:258
-   
-   struct TaggedComponent;
-@@ -244,11 +218,6 @@
-   };
-   
-   // TAO_IDL - Generated from
--  // be/be_visitor_typecode/typecode_decl.cpp:44
--  
--  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedComponent;
--  
--  // TAO_IDL - Generated from
-   // be/be_visitor_sequence/sequence_ch.cpp:101
- 
- #if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CH_)
-@@ -297,11 +266,6 @@
- #endif /* end #if !defined */
-   
-   // TAO_IDL - Generated from
--  // be/be_visitor_typecode/typecode_decl.cpp:44
--  
--  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultipleComponentProfile;
--  
--  // TAO_IDL - Generated from
-   // be/be_visitor_sequence/sequence_ch.cpp:101
- 
- #if !defined (_IOP_TAGGEDCOMPONENTLIST_CH_)
-@@ -350,11 +314,6 @@
- #endif /* end #if !defined */
-   
-   // TAO_IDL - Generated from
--  // be/be_visitor_typecode/typecode_decl.cpp:44
--  
--  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedComponentList;
--  
--  // TAO_IDL - Generated from
-   // be/be_visitor_sequence/sequence_ch.cpp:101
- 
- #if !defined (_IOP_TAGGEDCOMPONENTSEQ_CH_)
-@@ -403,11 +362,6 @@
- #endif /* end #if !defined */
-   
-   // TAO_IDL - Generated from
--  // be/be_visitor_typecode/typecode_decl.cpp:44
--  
--  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedComponentSeq;
--  
--  // TAO_IDL - Generated from
-   // be/be_visitor_constant/constant_ch.cpp:52
-   
-   const IOP::ComponentId TAG_ORB_TYPE = 0U;
-@@ -464,11 +418,6 @@
-   typedef CORBA::ULong_out ServiceId_out;
-   
-   // TAO_IDL - Generated from
--  // be/be_visitor_typecode/typecode_decl.cpp:44
--  
--  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceId;
--  
--  // TAO_IDL - Generated from
-   // be/be_type.cpp:258
-   
-   struct ServiceContext;
-@@ -498,10 +447,6 @@
-     CORBA::OctetSeq context_data;
-   };
-   
--  // TAO_IDL - Generated from
--  // be/be_visitor_typecode/typecode_decl.cpp:44
--  
--  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceContext;
-   
-   // TAO_IDL - Generated from
-   // be/be_visitor_sequence/sequence_ch.cpp:101
-@@ -552,11 +497,6 @@
- #endif /* end #if !defined */
-   
-   // TAO_IDL - Generated from
--  // be/be_visitor_typecode/typecode_decl.cpp:44
--  
--  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceContextList;
--  
--  // TAO_IDL - Generated from
-   // be/be_visitor_constant/constant_ch.cpp:52
-   
-   const IOP::ServiceId TransactionService = 0U;
-@@ -657,7 +597,7 @@
- } // module IOP
- 
- // TAO_IDL - Generated from
--// be/be_visitor_traits.cpp:59
-+// be/be_visitor_traits.cpp:58
- 
- // Traits specializations.
- namespace TAO
---- orig/IOP_IORC.i	2003-12-24 13:30:24.000000000 -0600
-+++ IOP_IORC.i	2003-12-23 22:17:39.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
---- orig/IOP_IORC.cpp	2003-12-24 13:30:24.000000000 -0600
-+++ IOP_IORC.cpp	2003-12-24 13:17:51.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -28,9 +28,7 @@
- // TAO_IDL - Generated from
- // be/be_codegen.cpp:338
- 
--
- #include "IOP_IORC.h"
--#include "tao/Typecode.h"
- 
- #if defined (__BORLANDC__)
- #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-@@ -50,131 +48,6 @@
- 
- 
- // TAO_IDL - Generated from
--// be/be_visitor_typecode/typecode_defn.cpp:284
--
--static const CORBA::Long _oc_IOP_ProfileId[] =
--{
--    TAO_ENCAP_BYTE_ORDER, // byte order
--  30,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x6f6d672e), 
--  ACE_NTOHL (0x6f72672f), 
--  ACE_NTOHL (0x494f502f), 
--  ACE_NTOHL (0x50726f66), 
--  ACE_NTOHL (0x696c6549), 
--  ACE_NTOHL (0x643a312e), 
--  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
--    10,
--  ACE_NTOHL (0x50726f66), 
--  ACE_NTOHL (0x696c6549), 
--  ACE_NTOHL (0x64000000),  // name = ProfileId
--    CORBA::tk_ulong,
--
--};
--
--static CORBA::TypeCode _tc_TAO_tc_IOP_ProfileId (
--    CORBA::tk_alias,
--    sizeof (_oc_IOP_ProfileId),
--    (char *) &_oc_IOP_ProfileId,
--    0,
--    sizeof (IOP::ProfileId)
--  );
--
--namespace IOP
--{
--  ::CORBA::TypeCode_ptr _tc_ProfileId =
--    &_tc_TAO_tc_IOP_ProfileId;
--}
--
--// TAO_IDL - Generated from
--// be/be_visitor_typecode/typecode_defn.cpp:284
--
--static const CORBA::Long _oc_IOP_TaggedProfile[] =
--{
--    TAO_ENCAP_BYTE_ORDER, // byte order
--  34,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x6f6d672e), 
--  ACE_NTOHL (0x6f72672f), 
--  ACE_NTOHL (0x494f502f), 
--  ACE_NTOHL (0x54616767), 
--  ACE_NTOHL (0x65645072), 
--  ACE_NTOHL (0x6f66696c), 
--  ACE_NTOHL (0x653a312e), 
--  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
--    14,
--  ACE_NTOHL (0x54616767), 
--  ACE_NTOHL (0x65645072), 
--  ACE_NTOHL (0x6f66696c), 
--  ACE_NTOHL (0x65000000),  // name = TaggedProfile
--  2, // member count
--    4,
--  ACE_NTOHL (0x74616700),  // name = tag
--    CORBA::tk_alias, // typecode kind for typedefs
--  60, // encapsulation length
--    TAO_ENCAP_BYTE_ORDER, // byte order
--    30,
--    ACE_NTOHL (0x49444c3a), 
--    ACE_NTOHL (0x6f6d672e), 
--    ACE_NTOHL (0x6f72672f), 
--    ACE_NTOHL (0x494f502f), 
--    ACE_NTOHL (0x50726f66), 
--    ACE_NTOHL (0x696c6549), 
--    ACE_NTOHL (0x643a312e), 
--    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
--        10,
--    ACE_NTOHL (0x50726f66), 
--    ACE_NTOHL (0x696c6549), 
--    ACE_NTOHL (0x64000000),  // name = ProfileId
--        CORBA::tk_ulong,
--
--
--  13,
--  ACE_NTOHL (0x70726f66), 
--  ACE_NTOHL (0x696c655f), 
--  ACE_NTOHL (0x64617461), 
--  ACE_NTOHL (0x0),  // name = profile_data
--    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 (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,
--
--      0U,
--
--
--};
--
--static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedProfile (
--    CORBA::tk_struct,
--    sizeof (_oc_IOP_TaggedProfile),
--    (char *) &_oc_IOP_TaggedProfile,
--    0,
--    sizeof (IOP::TaggedProfile)
--  );
--
--namespace IOP
--{
--  ::CORBA::TypeCode_ptr _tc_TaggedProfile =
--    &_tc_TAO_tc_IOP_TaggedProfile;
--}
--
--// TAO_IDL - Generated from 
- // be/be_visitor_structure/structure_cs.cpp:66
- 
- void 
-@@ -188,122 +61,6 @@
- }
- 
- // TAO_IDL - Generated from
--// be/be_visitor_typecode/typecode_defn.cpp:284
--
--static const CORBA::Long _oc_IOP_IOR[] =
--{
--    TAO_ENCAP_BYTE_ORDER, // byte order
--  24,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x6f6d672e), 
--  ACE_NTOHL (0x6f72672f), 
--  ACE_NTOHL (0x494f502f), 
--  ACE_NTOHL (0x494f523a), 
--  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/IOR:1.0
--    4,
--  ACE_NTOHL (0x494f5200),  // name = IOR
--  2, // member count
--    8,
--  ACE_NTOHL (0x74797065), 
--  ACE_NTOHL (0x5f696400),  // name = type_id
--    CORBA::tk_string, 
--  0U, // string length
--  9,
--  ACE_NTOHL (0x70726f66), 
--  ACE_NTOHL (0x696c6573), 
--  ACE_NTOHL (0x0),  // name = profiles
--    CORBA::tk_sequence, // typecode kind
--  264, // encapsulation length
--    TAO_ENCAP_BYTE_ORDER, // byte order
--    CORBA::tk_struct, // typecode kind
--    248, // encapsulation length
--      TAO_ENCAP_BYTE_ORDER, // byte order
--      34,
--      ACE_NTOHL (0x49444c3a), 
--      ACE_NTOHL (0x6f6d672e), 
--      ACE_NTOHL (0x6f72672f), 
--      ACE_NTOHL (0x494f502f), 
--      ACE_NTOHL (0x54616767), 
--      ACE_NTOHL (0x65645072), 
--      ACE_NTOHL (0x6f66696c), 
--      ACE_NTOHL (0x653a312e), 
--      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
--            14,
--      ACE_NTOHL (0x54616767), 
--      ACE_NTOHL (0x65645072), 
--      ACE_NTOHL (0x6f66696c), 
--      ACE_NTOHL (0x65000000),  // name = TaggedProfile
--      2, // member count
--            4,
--      ACE_NTOHL (0x74616700),  // name = tag
--            CORBA::tk_alias, // typecode kind for typedefs
--      60, // encapsulation length
--        TAO_ENCAP_BYTE_ORDER, // byte order
--        30,
--        ACE_NTOHL (0x49444c3a), 
--        ACE_NTOHL (0x6f6d672e), 
--        ACE_NTOHL (0x6f72672f), 
--        ACE_NTOHL (0x494f502f), 
--        ACE_NTOHL (0x50726f66), 
--        ACE_NTOHL (0x696c6549), 
--        ACE_NTOHL (0x643a312e), 
--        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
--                10,
--        ACE_NTOHL (0x50726f66), 
--        ACE_NTOHL (0x696c6549), 
--        ACE_NTOHL (0x64000000),  // name = ProfileId
--                CORBA::tk_ulong,
--
--
--      13,
--      ACE_NTOHL (0x70726f66), 
--      ACE_NTOHL (0x696c655f), 
--      ACE_NTOHL (0x64617461), 
--      ACE_NTOHL (0x0),  // name = profile_data
--            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 (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,
--
--          0U,
--
--
--
--    0U,
--
--};
--
--static CORBA::TypeCode _tc_TAO_tc_IOP_IOR (
--    CORBA::tk_struct,
--    sizeof (_oc_IOP_IOR),
--    (char *) &_oc_IOP_IOR,
--    0,
--    sizeof (IOP::IOR)
--  );
--
--namespace IOP
--{
--  ::CORBA::TypeCode_ptr _tc_IOR =
--    &_tc_TAO_tc_IOP_IOR;
--}
--
--// TAO_IDL - Generated from 
- // be/be_visitor_structure/structure_cs.cpp:66
- 
- void 
-@@ -361,131 +118,6 @@
- #endif /* end #if !defined */
- 
- // TAO_IDL - Generated from
--// be/be_visitor_typecode/typecode_defn.cpp:284
--
--static const CORBA::Long _oc_IOP_ComponentId[] =
--{
--    TAO_ENCAP_BYTE_ORDER, // byte order
--  32,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x6f6d672e), 
--  ACE_NTOHL (0x6f72672f), 
--  ACE_NTOHL (0x494f502f), 
--  ACE_NTOHL (0x436f6d70), 
--  ACE_NTOHL (0x6f6e656e), 
--  ACE_NTOHL (0x7449643a), 
--  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
--    12,
--  ACE_NTOHL (0x436f6d70), 
--  ACE_NTOHL (0x6f6e656e), 
--  ACE_NTOHL (0x74496400),  // name = ComponentId
--    CORBA::tk_ulong,
--
--};
--
--static CORBA::TypeCode _tc_TAO_tc_IOP_ComponentId (
--    CORBA::tk_alias,
--    sizeof (_oc_IOP_ComponentId),
--    (char *) &_oc_IOP_ComponentId,
--    0,
--    sizeof (IOP::ComponentId)
--  );
--
--namespace IOP
--{
--  ::CORBA::TypeCode_ptr _tc_ComponentId =
--    &_tc_TAO_tc_IOP_ComponentId;
--}
--
--// TAO_IDL - Generated from
--// be/be_visitor_typecode/typecode_defn.cpp:284
--
--static const CORBA::Long _oc_IOP_TaggedComponent[] =
--{
--    TAO_ENCAP_BYTE_ORDER, // byte order
--  36,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x6f6d672e), 
--  ACE_NTOHL (0x6f72672f), 
--  ACE_NTOHL (0x494f502f), 
--  ACE_NTOHL (0x54616767), 
--  ACE_NTOHL (0x6564436f), 
--  ACE_NTOHL (0x6d706f6e), 
--  ACE_NTOHL (0x656e743a), 
--  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
--    16,
--  ACE_NTOHL (0x54616767), 
--  ACE_NTOHL (0x6564436f), 
--  ACE_NTOHL (0x6d706f6e), 
--  ACE_NTOHL (0x656e7400),  // name = TaggedComponent
--  2, // member count
--    4,
--  ACE_NTOHL (0x74616700),  // name = tag
--    CORBA::tk_alias, // typecode kind for typedefs
--  60, // encapsulation length
--    TAO_ENCAP_BYTE_ORDER, // byte order
--    32,
--    ACE_NTOHL (0x49444c3a), 
--    ACE_NTOHL (0x6f6d672e), 
--    ACE_NTOHL (0x6f72672f), 
--    ACE_NTOHL (0x494f502f), 
--    ACE_NTOHL (0x436f6d70), 
--    ACE_NTOHL (0x6f6e656e), 
--    ACE_NTOHL (0x7449643a), 
--    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
--        12,
--    ACE_NTOHL (0x436f6d70), 
--    ACE_NTOHL (0x6f6e656e), 
--    ACE_NTOHL (0x74496400),  // name = ComponentId
--        CORBA::tk_ulong,
--
--
--  15,
--  ACE_NTOHL (0x636f6d70), 
--  ACE_NTOHL (0x6f6e656e), 
--  ACE_NTOHL (0x745f6461), 
--  ACE_NTOHL (0x74610000),  // name = component_data
--    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 (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,
--
--      0U,
--
--
--};
--
--static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponent (
--    CORBA::tk_struct,
--    sizeof (_oc_IOP_TaggedComponent),
--    (char *) &_oc_IOP_TaggedComponent,
--    0,
--    sizeof (IOP::TaggedComponent)
--  );
--
--namespace IOP
--{
--  ::CORBA::TypeCode_ptr _tc_TaggedComponent =
--    &_tc_TAO_tc_IOP_TaggedComponent;
--}
--
--// TAO_IDL - Generated from 
- // be/be_visitor_structure/structure_cs.cpp:66
- 
- void 
-@@ -552,124 +184,6 @@
- #endif /* end #if !defined */
- 
- // TAO_IDL - Generated from
--// be/be_visitor_typecode/typecode_defn.cpp:284
--
--static const CORBA::Long _oc_IOP_MultipleComponentProfile[] =
--{
--    TAO_ENCAP_BYTE_ORDER, // byte order
--  45,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x6f6d672e), 
--  ACE_NTOHL (0x6f72672f), 
--  ACE_NTOHL (0x494f502f), 
--  ACE_NTOHL (0x4d756c74), 
--  ACE_NTOHL (0x69706c65), 
--  ACE_NTOHL (0x436f6d70), 
--  ACE_NTOHL (0x6f6e656e), 
--  ACE_NTOHL (0x7450726f), 
--  ACE_NTOHL (0x66696c65), 
--  ACE_NTOHL (0x3a312e30), 
--  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/MultipleComponentProfile:1.0
--    25,
--  ACE_NTOHL (0x4d756c74), 
--  ACE_NTOHL (0x69706c65), 
--  ACE_NTOHL (0x436f6d70), 
--  ACE_NTOHL (0x6f6e656e), 
--  ACE_NTOHL (0x7450726f), 
--  ACE_NTOHL (0x66696c65), 
--  ACE_NTOHL (0x0),  // name = MultipleComponentProfile
--    CORBA::tk_sequence, // typecode kind
--  264, // encapsulation length
--    TAO_ENCAP_BYTE_ORDER, // byte order
--    CORBA::tk_struct, // typecode kind
--    248, // encapsulation length
--      TAO_ENCAP_BYTE_ORDER, // byte order
--      36,
--      ACE_NTOHL (0x49444c3a), 
--      ACE_NTOHL (0x6f6d672e), 
--      ACE_NTOHL (0x6f72672f), 
--      ACE_NTOHL (0x494f502f), 
--      ACE_NTOHL (0x54616767), 
--      ACE_NTOHL (0x6564436f), 
--      ACE_NTOHL (0x6d706f6e), 
--      ACE_NTOHL (0x656e743a), 
--      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
--            16,
--      ACE_NTOHL (0x54616767), 
--      ACE_NTOHL (0x6564436f), 
--      ACE_NTOHL (0x6d706f6e), 
--      ACE_NTOHL (0x656e7400),  // name = TaggedComponent
--      2, // member count
--            4,
--      ACE_NTOHL (0x74616700),  // name = tag
--            CORBA::tk_alias, // typecode kind for typedefs
--      60, // encapsulation length
--        TAO_ENCAP_BYTE_ORDER, // byte order
--        32,
--        ACE_NTOHL (0x49444c3a), 
--        ACE_NTOHL (0x6f6d672e), 
--        ACE_NTOHL (0x6f72672f), 
--        ACE_NTOHL (0x494f502f), 
--        ACE_NTOHL (0x436f6d70), 
--        ACE_NTOHL (0x6f6e656e), 
--        ACE_NTOHL (0x7449643a), 
--        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
--                12,
--        ACE_NTOHL (0x436f6d70), 
--        ACE_NTOHL (0x6f6e656e), 
--        ACE_NTOHL (0x74496400),  // name = ComponentId
--                CORBA::tk_ulong,
--
--
--      15,
--      ACE_NTOHL (0x636f6d70), 
--      ACE_NTOHL (0x6f6e656e), 
--      ACE_NTOHL (0x745f6461), 
--      ACE_NTOHL (0x74610000),  // name = component_data
--            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 (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,
--
--          0U,
--
--
--
--    0U,
--
--};
--
--static CORBA::TypeCode _tc_TAO_tc_IOP_MultipleComponentProfile (
--    CORBA::tk_alias,
--    sizeof (_oc_IOP_MultipleComponentProfile),
--    (char *) &_oc_IOP_MultipleComponentProfile,
--    0,
--    sizeof (IOP::MultipleComponentProfile)
--  );
--
--namespace IOP
--{
--  ::CORBA::TypeCode_ptr _tc_MultipleComponentProfile =
--    &_tc_TAO_tc_IOP_MultipleComponentProfile;
--}
--
--// TAO_IDL - Generated from 
- // be/be_visitor_sequence/sequence_cs.cpp:65
- 
- #if !defined (_IOP_TAGGEDCOMPONENTLIST_CS_)
-@@ -723,120 +237,6 @@
- #endif /* end #if !defined */
- 
- // TAO_IDL - Generated from
--// be/be_visitor_typecode/typecode_defn.cpp:284
--
--static const CORBA::Long _oc_IOP_TaggedComponentList[] =
--{
--    TAO_ENCAP_BYTE_ORDER, // byte order
--  40,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x6f6d672e), 
--  ACE_NTOHL (0x6f72672f), 
--  ACE_NTOHL (0x494f502f), 
--  ACE_NTOHL (0x54616767), 
--  ACE_NTOHL (0x6564436f), 
--  ACE_NTOHL (0x6d706f6e), 
--  ACE_NTOHL (0x656e744c), 
--  ACE_NTOHL (0x6973743a), 
--  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponentList:1.0
--    20,
--  ACE_NTOHL (0x54616767), 
--  ACE_NTOHL (0x6564436f), 
--  ACE_NTOHL (0x6d706f6e), 
--  ACE_NTOHL (0x656e744c), 
--  ACE_NTOHL (0x69737400),  // name = TaggedComponentList
--    CORBA::tk_sequence, // typecode kind
--  264, // encapsulation length
--    TAO_ENCAP_BYTE_ORDER, // byte order
--    CORBA::tk_struct, // typecode kind
--    248, // encapsulation length
--      TAO_ENCAP_BYTE_ORDER, // byte order
--      36,
--      ACE_NTOHL (0x49444c3a), 
--      ACE_NTOHL (0x6f6d672e), 
--      ACE_NTOHL (0x6f72672f), 
--      ACE_NTOHL (0x494f502f), 
--      ACE_NTOHL (0x54616767), 
--      ACE_NTOHL (0x6564436f), 
--      ACE_NTOHL (0x6d706f6e), 
--      ACE_NTOHL (0x656e743a), 
--      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
--            16,
--      ACE_NTOHL (0x54616767), 
--      ACE_NTOHL (0x6564436f), 
--      ACE_NTOHL (0x6d706f6e), 
--      ACE_NTOHL (0x656e7400),  // name = TaggedComponent
--      2, // member count
--            4,
--      ACE_NTOHL (0x74616700),  // name = tag
--            CORBA::tk_alias, // typecode kind for typedefs
--      60, // encapsulation length
--        TAO_ENCAP_BYTE_ORDER, // byte order
--        32,
--        ACE_NTOHL (0x49444c3a), 
--        ACE_NTOHL (0x6f6d672e), 
--        ACE_NTOHL (0x6f72672f), 
--        ACE_NTOHL (0x494f502f), 
--        ACE_NTOHL (0x436f6d70), 
--        ACE_NTOHL (0x6f6e656e), 
--        ACE_NTOHL (0x7449643a), 
--        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
--                12,
--        ACE_NTOHL (0x436f6d70), 
--        ACE_NTOHL (0x6f6e656e), 
--        ACE_NTOHL (0x74496400),  // name = ComponentId
--                CORBA::tk_ulong,
--
--
--      15,
--      ACE_NTOHL (0x636f6d70), 
--      ACE_NTOHL (0x6f6e656e), 
--      ACE_NTOHL (0x745f6461), 
--      ACE_NTOHL (0x74610000),  // name = component_data
--            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 (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,
--
--          0U,
--
--
--
--    0U,
--
--};
--
--static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponentList (
--    CORBA::tk_alias,
--    sizeof (_oc_IOP_TaggedComponentList),
--    (char *) &_oc_IOP_TaggedComponentList,
--    0,
--    sizeof (IOP::TaggedComponentList)
--  );
--
--namespace IOP
--{
--  ::CORBA::TypeCode_ptr _tc_TaggedComponentList =
--    &_tc_TAO_tc_IOP_TaggedComponentList;
--}
--
--// TAO_IDL - Generated from 
- // be/be_visitor_sequence/sequence_cs.cpp:65
- 
- #if !defined (_IOP_TAGGEDCOMPONENTSEQ_CS_)
-@@ -890,247 +290,6 @@
- #endif /* end #if !defined */
- 
- // TAO_IDL - Generated from
--// be/be_visitor_typecode/typecode_defn.cpp:284
--
--static const CORBA::Long _oc_IOP_TaggedComponentSeq[] =
--{
--    TAO_ENCAP_BYTE_ORDER, // byte order
--  39,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x6f6d672e), 
--  ACE_NTOHL (0x6f72672f), 
--  ACE_NTOHL (0x494f502f), 
--  ACE_NTOHL (0x54616767), 
--  ACE_NTOHL (0x6564436f), 
--  ACE_NTOHL (0x6d706f6e), 
--  ACE_NTOHL (0x656e7453), 
--  ACE_NTOHL (0x65713a31), 
--  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/TaggedComponentSeq:1.0
--    19,
--  ACE_NTOHL (0x54616767), 
--  ACE_NTOHL (0x6564436f), 
--  ACE_NTOHL (0x6d706f6e), 
--  ACE_NTOHL (0x656e7453), 
--  ACE_NTOHL (0x65710000),  // name = TaggedComponentSeq
--    CORBA::tk_sequence, // typecode kind
--  264, // encapsulation length
--    TAO_ENCAP_BYTE_ORDER, // byte order
--    CORBA::tk_struct, // typecode kind
--    248, // encapsulation length
--      TAO_ENCAP_BYTE_ORDER, // byte order
--      36,
--      ACE_NTOHL (0x49444c3a), 
--      ACE_NTOHL (0x6f6d672e), 
--      ACE_NTOHL (0x6f72672f), 
--      ACE_NTOHL (0x494f502f), 
--      ACE_NTOHL (0x54616767), 
--      ACE_NTOHL (0x6564436f), 
--      ACE_NTOHL (0x6d706f6e), 
--      ACE_NTOHL (0x656e743a), 
--      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
--            16,
--      ACE_NTOHL (0x54616767), 
--      ACE_NTOHL (0x6564436f), 
--      ACE_NTOHL (0x6d706f6e), 
--      ACE_NTOHL (0x656e7400),  // name = TaggedComponent
--      2, // member count
--            4,
--      ACE_NTOHL (0x74616700),  // name = tag
--            CORBA::tk_alias, // typecode kind for typedefs
--      60, // encapsulation length
--        TAO_ENCAP_BYTE_ORDER, // byte order
--        32,
--        ACE_NTOHL (0x49444c3a), 
--        ACE_NTOHL (0x6f6d672e), 
--        ACE_NTOHL (0x6f72672f), 
--        ACE_NTOHL (0x494f502f), 
--        ACE_NTOHL (0x436f6d70), 
--        ACE_NTOHL (0x6f6e656e), 
--        ACE_NTOHL (0x7449643a), 
--        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
--                12,
--        ACE_NTOHL (0x436f6d70), 
--        ACE_NTOHL (0x6f6e656e), 
--        ACE_NTOHL (0x74496400),  // name = ComponentId
--                CORBA::tk_ulong,
--
--
--      15,
--      ACE_NTOHL (0x636f6d70), 
--      ACE_NTOHL (0x6f6e656e), 
--      ACE_NTOHL (0x745f6461), 
--      ACE_NTOHL (0x74610000),  // name = component_data
--            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 (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,
--
--          0U,
--
--
--
--    0U,
--
--};
--
--static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponentSeq (
--    CORBA::tk_alias,
--    sizeof (_oc_IOP_TaggedComponentSeq),
--    (char *) &_oc_IOP_TaggedComponentSeq,
--    0,
--    sizeof (IOP::TaggedComponentSeq)
--  );
--
--namespace IOP
--{
--  ::CORBA::TypeCode_ptr _tc_TaggedComponentSeq =
--    &_tc_TAO_tc_IOP_TaggedComponentSeq;
--}
--
--// TAO_IDL - Generated from
--// be/be_visitor_typecode/typecode_defn.cpp:284
--
--static const CORBA::Long _oc_IOP_ServiceId[] =
--{
--    TAO_ENCAP_BYTE_ORDER, // byte order
--  30,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x6f6d672e), 
--  ACE_NTOHL (0x6f72672f), 
--  ACE_NTOHL (0x494f502f), 
--  ACE_NTOHL (0x53657276), 
--  ACE_NTOHL (0x69636549), 
--  ACE_NTOHL (0x643a312e), 
--  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
--    10,
--  ACE_NTOHL (0x53657276), 
--  ACE_NTOHL (0x69636549), 
--  ACE_NTOHL (0x64000000),  // name = ServiceId
--    CORBA::tk_ulong,
--
--};
--
--static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceId (
--    CORBA::tk_alias,
--    sizeof (_oc_IOP_ServiceId),
--    (char *) &_oc_IOP_ServiceId,
--    0,
--    sizeof (IOP::ServiceId)
--  );
--
--namespace IOP
--{
--  ::CORBA::TypeCode_ptr _tc_ServiceId =
--    &_tc_TAO_tc_IOP_ServiceId;
--}
--
--// TAO_IDL - Generated from
--// be/be_visitor_typecode/typecode_defn.cpp:284
--
--static const CORBA::Long _oc_IOP_ServiceContext[] =
--{
--    TAO_ENCAP_BYTE_ORDER, // byte order
--  35,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x6f6d672e), 
--  ACE_NTOHL (0x6f72672f), 
--  ACE_NTOHL (0x494f502f), 
--  ACE_NTOHL (0x53657276), 
--  ACE_NTOHL (0x69636543), 
--  ACE_NTOHL (0x6f6e7465), 
--  ACE_NTOHL (0x78743a31), 
--  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContext:1.0
--    15,
--  ACE_NTOHL (0x53657276), 
--  ACE_NTOHL (0x69636543), 
--  ACE_NTOHL (0x6f6e7465), 
--  ACE_NTOHL (0x78740000),  // name = ServiceContext
--  2, // member count
--    11,
--  ACE_NTOHL (0x636f6e74), 
--  ACE_NTOHL (0x6578745f), 
--  ACE_NTOHL (0x69640000),  // name = context_id
--    CORBA::tk_alias, // typecode kind for typedefs
--  60, // encapsulation length
--    TAO_ENCAP_BYTE_ORDER, // byte order
--    30,
--    ACE_NTOHL (0x49444c3a), 
--    ACE_NTOHL (0x6f6d672e), 
--    ACE_NTOHL (0x6f72672f), 
--    ACE_NTOHL (0x494f502f), 
--    ACE_NTOHL (0x53657276), 
--    ACE_NTOHL (0x69636549), 
--    ACE_NTOHL (0x643a312e), 
--    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
--        10,
--    ACE_NTOHL (0x53657276), 
--    ACE_NTOHL (0x69636549), 
--    ACE_NTOHL (0x64000000),  // name = ServiceId
--        CORBA::tk_ulong,
--
--
--  13,
--  ACE_NTOHL (0x636f6e74), 
--  ACE_NTOHL (0x6578745f), 
--  ACE_NTOHL (0x64617461), 
--  ACE_NTOHL (0x0),  // name = context_data
--    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 (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,
--
--      0U,
--
--
--};
--
--static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceContext (
--    CORBA::tk_struct,
--    sizeof (_oc_IOP_ServiceContext),
--    (char *) &_oc_IOP_ServiceContext,
--    0,
--    sizeof (IOP::ServiceContext)
--  );
--
--namespace IOP
--{
--  ::CORBA::TypeCode_ptr _tc_ServiceContext =
--    &_tc_TAO_tc_IOP_ServiceContext;
--}
--
--// TAO_IDL - Generated from 
- // be/be_visitor_structure/structure_cs.cpp:66
- 
- void 
-@@ -1197,122 +356,6 @@
- #endif /* end #if !defined */
- 
- // TAO_IDL - Generated from
--// be/be_visitor_typecode/typecode_defn.cpp:284
--
--static const CORBA::Long _oc_IOP_ServiceContextList[] =
--{
--    TAO_ENCAP_BYTE_ORDER, // byte order
--  39,
--  ACE_NTOHL (0x49444c3a), 
--  ACE_NTOHL (0x6f6d672e), 
--  ACE_NTOHL (0x6f72672f), 
--  ACE_NTOHL (0x494f502f), 
--  ACE_NTOHL (0x53657276), 
--  ACE_NTOHL (0x69636543), 
--  ACE_NTOHL (0x6f6e7465), 
--  ACE_NTOHL (0x78744c69), 
--  ACE_NTOHL (0x73743a31), 
--  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContextList:1.0
--    19,
--  ACE_NTOHL (0x53657276), 
--  ACE_NTOHL (0x69636543), 
--  ACE_NTOHL (0x6f6e7465), 
--  ACE_NTOHL (0x78744c69), 
--  ACE_NTOHL (0x73740000),  // name = ServiceContextList
--    CORBA::tk_sequence, // typecode kind
--  272, // encapsulation length
--    TAO_ENCAP_BYTE_ORDER, // byte order
--    CORBA::tk_struct, // typecode kind
--    256, // encapsulation length
--      TAO_ENCAP_BYTE_ORDER, // byte order
--      35,
--      ACE_NTOHL (0x49444c3a), 
--      ACE_NTOHL (0x6f6d672e), 
--      ACE_NTOHL (0x6f72672f), 
--      ACE_NTOHL (0x494f502f), 
--      ACE_NTOHL (0x53657276), 
--      ACE_NTOHL (0x69636543), 
--      ACE_NTOHL (0x6f6e7465), 
--      ACE_NTOHL (0x78743a31), 
--      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContext:1.0
--            15,
--      ACE_NTOHL (0x53657276), 
--      ACE_NTOHL (0x69636543), 
--      ACE_NTOHL (0x6f6e7465), 
--      ACE_NTOHL (0x78740000),  // name = ServiceContext
--      2, // member count
--            11,
--      ACE_NTOHL (0x636f6e74), 
--      ACE_NTOHL (0x6578745f), 
--      ACE_NTOHL (0x69640000),  // name = context_id
--            CORBA::tk_alias, // typecode kind for typedefs
--      60, // encapsulation length
--        TAO_ENCAP_BYTE_ORDER, // byte order
--        30,
--        ACE_NTOHL (0x49444c3a), 
--        ACE_NTOHL (0x6f6d672e), 
--        ACE_NTOHL (0x6f72672f), 
--        ACE_NTOHL (0x494f502f), 
--        ACE_NTOHL (0x53657276), 
--        ACE_NTOHL (0x69636549), 
--        ACE_NTOHL (0x643a312e), 
--        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
--                10,
--        ACE_NTOHL (0x53657276), 
--        ACE_NTOHL (0x69636549), 
--        ACE_NTOHL (0x64000000),  // name = ServiceId
--                CORBA::tk_ulong,
--
--
--      13,
--      ACE_NTOHL (0x636f6e74), 
--      ACE_NTOHL (0x6578745f), 
--      ACE_NTOHL (0x64617461), 
--      ACE_NTOHL (0x0),  // name = context_data
--            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 (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,
--
--          0U,
--
--
--
--    0U,
--
--};
--
--static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceContextList (
--    CORBA::tk_alias,
--    sizeof (_oc_IOP_ServiceContextList),
--    (char *) &_oc_IOP_ServiceContextList,
--    0,
--    sizeof (IOP::ServiceContextList)
--  );
--
--namespace IOP
--{
--  ::CORBA::TypeCode_ptr _tc_ServiceContextList =
--    &_tc_TAO_tc_IOP_ServiceContextList;
--}
--
--// TAO_IDL - Generated from
- // be/be_visitor_sequence/cdr_op_cs.cpp:95
- 
- #if !defined _TAO_CDR_OP_IOP_IOR__tao_seq_IOP_TaggedProfile__CPP_
---- orig/IOP_IORA.h	2003-12-24 13:30:24.000000000 -0600
-+++ IOP_IORA.h	2003-12-24 13:14:14.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -33,6 +33,33 @@
- 
- #include /**/ "ace/pre.h"
- 
-+//======= Handcrafted
-+namespace IOP
-+{
-+
-+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ProfileId;
-+
-+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedProfile;
-+
-+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_IOR;
-+
-+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ComponentId;
-+
-+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedComponent;
-+
-+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_MultipleComponentProfile;
-+
-+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedComponentList;
-+
-+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_TaggedComponentSeq;
-+
-+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceId;
-+
-+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceContext;
-+
-+  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ServiceContextList;
-+}
-+
- // TAO_IDL - Generated from
- // be/be_visitor_structure/any_op_ch.cpp:52
- 
---- orig/IOP_IORA.cpp	2003-12-24 13:30:24.000000000 -0600
-+++ IOP_IORA.cpp	2003-12-24 13:17:43.000000000 -0600
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -30,6 +30,964 @@
- #include "tao/Typecode.h"
- #include "tao/Any_Dual_Impl_T.h"
- 
-+//======= Handcrafted
-+// TAO_IDL - Generated from
-+// be/be_visitor_typecode/typecode_defn.cpp:284
-+
-+static const CORBA::Long _oc_IOP_ProfileId[] =
-+{
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+  30,
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x6f6d672e),
-+  ACE_NTOHL (0x6f72672f),
-+  ACE_NTOHL (0x494f502f),
-+  ACE_NTOHL (0x50726f66),
-+  ACE_NTOHL (0x696c6549),
-+  ACE_NTOHL (0x643a312e),
-+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-+    10,
-+  ACE_NTOHL (0x50726f66),
-+  ACE_NTOHL (0x696c6549),
-+  ACE_NTOHL (0x64000000),  // name = ProfileId
-+    CORBA::tk_ulong,
-+
-+};
-+
-+static CORBA::TypeCode _tc_TAO_tc_IOP_ProfileId (
-+    CORBA::tk_alias,
-+    sizeof (_oc_IOP_ProfileId),
-+    (char *) &_oc_IOP_ProfileId,
-+    0,
-+    sizeof (IOP::ProfileId)
-+  );
-+
-+namespace IOP
-+{
-+  ::CORBA::TypeCode_ptr _tc_ProfileId =
-+    &_tc_TAO_tc_IOP_ProfileId;
-+}
-+
-+// TAO_IDL - Generated from
-+// be/be_visitor_typecode/typecode_defn.cpp:284
-+
-+static const CORBA::Long _oc_IOP_TaggedProfile[] =
-+{
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+  34,
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x6f6d672e),
-+  ACE_NTOHL (0x6f72672f),
-+  ACE_NTOHL (0x494f502f),
-+  ACE_NTOHL (0x54616767),
-+  ACE_NTOHL (0x65645072),
-+  ACE_NTOHL (0x6f66696c),
-+  ACE_NTOHL (0x653a312e),
-+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
-+    14,
-+  ACE_NTOHL (0x54616767),
-+  ACE_NTOHL (0x65645072),
-+  ACE_NTOHL (0x6f66696c),
-+  ACE_NTOHL (0x65000000),  // name = TaggedProfile
-+  2, // member count
-+    4,
-+  ACE_NTOHL (0x74616700),  // name = tag
-+    CORBA::tk_alias, // typecode kind for typedefs
-+  60, // encapsulation length
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+    30,
-+    ACE_NTOHL (0x49444c3a),
-+    ACE_NTOHL (0x6f6d672e),
-+    ACE_NTOHL (0x6f72672f),
-+    ACE_NTOHL (0x494f502f),
-+    ACE_NTOHL (0x50726f66),
-+    ACE_NTOHL (0x696c6549),
-+    ACE_NTOHL (0x643a312e),
-+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-+        10,
-+    ACE_NTOHL (0x50726f66),
-+    ACE_NTOHL (0x696c6549),
-+    ACE_NTOHL (0x64000000),  // name = ProfileId
-+        CORBA::tk_ulong,
-+
-+
-+  13,
-+  ACE_NTOHL (0x70726f66),
-+  ACE_NTOHL (0x696c655f),
-+  ACE_NTOHL (0x64617461),
-+  ACE_NTOHL (0x0),  // name = profile_data
-+    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 (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,
-+
-+      0U,
-+
-+
-+};
-+
-+static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedProfile (
-+    CORBA::tk_struct,
-+    sizeof (_oc_IOP_TaggedProfile),
-+    (char *) &_oc_IOP_TaggedProfile,
-+    0,
-+    sizeof (IOP::TaggedProfile)
-+  );
-+
-+namespace IOP
-+{
-+  ::CORBA::TypeCode_ptr _tc_TaggedProfile =
-+    &_tc_TAO_tc_IOP_TaggedProfile;
-+}
-+
-+// TAO_IDL - Generated from
-+// be/be_visitor_typecode/typecode_defn.cpp:284
-+
-+static const CORBA::Long _oc_IOP_IOR[] =
-+{
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+  24,
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x6f6d672e),
-+  ACE_NTOHL (0x6f72672f),
-+  ACE_NTOHL (0x494f502f),
-+  ACE_NTOHL (0x494f523a),
-+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/IOR:1.0
-+    4,
-+  ACE_NTOHL (0x494f5200),  // name = IOR
-+  2, // member count
-+    8,
-+  ACE_NTOHL (0x74797065),
-+  ACE_NTOHL (0x5f696400),  // name = type_id
-+    CORBA::tk_string,
-+  0U, // string length
-+  9,
-+  ACE_NTOHL (0x70726f66),
-+  ACE_NTOHL (0x696c6573),
-+  ACE_NTOHL (0x0),  // name = profiles
-+    CORBA::tk_sequence, // typecode kind
-+  264, // encapsulation length
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+    CORBA::tk_struct, // typecode kind
-+    248, // encapsulation length
-+      TAO_ENCAP_BYTE_ORDER, // byte order
-+      34,
-+      ACE_NTOHL (0x49444c3a),
-+      ACE_NTOHL (0x6f6d672e),
-+      ACE_NTOHL (0x6f72672f),
-+      ACE_NTOHL (0x494f502f),
-+      ACE_NTOHL (0x54616767),
-+      ACE_NTOHL (0x65645072),
-+      ACE_NTOHL (0x6f66696c),
-+      ACE_NTOHL (0x653a312e),
-+      ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/TaggedProfile:1.0
-+            14,
-+      ACE_NTOHL (0x54616767),
-+      ACE_NTOHL (0x65645072),
-+      ACE_NTOHL (0x6f66696c),
-+      ACE_NTOHL (0x65000000),  // name = TaggedProfile
-+      2, // member count
-+            4,
-+      ACE_NTOHL (0x74616700),  // name = tag
-+            CORBA::tk_alias, // typecode kind for typedefs
-+      60, // encapsulation length
-+        TAO_ENCAP_BYTE_ORDER, // byte order
-+        30,
-+        ACE_NTOHL (0x49444c3a),
-+        ACE_NTOHL (0x6f6d672e),
-+        ACE_NTOHL (0x6f72672f),
-+        ACE_NTOHL (0x494f502f),
-+        ACE_NTOHL (0x50726f66),
-+        ACE_NTOHL (0x696c6549),
-+        ACE_NTOHL (0x643a312e),
-+        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ProfileId:1.0
-+                10,
-+        ACE_NTOHL (0x50726f66),
-+        ACE_NTOHL (0x696c6549),
-+        ACE_NTOHL (0x64000000),  // name = ProfileId
-+                CORBA::tk_ulong,
-+
-+
-+      13,
-+      ACE_NTOHL (0x70726f66),
-+      ACE_NTOHL (0x696c655f),
-+      ACE_NTOHL (0x64617461),
-+      ACE_NTOHL (0x0),  // name = profile_data
-+            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 (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,
-+
-+          0U,
-+
-+
-+
-+    0U,
-+
-+};
-+
-+static CORBA::TypeCode _tc_TAO_tc_IOP_IOR (
-+    CORBA::tk_struct,
-+    sizeof (_oc_IOP_IOR),
-+    (char *) &_oc_IOP_IOR,
-+    0,
-+    sizeof (IOP::IOR)
-+  );
-+
-+namespace IOP
-+{
-+  ::CORBA::TypeCode_ptr _tc_IOR =
-+    &_tc_TAO_tc_IOP_IOR;
-+}
-+
-+// TAO_IDL - Generated from
-+// be/be_visitor_typecode/typecode_defn.cpp:284
-+
-+static const CORBA::Long _oc_IOP_ComponentId[] =
-+{
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+  32,
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x6f6d672e),
-+  ACE_NTOHL (0x6f72672f),
-+  ACE_NTOHL (0x494f502f),
-+  ACE_NTOHL (0x436f6d70),
-+  ACE_NTOHL (0x6f6e656e),
-+  ACE_NTOHL (0x7449643a),
-+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
-+    12,
-+  ACE_NTOHL (0x436f6d70),
-+  ACE_NTOHL (0x6f6e656e),
-+  ACE_NTOHL (0x74496400),  // name = ComponentId
-+    CORBA::tk_ulong,
-+
-+};
-+
-+static CORBA::TypeCode _tc_TAO_tc_IOP_ComponentId (
-+    CORBA::tk_alias,
-+    sizeof (_oc_IOP_ComponentId),
-+    (char *) &_oc_IOP_ComponentId,
-+    0,
-+    sizeof (IOP::ComponentId)
-+  );
-+
-+namespace IOP
-+{
-+  ::CORBA::TypeCode_ptr _tc_ComponentId =
-+    &_tc_TAO_tc_IOP_ComponentId;
-+}
-+
-+// TAO_IDL - Generated from
-+// be/be_visitor_typecode/typecode_defn.cpp:284
-+
-+static const CORBA::Long _oc_IOP_TaggedComponent[] =
-+{
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+  36,
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x6f6d672e),
-+  ACE_NTOHL (0x6f72672f),
-+  ACE_NTOHL (0x494f502f),
-+  ACE_NTOHL (0x54616767),
-+  ACE_NTOHL (0x6564436f),
-+  ACE_NTOHL (0x6d706f6e),
-+  ACE_NTOHL (0x656e743a),
-+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
-+    16,
-+  ACE_NTOHL (0x54616767),
-+  ACE_NTOHL (0x6564436f),
-+  ACE_NTOHL (0x6d706f6e),
-+  ACE_NTOHL (0x656e7400),  // name = TaggedComponent
-+  2, // member count
-+    4,
-+  ACE_NTOHL (0x74616700),  // name = tag
-+    CORBA::tk_alias, // typecode kind for typedefs
-+  60, // encapsulation length
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+    32,
-+    ACE_NTOHL (0x49444c3a),
-+    ACE_NTOHL (0x6f6d672e),
-+    ACE_NTOHL (0x6f72672f),
-+    ACE_NTOHL (0x494f502f),
-+    ACE_NTOHL (0x436f6d70),
-+    ACE_NTOHL (0x6f6e656e),
-+    ACE_NTOHL (0x7449643a),
-+    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
-+        12,
-+    ACE_NTOHL (0x436f6d70),
-+    ACE_NTOHL (0x6f6e656e),
-+    ACE_NTOHL (0x74496400),  // name = ComponentId
-+        CORBA::tk_ulong,
-+
-+
-+  15,
-+  ACE_NTOHL (0x636f6d70),
-+  ACE_NTOHL (0x6f6e656e),
-+  ACE_NTOHL (0x745f6461),
-+  ACE_NTOHL (0x74610000),  // name = component_data
-+    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 (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,
-+
-+      0U,
-+
-+
-+};
-+
-+static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponent (
-+    CORBA::tk_struct,
-+    sizeof (_oc_IOP_TaggedComponent),
-+    (char *) &_oc_IOP_TaggedComponent,
-+    0,
-+    sizeof (IOP::TaggedComponent)
-+  );
-+
-+namespace IOP
-+{
-+  ::CORBA::TypeCode_ptr _tc_TaggedComponent =
-+    &_tc_TAO_tc_IOP_TaggedComponent;
-+}
-+
-+// TAO_IDL - Generated from
-+// be/be_visitor_typecode/typecode_defn.cpp:284
-+
-+static const CORBA::Long _oc_IOP_MultipleComponentProfile[] =
-+{
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+  45,
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x6f6d672e),
-+  ACE_NTOHL (0x6f72672f),
-+  ACE_NTOHL (0x494f502f),
-+  ACE_NTOHL (0x4d756c74),
-+  ACE_NTOHL (0x69706c65),
-+  ACE_NTOHL (0x436f6d70),
-+  ACE_NTOHL (0x6f6e656e),
-+  ACE_NTOHL (0x7450726f),
-+  ACE_NTOHL (0x66696c65),
-+  ACE_NTOHL (0x3a312e30),
-+  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/IOP/MultipleComponentProfile:1.0
-+    25,
-+  ACE_NTOHL (0x4d756c74),
-+  ACE_NTOHL (0x69706c65),
-+  ACE_NTOHL (0x436f6d70),
-+  ACE_NTOHL (0x6f6e656e),
-+  ACE_NTOHL (0x7450726f),
-+  ACE_NTOHL (0x66696c65),
-+  ACE_NTOHL (0x0),  // name = MultipleComponentProfile
-+    CORBA::tk_sequence, // typecode kind
-+  264, // encapsulation length
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+    CORBA::tk_struct, // typecode kind
-+    248, // encapsulation length
-+      TAO_ENCAP_BYTE_ORDER, // byte order
-+      36,
-+      ACE_NTOHL (0x49444c3a),
-+      ACE_NTOHL (0x6f6d672e),
-+      ACE_NTOHL (0x6f72672f),
-+      ACE_NTOHL (0x494f502f),
-+      ACE_NTOHL (0x54616767),
-+      ACE_NTOHL (0x6564436f),
-+      ACE_NTOHL (0x6d706f6e),
-+      ACE_NTOHL (0x656e743a),
-+      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
-+            16,
-+      ACE_NTOHL (0x54616767),
-+      ACE_NTOHL (0x6564436f),
-+      ACE_NTOHL (0x6d706f6e),
-+      ACE_NTOHL (0x656e7400),  // name = TaggedComponent
-+      2, // member count
-+            4,
-+      ACE_NTOHL (0x74616700),  // name = tag
-+            CORBA::tk_alias, // typecode kind for typedefs
-+      60, // encapsulation length
-+        TAO_ENCAP_BYTE_ORDER, // byte order
-+        32,
-+        ACE_NTOHL (0x49444c3a),
-+        ACE_NTOHL (0x6f6d672e),
-+        ACE_NTOHL (0x6f72672f),
-+        ACE_NTOHL (0x494f502f),
-+        ACE_NTOHL (0x436f6d70),
-+        ACE_NTOHL (0x6f6e656e),
-+        ACE_NTOHL (0x7449643a),
-+        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
-+                12,
-+        ACE_NTOHL (0x436f6d70),
-+        ACE_NTOHL (0x6f6e656e),
-+        ACE_NTOHL (0x74496400),  // name = ComponentId
-+                CORBA::tk_ulong,
-+
-+
-+      15,
-+      ACE_NTOHL (0x636f6d70),
-+      ACE_NTOHL (0x6f6e656e),
-+      ACE_NTOHL (0x745f6461),
-+      ACE_NTOHL (0x74610000),  // name = component_data
-+            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 (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,
-+
-+          0U,
-+
-+
-+
-+    0U,
-+
-+};
-+
-+static CORBA::TypeCode _tc_TAO_tc_IOP_MultipleComponentProfile (
-+    CORBA::tk_alias,
-+    sizeof (_oc_IOP_MultipleComponentProfile),
-+    (char *) &_oc_IOP_MultipleComponentProfile,
-+    0,
-+    sizeof (IOP::MultipleComponentProfile)
-+  );
-+
-+namespace IOP
-+{
-+  ::CORBA::TypeCode_ptr _tc_MultipleComponentProfile =
-+    &_tc_TAO_tc_IOP_MultipleComponentProfile;
-+}
-+
-+// TAO_IDL - Generated from
-+// be/be_visitor_typecode/typecode_defn.cpp:284
-+
-+static const CORBA::Long _oc_IOP_TaggedComponentList[] =
-+{
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+  40,
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x6f6d672e),
-+  ACE_NTOHL (0x6f72672f),
-+  ACE_NTOHL (0x494f502f),
-+  ACE_NTOHL (0x54616767),
-+  ACE_NTOHL (0x6564436f),
-+  ACE_NTOHL (0x6d706f6e),
-+  ACE_NTOHL (0x656e744c),
-+  ACE_NTOHL (0x6973743a),
-+  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponentList:1.0
-+    20,
-+  ACE_NTOHL (0x54616767),
-+  ACE_NTOHL (0x6564436f),
-+  ACE_NTOHL (0x6d706f6e),
-+  ACE_NTOHL (0x656e744c),
-+  ACE_NTOHL (0x69737400),  // name = TaggedComponentList
-+    CORBA::tk_sequence, // typecode kind
-+  264, // encapsulation length
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+    CORBA::tk_struct, // typecode kind
-+    248, // encapsulation length
-+      TAO_ENCAP_BYTE_ORDER, // byte order
-+      36,
-+      ACE_NTOHL (0x49444c3a),
-+      ACE_NTOHL (0x6f6d672e),
-+      ACE_NTOHL (0x6f72672f),
-+      ACE_NTOHL (0x494f502f),
-+      ACE_NTOHL (0x54616767),
-+      ACE_NTOHL (0x6564436f),
-+      ACE_NTOHL (0x6d706f6e),
-+      ACE_NTOHL (0x656e743a),
-+      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
-+            16,
-+      ACE_NTOHL (0x54616767),
-+      ACE_NTOHL (0x6564436f),
-+      ACE_NTOHL (0x6d706f6e),
-+      ACE_NTOHL (0x656e7400),  // name = TaggedComponent
-+      2, // member count
-+            4,
-+      ACE_NTOHL (0x74616700),  // name = tag
-+            CORBA::tk_alias, // typecode kind for typedefs
-+      60, // encapsulation length
-+        TAO_ENCAP_BYTE_ORDER, // byte order
-+        32,
-+        ACE_NTOHL (0x49444c3a),
-+        ACE_NTOHL (0x6f6d672e),
-+        ACE_NTOHL (0x6f72672f),
-+        ACE_NTOHL (0x494f502f),
-+        ACE_NTOHL (0x436f6d70),
-+        ACE_NTOHL (0x6f6e656e),
-+        ACE_NTOHL (0x7449643a),
-+        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
-+                12,
-+        ACE_NTOHL (0x436f6d70),
-+        ACE_NTOHL (0x6f6e656e),
-+        ACE_NTOHL (0x74496400),  // name = ComponentId
-+                CORBA::tk_ulong,
-+
-+
-+      15,
-+      ACE_NTOHL (0x636f6d70),
-+      ACE_NTOHL (0x6f6e656e),
-+      ACE_NTOHL (0x745f6461),
-+      ACE_NTOHL (0x74610000),  // name = component_data
-+            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 (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,
-+
-+          0U,
-+
-+
-+
-+    0U,
-+
-+};
-+
-+static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponentList (
-+    CORBA::tk_alias,
-+    sizeof (_oc_IOP_TaggedComponentList),
-+    (char *) &_oc_IOP_TaggedComponentList,
-+    0,
-+    sizeof (IOP::TaggedComponentList)
-+  );
-+
-+namespace IOP
-+{
-+  ::CORBA::TypeCode_ptr _tc_TaggedComponentList =
-+    &_tc_TAO_tc_IOP_TaggedComponentList;
-+}
-+
-+// TAO_IDL - Generated from
-+// be/be_visitor_typecode/typecode_defn.cpp:284
-+
-+static const CORBA::Long _oc_IOP_TaggedComponentSeq[] =
-+{
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+  39,
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x6f6d672e),
-+  ACE_NTOHL (0x6f72672f),
-+  ACE_NTOHL (0x494f502f),
-+  ACE_NTOHL (0x54616767),
-+  ACE_NTOHL (0x6564436f),
-+  ACE_NTOHL (0x6d706f6e),
-+  ACE_NTOHL (0x656e7453),
-+  ACE_NTOHL (0x65713a31),
-+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/TaggedComponentSeq:1.0
-+    19,
-+  ACE_NTOHL (0x54616767),
-+  ACE_NTOHL (0x6564436f),
-+  ACE_NTOHL (0x6d706f6e),
-+  ACE_NTOHL (0x656e7453),
-+  ACE_NTOHL (0x65710000),  // name = TaggedComponentSeq
-+    CORBA::tk_sequence, // typecode kind
-+  264, // encapsulation length
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+    CORBA::tk_struct, // typecode kind
-+    248, // encapsulation length
-+      TAO_ENCAP_BYTE_ORDER, // byte order
-+      36,
-+      ACE_NTOHL (0x49444c3a),
-+      ACE_NTOHL (0x6f6d672e),
-+      ACE_NTOHL (0x6f72672f),
-+      ACE_NTOHL (0x494f502f),
-+      ACE_NTOHL (0x54616767),
-+      ACE_NTOHL (0x6564436f),
-+      ACE_NTOHL (0x6d706f6e),
-+      ACE_NTOHL (0x656e743a),
-+      ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/TaggedComponent:1.0
-+            16,
-+      ACE_NTOHL (0x54616767),
-+      ACE_NTOHL (0x6564436f),
-+      ACE_NTOHL (0x6d706f6e),
-+      ACE_NTOHL (0x656e7400),  // name = TaggedComponent
-+      2, // member count
-+            4,
-+      ACE_NTOHL (0x74616700),  // name = tag
-+            CORBA::tk_alias, // typecode kind for typedefs
-+      60, // encapsulation length
-+        TAO_ENCAP_BYTE_ORDER, // byte order
-+        32,
-+        ACE_NTOHL (0x49444c3a),
-+        ACE_NTOHL (0x6f6d672e),
-+        ACE_NTOHL (0x6f72672f),
-+        ACE_NTOHL (0x494f502f),
-+        ACE_NTOHL (0x436f6d70),
-+        ACE_NTOHL (0x6f6e656e),
-+        ACE_NTOHL (0x7449643a),
-+        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/IOP/ComponentId:1.0
-+                12,
-+        ACE_NTOHL (0x436f6d70),
-+        ACE_NTOHL (0x6f6e656e),
-+        ACE_NTOHL (0x74496400),  // name = ComponentId
-+                CORBA::tk_ulong,
-+
-+
-+      15,
-+      ACE_NTOHL (0x636f6d70),
-+      ACE_NTOHL (0x6f6e656e),
-+      ACE_NTOHL (0x745f6461),
-+      ACE_NTOHL (0x74610000),  // name = component_data
-+            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 (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,
-+
-+          0U,
-+
-+
-+
-+    0U,
-+
-+};
-+
-+static CORBA::TypeCode _tc_TAO_tc_IOP_TaggedComponentSeq (
-+    CORBA::tk_alias,
-+    sizeof (_oc_IOP_TaggedComponentSeq),
-+    (char *) &_oc_IOP_TaggedComponentSeq,
-+    0,
-+    sizeof (IOP::TaggedComponentSeq)
-+  );
-+
-+namespace IOP
-+{
-+  ::CORBA::TypeCode_ptr _tc_TaggedComponentSeq =
-+    &_tc_TAO_tc_IOP_TaggedComponentSeq;
-+}
-+
-+// TAO_IDL - Generated from
-+// be/be_visitor_typecode/typecode_defn.cpp:284
-+
-+static const CORBA::Long _oc_IOP_ServiceId[] =
-+{
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+  30,
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x6f6d672e),
-+  ACE_NTOHL (0x6f72672f),
-+  ACE_NTOHL (0x494f502f),
-+  ACE_NTOHL (0x53657276),
-+  ACE_NTOHL (0x69636549),
-+  ACE_NTOHL (0x643a312e),
-+  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
-+    10,
-+  ACE_NTOHL (0x53657276),
-+  ACE_NTOHL (0x69636549),
-+  ACE_NTOHL (0x64000000),  // name = ServiceId
-+    CORBA::tk_ulong,
-+
-+};
-+
-+static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceId (
-+    CORBA::tk_alias,
-+    sizeof (_oc_IOP_ServiceId),
-+    (char *) &_oc_IOP_ServiceId,
-+    0,
-+    sizeof (IOP::ServiceId)
-+  );
-+
-+namespace IOP
-+{
-+  ::CORBA::TypeCode_ptr _tc_ServiceId =
-+    &_tc_TAO_tc_IOP_ServiceId;
-+}
-+
-+// TAO_IDL - Generated from
-+// be/be_visitor_typecode/typecode_defn.cpp:284
-+
-+static const CORBA::Long _oc_IOP_ServiceContext[] =
-+{
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+  35,
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x6f6d672e),
-+  ACE_NTOHL (0x6f72672f),
-+  ACE_NTOHL (0x494f502f),
-+  ACE_NTOHL (0x53657276),
-+  ACE_NTOHL (0x69636543),
-+  ACE_NTOHL (0x6f6e7465),
-+  ACE_NTOHL (0x78743a31),
-+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContext:1.0
-+    15,
-+  ACE_NTOHL (0x53657276),
-+  ACE_NTOHL (0x69636543),
-+  ACE_NTOHL (0x6f6e7465),
-+  ACE_NTOHL (0x78740000),  // name = ServiceContext
-+  2, // member count
-+    11,
-+  ACE_NTOHL (0x636f6e74),
-+  ACE_NTOHL (0x6578745f),
-+  ACE_NTOHL (0x69640000),  // name = context_id
-+    CORBA::tk_alias, // typecode kind for typedefs
-+  60, // encapsulation length
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+    30,
-+    ACE_NTOHL (0x49444c3a),
-+    ACE_NTOHL (0x6f6d672e),
-+    ACE_NTOHL (0x6f72672f),
-+    ACE_NTOHL (0x494f502f),
-+    ACE_NTOHL (0x53657276),
-+    ACE_NTOHL (0x69636549),
-+    ACE_NTOHL (0x643a312e),
-+    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
-+        10,
-+    ACE_NTOHL (0x53657276),
-+    ACE_NTOHL (0x69636549),
-+    ACE_NTOHL (0x64000000),  // name = ServiceId
-+        CORBA::tk_ulong,
-+
-+
-+  13,
-+  ACE_NTOHL (0x636f6e74),
-+  ACE_NTOHL (0x6578745f),
-+  ACE_NTOHL (0x64617461),
-+  ACE_NTOHL (0x0),  // name = context_data
-+    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 (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,
-+
-+      0U,
-+
-+
-+};
-+
-+static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceContext (
-+    CORBA::tk_struct,
-+    sizeof (_oc_IOP_ServiceContext),
-+    (char *) &_oc_IOP_ServiceContext,
-+    0,
-+    sizeof (IOP::ServiceContext)
-+  );
-+
-+namespace IOP
-+{
-+  ::CORBA::TypeCode_ptr _tc_ServiceContext =
-+    &_tc_TAO_tc_IOP_ServiceContext;
-+}
-+
-+
-+// TAO_IDL - Generated from
-+// be/be_visitor_typecode/typecode_defn.cpp:284
-+
-+static const CORBA::Long _oc_IOP_ServiceContextList[] =
-+{
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+  39,
-+  ACE_NTOHL (0x49444c3a),
-+  ACE_NTOHL (0x6f6d672e),
-+  ACE_NTOHL (0x6f72672f),
-+  ACE_NTOHL (0x494f502f),
-+  ACE_NTOHL (0x53657276),
-+  ACE_NTOHL (0x69636543),
-+  ACE_NTOHL (0x6f6e7465),
-+  ACE_NTOHL (0x78744c69),
-+  ACE_NTOHL (0x73743a31),
-+  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContextList:1.0
-+    19,
-+  ACE_NTOHL (0x53657276),
-+  ACE_NTOHL (0x69636543),
-+  ACE_NTOHL (0x6f6e7465),
-+  ACE_NTOHL (0x78744c69),
-+  ACE_NTOHL (0x73740000),  // name = ServiceContextList
-+    CORBA::tk_sequence, // typecode kind
-+  272, // encapsulation length
-+    TAO_ENCAP_BYTE_ORDER, // byte order
-+    CORBA::tk_struct, // typecode kind
-+    256, // encapsulation length
-+      TAO_ENCAP_BYTE_ORDER, // byte order
-+      35,
-+      ACE_NTOHL (0x49444c3a),
-+      ACE_NTOHL (0x6f6d672e),
-+      ACE_NTOHL (0x6f72672f),
-+      ACE_NTOHL (0x494f502f),
-+      ACE_NTOHL (0x53657276),
-+      ACE_NTOHL (0x69636543),
-+      ACE_NTOHL (0x6f6e7465),
-+      ACE_NTOHL (0x78743a31),
-+      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/IOP/ServiceContext:1.0
-+            15,
-+      ACE_NTOHL (0x53657276),
-+      ACE_NTOHL (0x69636543),
-+      ACE_NTOHL (0x6f6e7465),
-+      ACE_NTOHL (0x78740000),  // name = ServiceContext
-+      2, // member count
-+            11,
-+      ACE_NTOHL (0x636f6e74),
-+      ACE_NTOHL (0x6578745f),
-+      ACE_NTOHL (0x69640000),  // name = context_id
-+            CORBA::tk_alias, // typecode kind for typedefs
-+      60, // encapsulation length
-+        TAO_ENCAP_BYTE_ORDER, // byte order
-+        30,
-+        ACE_NTOHL (0x49444c3a),
-+        ACE_NTOHL (0x6f6d672e),
-+        ACE_NTOHL (0x6f72672f),
-+        ACE_NTOHL (0x494f502f),
-+        ACE_NTOHL (0x53657276),
-+        ACE_NTOHL (0x69636549),
-+        ACE_NTOHL (0x643a312e),
-+        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IOP/ServiceId:1.0
-+                10,
-+        ACE_NTOHL (0x53657276),
-+        ACE_NTOHL (0x69636549),
-+        ACE_NTOHL (0x64000000),  // name = ServiceId
-+                CORBA::tk_ulong,
-+
-+
-+      13,
-+      ACE_NTOHL (0x636f6e74),
-+      ACE_NTOHL (0x6578745f),
-+      ACE_NTOHL (0x64617461),
-+      ACE_NTOHL (0x0),  // name = context_data
-+            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 (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,
-+
-+          0U,
-+
-+
-+
-+    0U,
-+
-+};
-+
-+static CORBA::TypeCode _tc_TAO_tc_IOP_ServiceContextList (
-+    CORBA::tk_alias,
-+    sizeof (_oc_IOP_ServiceContextList),
-+    (char *) &_oc_IOP_ServiceContextList,
-+    0,
-+    sizeof (IOP::ServiceContextList)
-+  );
-+
-+namespace IOP
-+{
-+  ::CORBA::TypeCode_ptr _tc_ServiceContextList =
-+    &_tc_TAO_tc_IOP_ServiceContextList;
-+}
-+
-+
- // TAO_IDL - Generated from 
- // be/be_visitor_structure/any_op_cs.cpp:54
- 
diff --git a/TAO/tao/diffs/Messaging_PolicyValue.diff b/TAO/tao/diffs/Messaging_PolicyValue.diff
deleted file mode 100644
index 43cc6206942..00000000000
--- a/TAO/tao/diffs/Messaging_PolicyValue.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- orig/Messaging_PolicyValueC.h	Fri Feb  8 14:42:47 2002
-+++ Messaging_PolicyValueC.h	Fri Feb  8 14:43:59 2002
-@@ -23,7 +23,7 @@
- #define _TAO_IDL_ORIG_MESSAGING_POLICYVALUEC_H_
- 
- #include "ace/pre.h"
--#include "tao/corba.h"
-+#include "tao/corbafwd.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
-@@ -31,6 +31,7 @@
- 
- #include "TAO_Export.h"
- #include "IOPC.h"
-+#include "Sequence.h"
- 
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/diffs/Messaging_SyncScope.diff b/TAO/tao/diffs/Messaging_SyncScope.diff
deleted file mode 100644
index c894662dc39..00000000000
--- a/TAO/tao/diffs/Messaging_SyncScope.diff
+++ /dev/null
@@ -1,38 +0,0 @@
---- orig/Messaging_SyncScopeC.h	Wed Apr 17 14:02:07 2002
-+++ Messaging_SyncScopeC.h	Wed Apr 17 14:03:14 2002
-@@ -23,14 +23,13 @@
- #define _TAO_IDL_ORIG_MESSAGING_SYNCSCOPEC_H_
- 
- #include "ace/pre.h"
--#include "tao/corba.h"
-+
-+#include "corbafwd.h"
- 
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
--#include "corbafwd.h"
--
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
- #endif
---- orig/Messaging_SyncScopeC.cpp	Wed Apr 17 14:02:07 2002
-+++ Messaging_SyncScopeC.cpp	Wed Apr 17 14:05:32 2002
-@@ -21,15 +21,7 @@
- 
- #include "Messaging_SyncScopeC.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/Typecode.h"
- 
- #if defined (__BORLANDC__)
- #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
diff --git a/TAO/tao/diffs/Object_Key.diff b/TAO/tao/diffs/Object_Key.diff
index 6da8548d36c..608b5afb5a2 100644
--- a/TAO/tao/diffs/Object_Key.diff
+++ b/TAO/tao/diffs/Object_Key.diff
@@ -1,20 +1,28 @@
---- orig/Object_KeyC.cpp	2004-11-30 17:27:03.904264000 +0100
-+++ Object_KeyC.cpp	2004-11-30 17:27:55.438366400 +0100
+--- orig/Object_KeyC.cpp	2005-02-16 21:43:09.756739200 +0100
++++ Object_KeyC.cpp	2005-02-16 21:45:11.431699200 +0100
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
 @@ -41,6 +41,10 @@
  #include "Object_KeyC.inl"
  #endif /* !defined INLINE */
-
+ 
 +#include "ace/ACE.h"
 +#include "ace/OS_NS_string.h"
 +#include "ace/os_include/os_ctype.h"
 +
  // TAO_IDL - Generated from
- // be\be_visitor_arg_traits.cpp:64
-
+ // be\be_visitor_arg_traits.cpp:66
+ 
 @@ -92,6 +96,150 @@
  TAO::ObjectKey::~ObjectKey (void)
  {}
-
+ 
 +// Hand crafted.
 +
 +void
@@ -143,7 +151,7 @@
 +      ACE_Message_Block::DONT_DELETE))
 +      {
 +        TAO_Unbounded_Sequence<CORBA::Octet> *oseq =
-+          static_cast <TAO_Unbounded_Sequence<CORBA::Octet>*> (&key);
++          static_cast<TAO_Unbounded_Sequence<CORBA::Octet>*> (&key);
 +        oseq->replace (_tao_seq_len, strm.start ());
 +        oseq->mb ()->wr_ptr (oseq->mb()->rd_ptr () + _tao_seq_len);
 +        strm.skip_bytes (_tao_seq_len);
@@ -160,10 +168,18 @@
 +}
 +
  #endif /* end #if !defined */
-
+ 
  // TAO_IDL - Generated from
---- orig/Object_KeyC.h	2004-11-30 17:27:03.904264000 +0100
-+++ Object_KeyC.h	2004-11-30 17:27:30.252150400 +0100
+--- orig/Object_KeyC.h	2005-02-16 21:43:09.756739200 +0100
++++ Object_KeyC.h	2005-02-16 21:44:04.235075200 +0100
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
 @@ -124,6 +124,25 @@
        )
        : TAO_Unbounded_Sequence<CORBA::Octet> (length, mb) {}
@@ -188,5 +204,5 @@
 +    static CORBA::Boolean demarshal_key (ObjectKey &key,
 +                                         TAO_InputCDR &cdr);
    };
-
+ 
  #endif /* end #if !defined */
diff --git a/TAO/tao/diffs/Pollable.diff b/TAO/tao/diffs/Pollable.diff
deleted file mode 100644
index f326e46cd7e..00000000000
--- a/TAO/tao/diffs/Pollable.diff
+++ /dev/null
@@ -1,45 +0,0 @@
---- orig/PollableC.h	Tue Feb  5 15:23:35 2002
-+++ PollableC.h	Tue Feb  5 15:26:57 2002
-@@ -23,13 +23,16 @@
- #define _TAO_IDL_ORIG_POLLABLEC_H_
- 
- #include "ace/pre.h"
--#include "tao/corba.h"
-+#include "tao/corbafwd.h"
- 
-+#if (TAO_HAS_AMI_POLLER == 1)
- #if !defined (ACE_LACKS_PRAGMA_ONCE)
- # pragma once
- #endif /* ACE_LACKS_PRAGMA_ONCE */
- 
- #include "TAO_Export.h"
-+#include "Exception.h"
-+#include "Object.h"
- 
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
-@@ -676,6 +679,8 @@
- #if defined (__BORLANDC__)
- #pragma option pop
- #endif /* __BORLANDC__ */
-+
-+#endif /* TAO_HAS_AMI_POLLER == 1 */
- 
- #include "ace/post.h"
- #endif /* ifndef */
---- orig/PollableC.cpp	Tue Feb  5 15:23:35 2002
-+++ PollableC.cpp	Tue Feb  5 15:26:06 2002
-@@ -21,6 +21,8 @@
- 
- #include "PollableC.h"
- 
-+#if (TAO_HAS_AMI_POLLER == 1)
-+
- #include "tao/Stub.h"
- #include "tao/Invocation.h"
- #include "tao/PortableInterceptor.h"
-@@ -1131,3 +1133,4 @@
-   #  pragma instantiate TAO_Object_Manager<CORBA::PollableSet,CORBA::PollableSet_var>
- #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
- 
-+#endif /* TAO_HAS_AMI_POLLER == 1 */
diff --git a/TAO/tao/diffs/PortableInterceptor.diff b/TAO/tao/diffs/PortableInterceptor.diff
index a492ae7c8f5..6da84cb45c0 100644
--- a/TAO/tao/diffs/PortableInterceptor.diff
+++ b/TAO/tao/diffs/PortableInterceptor.diff
@@ -1,22 +1,31 @@
---- orig/PortableInterceptorC.h	2004-12-11 16:46:29.861737600 +0100
-+++ PortableInterceptorC.h	2004-12-11 16:47:24.019612800 +0100
-@@ -50,10 +50,10 @@
+--- orig/PortableInterceptorC.h	2004-11-15 10:52:20.574179200 +0100
++++ PortableInterceptorC.h	2004-11-16 13:47:29.964508800 +0100
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -50,6 +50,12 @@
  
- #include "tao/PI_ForwardC.h"
  #include "tao/CurrentC.h"
--#include "tao/DynamicC.h"
- #include "tao/Messaging_SyncScopeC.h"
- #include "tao/IOP_CodecC.h"
- #include "tao/IOP_IORC.h"
-+#include "tao/PolicyC.h"
  
++#include "PI_ForwardC.h"
++#include "tao/Messaging_SyncScopeC.h"
++#include "tao/IOP_CodecC.h"
++#include "tao/PolicyC.h"
++#include "tao/CurrentC.h"
++
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
-@@ -76,6 +76,15 @@
+ #endif
+@@ -71,6 +77,15 @@
  #pragma option push -w-rvl -w-rch -w-ccc -w-inl
  #endif /* __BORLANDC__ */
  
-+// Hand crafted, keep DynamicC.h out of header files.
++// Hand crafted, keeps DynamicC.h and Typecode.h out of header files.
 +namespace Dynamic
 +{
 +  class ParameterList;
@@ -26,9 +35,9 @@
 +}
 +
  // TAO_IDL - Generated from 
- // be\be_visitor_root/root_ch.cpp:62
+ // be\be_visitor_root/root_ch.cpp:63
  
-@@ -1324,17 +1333,19 @@
+@@ -1315,17 +1330,19 @@
      
      // TAO_IDL - Generated from
      // be\be_visitor_operation/operation_ch.cpp:46
@@ -38,7 +47,7 @@
          ::PortableInterceptor::ServerRequestInfo_ptr ri,
 -        ::CORBA::OctetSeq_out os
 -        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-+        ::CORBA::OctetSeq_out
++        CORBA::OctetSeq_out
 +        ACE_ENV_ARG_DECL_NOT_USED
        )
        ACE_THROW_SPEC ((
@@ -51,7 +60,7 @@
      // TAO_IDL - Generated from
      // be\be_visitor_operation/operation_ch.cpp:46
      
-@@ -1481,6 +1492,16 @@
+@@ -1472,6 +1489,16 @@
      
      static void _tao_any_destructor (void *);
      
@@ -68,9 +77,45 @@
      // TAO_IDL - Generated from
      // be\be_visitor_operation/operation_ch.cpp:46
      
---- orig/PortableInterceptorC.cpp	2004-12-11 16:46:29.861737600 +0100
-+++ PortableInterceptorC.cpp	2004-12-11 16:18:27.762998400 +0100
-@@ -1957,6 +1957,18 @@
+@@ -2144,27 +2171,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_)
+-#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_
+-  
+-  ACE_TEMPLATE_SPECIALIZATION
+-  struct TAO_Export Objref_Traits< ::PortableInterceptor::IORInterceptor>
+-  {
+-    static ::PortableInterceptor::IORInterceptor_ptr duplicate (
+-        ::PortableInterceptor::IORInterceptor_ptr
+-      );
+-    static void release (
+-        ::PortableInterceptor::IORInterceptor_ptr
+-      );
+-    static ::PortableInterceptor::IORInterceptor_ptr nil (void);
+-    static CORBA::Boolean marshal (
+-        ::PortableInterceptor::IORInterceptor_ptr p,
+-        TAO_OutputCDR & cdr
+-      );
+-  };
+-
+-#endif /* end #if !defined */
+-
+ #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_)
+ #define _PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_
+   
+--- orig/PortableInterceptorC.cpp	2004-11-15 10:52:20.574179200 +0100
++++ PortableInterceptorC.cpp	2004-11-15 10:57:37.000000000 +0100
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -2015,6 +2015,18 @@
    return 0;
  }
  
diff --git a/TAO/tao/diffs/Typecode_types.diff b/TAO/tao/diffs/Typecode_types.diff
index 6579f8485a1..43ee8a1e47c 100644
--- a/TAO/tao/diffs/Typecode_types.diff
+++ b/TAO/tao/diffs/Typecode_types.diff
@@ -1,21 +1,9 @@
---- orig/Typecode_typesC.h	2004-11-17 09:35:41.096556800 +0100
-+++ Typecode_typesC.h	2004-11-24 13:44:21.270441600 +0100
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -71,30 +71,6 @@
+--- orig/Typecode_typesC.h	2005-02-11 12:21:03.236505600 +0100
++++ Typecode_typesC.h	2005-02-11 12:22:23.181460800 +0100
+@@ -75,26 +75,6 @@
+   // TAO_IDL - Generated from
+   // be\be_interface.cpp:598
  
- namespace CORBA
- {
--  
--  // TAO_IDL - Generated from
--  // be\be_interface.cpp:603
--
 -#if !defined (_CORBA_TYPECODE__VAR_OUT_CH_)
 -#define _CORBA_TYPECODE__VAR_OUT_CH_
 -  
@@ -39,7 +27,7 @@
    // TAO_IDL - Generated from
    // be\be_visitor_enum/enum_ch.cpp:57
    
-@@ -137,6 +113,11 @@
+@@ -137,6 +117,11 @@
      tk_component,
      tk_home,
      tk_event
@@ -51,7 +39,7 @@
    };
    
    typedef TCKind &TCKind_out;
-@@ -155,13 +136,6 @@
+@@ -155,13 +140,6 @@
  }
  
  // TAO_IDL - Generated from
diff --git a/TAO/tao/orb.idl b/TAO/tao/orb.idl
index ea2b03bdbf4..4d0e7a8fe94 100644
--- a/TAO/tao/orb.idl
+++ b/TAO/tao/orb.idl
@@ -36,6 +36,8 @@
 #include <tao/ParameterMode.pidl>
 #include <tao/orb_types.pidl>
 #include <tao/Typecode_types.pidl>
+#include <tao/Visibility.pidl>
+#include <tao/ValueModifier.pidl>
 
 #pragma prefix "omg.org"
 
@@ -55,16 +57,6 @@ module CORBA
     USER_EXCEPTION,
     SYSTEM_EXCEPTION
   };
-
-  typedef short ValueModifier;
-  const ValueModifier VM_NONE = 0;
-  const ValueModifier VM_CUSTOM = 1;
-  const ValueModifier VM_ABSTRACT = 2;
-  const ValueModifier VM_TRUNCATABLE = 3;
-
-  typedef short Visibility;
-  const Visibility PRIVATE_MEMBER = 0;
-  const Visibility PUBLIC_MEMBER = 1;
 };
 
 #endif /* TAO_ORB_IDL */
diff --git a/TAO/tao/orb_typesA.cpp b/TAO/tao/orb_typesA.cpp
index 9bd9e9f21ca..798d311e29b 100644
--- a/TAO/tao/orb_typesA.cpp
+++ b/TAO/tao/orb_typesA.cpp
@@ -27,25 +27,27 @@
 
 #include "orb_typesC.h"
 #include "tao/Typecode.h"
+#include "tao/CDR.h"
+#include "tao/Any.h"
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_ORBid[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   28,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4f52),
-  ACE_NTOHL (0x4269643a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4f52), 
+  ACE_NTOHL (0x4269643a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ORBid:1.0
     6,
-  ACE_NTOHL (0x4f524269),
+  ACE_NTOHL (0x4f524269), 
   ACE_NTOHL (0x64000000),  // name = ORBid
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -54,7 +56,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_ORBid (
     sizeof (_oc_CORBA_ORBid),
     (char *) &_oc_CORBA_ORBid,
     0,
-    sizeof (CORBA::ORBid)
+    0
   );
 
 namespace CORBA
@@ -64,21 +66,21 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_Flags[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   28,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f466c),
-  ACE_NTOHL (0x6167733a),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f466c), 
+  ACE_NTOHL (0x6167733a), 
   ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/Flags:1.0
     6,
-  ACE_NTOHL (0x466c6167),
+  ACE_NTOHL (0x466c6167), 
   ACE_NTOHL (0x73000000),  // name = Flags
     CORBA::tk_ulong,
 
@@ -89,7 +91,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Flags (
     sizeof (_oc_CORBA_Flags),
     (char *) &_oc_CORBA_Flags,
     0,
-    sizeof (CORBA::Flags)
+    0
   );
 
 namespace CORBA
@@ -99,26 +101,26 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_Identifier[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f4964),
-  ACE_NTOHL (0x656e7469),
-  ACE_NTOHL (0x66696572),
-  ACE_NTOHL (0x3a312e30),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f4964), 
+  ACE_NTOHL (0x656e7469), 
+  ACE_NTOHL (0x66696572), 
+  ACE_NTOHL (0x3a312e30), 
   ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
     11,
-  ACE_NTOHL (0x4964656e),
-  ACE_NTOHL (0x74696669),
+  ACE_NTOHL (0x4964656e), 
+  ACE_NTOHL (0x74696669), 
   ACE_NTOHL (0x65720000),  // name = Identifier
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -127,7 +129,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_Identifier (
     sizeof (_oc_CORBA_Identifier),
     (char *) &_oc_CORBA_Identifier,
     0,
-    sizeof (CORBA::Identifier)
+    0
   );
 
 namespace CORBA
@@ -137,27 +139,27 @@ namespace CORBA
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:290
+// be\be_visitor_typecode/typecode_defn.cpp:295
 
 static const CORBA::Long _oc_CORBA_RepositoryId[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
   35,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x6f6d672e),
-  ACE_NTOHL (0x6f72672f),
-  ACE_NTOHL (0x434f5242),
-  ACE_NTOHL (0x412f5265),
-  ACE_NTOHL (0x706f7369),
-  ACE_NTOHL (0x746f7279),
-  ACE_NTOHL (0x49643a31),
+  ACE_NTOHL (0x49444c3a), 
+  ACE_NTOHL (0x6f6d672e), 
+  ACE_NTOHL (0x6f72672f), 
+  ACE_NTOHL (0x434f5242), 
+  ACE_NTOHL (0x412f5265), 
+  ACE_NTOHL (0x706f7369), 
+  ACE_NTOHL (0x746f7279), 
+  ACE_NTOHL (0x49643a31), 
   ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
     13,
-  ACE_NTOHL (0x5265706f),
-  ACE_NTOHL (0x7369746f),
-  ACE_NTOHL (0x72794964),
+  ACE_NTOHL (0x5265706f), 
+  ACE_NTOHL (0x7369746f), 
+  ACE_NTOHL (0x72794964), 
   ACE_NTOHL (0x0),  // name = RepositoryId
-    CORBA::tk_string,
+    CORBA::tk_string, 
   0U, // string length
 };
 
@@ -166,7 +168,7 @@ static CORBA::TypeCode _tc_TAO_tc_CORBA_RepositoryId (
     sizeof (_oc_CORBA_RepositoryId),
     (char *) &_oc_CORBA_RepositoryId,
     0,
-    sizeof (CORBA::RepositoryId)
+    0
   );
 
 namespace CORBA
@@ -174,9 +176,3 @@ namespace CORBA
   ::CORBA::TypeCode_ptr _tc_RepositoryId =
     &_tc_TAO_tc_CORBA_RepositoryId;
 }
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/orb_typesC.cpp b/TAO/tao/orb_typesC.cpp
index 6ed61175f1f..afbdd3f6b3e 100644
--- a/TAO/tao/orb_typesC.cpp
+++ b/TAO/tao/orb_typesC.cpp
@@ -26,12 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:303
+// be\be_codegen.cpp:302
 
 
 #include "orb_typesC.h"
 #include "tao/CDR.h"
-#include "tao/Typecode.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -42,19 +41,10 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:64
+// be\be_visitor_arg_traits.cpp:66
 
 // Arg traits specializations.
 namespace TAO
 {
 }
 
-
-// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1629
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
diff --git a/TAO/tao/orb_typesC.h b/TAO/tao/orb_typesC.h
index 488aed65ef8..5c53cd5d373 100644
--- a/TAO/tao/orb_typesC.h
+++ b/TAO/tao/orb_typesC.h
@@ -40,6 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/TAO_Export.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 
@@ -56,9 +57,7 @@
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
-#if (_MSC_VER >= 1200)
 #pragma warning(push)
-#endif /* _MSC_VER >= 1200 */
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
@@ -71,52 +70,52 @@
 
 namespace CORBA
 {
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:376
-
+  // be\be_visitor_typedef/typedef_ch.cpp:413
+  
   typedef char * ORBid;
   typedef CORBA::String_var ORBid_var;
   typedef CORBA::String_out ORBid_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_ORBid;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:342
-
+  // be\be_visitor_typedef/typedef_ch.cpp:379
+  
   typedef CORBA::ULong Flags;
   typedef CORBA::ULong_out Flags_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Flags;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:376
-
+  // be\be_visitor_typedef/typedef_ch.cpp:413
+  
   typedef char * Identifier;
   typedef CORBA::String_var Identifier_var;
   typedef CORBA::String_out Identifier_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Identifier;
-
+  
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:376
-
+  // be\be_visitor_typedef/typedef_ch.cpp:413
+  
   typedef char * RepositoryId;
   typedef CORBA::String_var RepositoryId_var;
   typedef CORBA::String_out RepositoryId_out;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-
+  
   TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_RepositoryId;
 
 // TAO_IDL - Generated from
@@ -133,13 +132,13 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:964
+// be\be_codegen.cpp:961
 
 #if defined (__ACE_INLINE__)
 #include "orb_typesC.inl"
 #endif /* defined INLINE */
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
+#if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
diff --git a/TAO/tao/orbconf.h b/TAO/tao/orbconf.h
index d011a434e87..74f89e9e568 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -316,7 +316,7 @@ const size_t TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE = 128;
 
 // The Root POA default name.
 #if !defined (TAO_DEFAULT_ROOTPOA_NAME)
-#define TAO_DEFAULT_ROOTPOA_NAME   ""
+#define TAO_DEFAULT_ROOTPOA_NAME   "RootPOA"
 #endif /* TAO_DEFAULT_ROOTPOA_NAME */
 
 // The default lane name used when storing endpoints.
diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc
index 2d279cf2d1b..7e8844874db 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -268,6 +268,8 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     UTF16_BOM_Factory.cpp
     UTF16_BOM_Translator.cpp
     Valuetype_Adapter.cpp
+    ValueModifierC.cpp
+    VisibilityC.cpp
     Wait_On_Leader_Follower.cpp
     Wait_On_LF_No_Upcall.cpp
     Wait_On_Reactor.cpp
@@ -362,6 +364,7 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     CORBANAME_Parser.h
     CORBA_String.h
     CurrentC.h
+    CurrentS.h
     debug.h
     default_client.h
     Default_Collocation_Resolver.h
@@ -508,6 +511,7 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     PolicyC.h
     PolicyFactory_Registry.h
     Policy_ForwardC.h
+    Policy_ForwardS.h
     Policy_Manager.h
     Policy_Set.h
     PolicyS.h
@@ -615,6 +619,8 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Var_Size_Argument_T.h
     Var_Size_SArgument_T.h
     Version.h
+    VisibilityC.h
+    ValueModifierC.h
     Wait_On_Leader_Follower.h
     Wait_On_LF_No_Upcall.h
     Wait_On_Reactor.h
diff --git a/TAO/tests/Big_Oneways/Big_Oneways.mpc b/TAO/tests/Big_Oneways/Big_Oneways.mpc
index e5b363828d2..85935126945 100644
--- a/TAO/tests/Big_Oneways/Big_Oneways.mpc
+++ b/TAO/tests/Big_Oneways/Big_Oneways.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     Coordinator.cpp
     Session_Control.cpp
diff --git a/TAO/tests/Bug_1495_Regression/interceptors.cpp b/TAO/tests/Bug_1495_Regression/interceptors.cpp
index 8bd1afdf527..a34890c0cc0 100644
--- a/TAO/tests/Bug_1495_Regression/interceptors.cpp
+++ b/TAO/tests/Bug_1495_Regression/interceptors.cpp
@@ -112,7 +112,7 @@ Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_lo
   if (CORBA::is_nil (forward_location))
     ACE_THROW (CORBA::INV_OBJREF (
                  CORBA::SystemException::_tao_minor_code (
-                   TAO_DEFAULT_MINOR_CODE,
+                   TAO::VMCID,
                    EINVAL),
                  CORBA::COMPLETED_NO));
   this->forward_location_ = CORBA::Object::_duplicate (forward_location);
diff --git a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
index 8fe3545b9e4..8ac82ecaa4e 100644
--- a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
+++ b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
@@ -3,6 +3,8 @@
 #include "testS.h"
 #include "ace/Task.h"
 #include "tao/PortableServer/Object_Adapter.h"
+#include "tao/PortableServer/POA_Current.h"
+#include "tao/PortableServer/POA_Current_Impl.h"
 
 ACE_RCSID(Collocation_Opportunities, Collocation_Opportunities, "$Id$")
 
@@ -68,10 +70,11 @@ test_i::method (ACE_ENV_SINGLE_ARG_DECL)
     }
   else
     {
-      TAO_POA_Current &tao_poa_current =
-        dynamic_cast<TAO_POA_Current &> (*(this->poa_current_.in ()));
+      TAO::Portable_Server::POA_Current &tao_poa_current =
+        dynamic_cast <TAO::Portable_Server::POA_Current &>
+                          (*(this->poa_current_.in ()));
 
-      TAO_POA_Current_Impl &tao_poa_current_implementation =
+      TAO::Portable_Server::POA_Current_Impl &tao_poa_current_implementation =
         *tao_poa_current.implementation ();
 
       const char *upcall = 0;
diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.mpc b/TAO/tests/Crashed_Callback/Crashed_Callback.mpc
index ac4b2b90fa4..d405de0c38d 100644
--- a/TAO/tests/Crashed_Callback/Crashed_Callback.mpc
+++ b/TAO/tests/Crashed_Callback/Crashed_Callback.mpc
@@ -1,17 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, messaging {
+project(*Server): taoserver, messaging {
   Source_Files {
     Service.cpp
     server.cpp
-  }  
+  }
 }
- 
+
 project(*Client): taoexe, portableserver, messaging {
   Source_Files {
     Crashed_Callback.cpp
     client.cpp
-  }  
+  }
 }
 
diff --git a/TAO/tests/DSI_Gateway/test_dsi.h b/TAO/tests/DSI_Gateway/test_dsi.h
index fb86a7d1ed3..05a1f7abb61 100644
--- a/TAO/tests/DSI_Gateway/test_dsi.h
+++ b/TAO/tests/DSI_Gateway/test_dsi.h
@@ -18,6 +18,7 @@
 
 #include "tao/DynamicInterface/Server_Request.h"
 #include "tao/DynamicInterface/Dynamic_Implementation.h"
+#include "tao/PortableServer/PortableServer.h"
 #include "tao/ORB.h"
 
 class DSI_Simple_Server : public TAO_DynamicImplementation
diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.cpp b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
index 567ebe4814b..217eacdae41 100644
--- a/TAO/tests/Exposed_Policies/Policy_Tester.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
@@ -93,7 +93,7 @@ Policy_Tester::init (int argc,
             {
               ACE_NEW_THROW_EX (this->rt_poa_properties_,
                                 RT_Properties,
-                                CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                                CORBA::NO_MEMORY (TAO::VMCID,
                                                   CORBA::COMPLETED_NO));
               ACE_CHECK_RETURN (-1);
             }
@@ -105,7 +105,7 @@ Policy_Tester::init (int argc,
             {
               ACE_NEW_THROW_EX (this->rt_object_properties_,
                                 RT_Properties,
-                                CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                                CORBA::NO_MEMORY (TAO::VMCID,
                                                   CORBA::COMPLETED_NO));
               ACE_CHECK_RETURN (-1);
             }
diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
index ed020572dc9..1fc9447c6f4 100644
--- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
@@ -52,7 +52,7 @@ Policy_Verifier::init (int argc,
             {
               ACE_NEW_THROW_EX (this->rt_poa_properties_,
                                 RT_Properties,
-                                CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                                CORBA::NO_MEMORY (TAO::VMCID,
                                                   CORBA::COMPLETED_NO));
               ACE_CHECK;
             }
@@ -67,7 +67,7 @@ Policy_Verifier::init (int argc,
             {
               ACE_NEW_THROW_EX (this->rt_object_properties_,
                                 RT_Properties,
-                                CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                                CORBA::NO_MEMORY (TAO::VMCID,
                                                   CORBA::COMPLETED_NO));
               ACE_CHECK;
             }
diff --git a/TAO/tests/Exposed_Policies/RT_Properties.cpp b/TAO/tests/Exposed_Policies/RT_Properties.cpp
index cd2965ec317..4a23c92f0f5 100644
--- a/TAO/tests/Exposed_Policies/RT_Properties.cpp
+++ b/TAO/tests/Exposed_Policies/RT_Properties.cpp
@@ -30,7 +30,7 @@ RT_Properties::read_from (const char *file_name
 
   ACE_NEW_THROW_EX (rt_properties,
                     RT_Properties,
-                    CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
+                    CORBA::NO_MEMORY (TAO::VMCID,
                                       CORBA::COMPLETED_NO));
 
   // @@ Angelo: what if the length is more than 255?
diff --git a/TAO/tests/File_IO/File_i.cpp b/TAO/tests/File_IO/File_i.cpp
index fd9c97a8d60..c41f1b0d538 100644
--- a/TAO/tests/File_IO/File_i.cpp
+++ b/TAO/tests/File_IO/File_i.cpp
@@ -18,6 +18,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_unistd.h"
+#include "tao/PortableServer/PS_CurrentC.h"
 
 ACE_RCSID(Default_Servant, File_i, "File_i.cpp,v 1.14 2001/03/04 19:27:53 irfan Exp")
 
diff --git a/TAO/tests/InterOp-Naming/InterOp-Naming.mpc b/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
index a840486310d..137da1c00a5 100644
--- a/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
+++ b/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, iortable {
+project(*Server): taoexe, utils, portableserver, iortable {
   Source_Files {
     INS_i.cpp
     Server_i.cpp
diff --git a/TAO/tests/InterOp-Naming/Server_i.h b/TAO/tests/InterOp-Naming/Server_i.h
index 76309d6a212..7df2f070c41 100644
--- a/TAO/tests/InterOp-Naming/Server_i.h
+++ b/TAO/tests/InterOp-Naming/Server_i.h
@@ -19,7 +19,7 @@
 #ifndef SERVER_I_H
 #define SERVER_I_H
 
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 #include "INS_i.h"
diff --git a/TAO/tests/MProfile_Forwarding/Servant_Locator.h b/TAO/tests/MProfile_Forwarding/Servant_Locator.h
index df771c4480a..ac226fda180 100755
--- a/TAO/tests/MProfile_Forwarding/Servant_Locator.h
+++ b/TAO/tests/MProfile_Forwarding/Servant_Locator.h
@@ -21,6 +21,7 @@
 #define _SERVANT_LOCATOR_H_
 
 #include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/ServantLocatorC.h"
 #include "tao/ORB.h"
 
 class Servant_Locator : public PortableServer::ServantLocator
diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
index e0ef7310b31..0669cb84807 100644
--- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
+++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoserver {
+project(*Server): taoserver,utils {
   Source_Files {
     server.cpp
   }
diff --git a/TAO/tests/Multiple_Inheritance/server.cpp b/TAO/tests/Multiple_Inheritance/server.cpp
index d8d5862c1e5..d29978c9163 100644
--- a/TAO/tests/Multiple_Inheritance/server.cpp
+++ b/TAO/tests/Multiple_Inheritance/server.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/Get_Opt.h"
 #include "Multiple_Inheritance_i.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc
index 009c6128f4f..c8a1b7d2075 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Nested Upcall Server): taoexe, portableserver {
+project(*Nested Upcall Server): taoserver, utils {
   Source_Files {
     MT_Object_i.cpp
     server.cpp
   }
 }
 
-project(*Nested Upcall Client): taoexe, portableserver {
+project(*Nested Upcall Client): taoexe, utils, portableserver {
   Source_Files {
     MT_Object_i.cpp
     local_server.cpp
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
index ca435d5b72b..ba1c615cd55 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
@@ -21,6 +21,7 @@
 #include "client.h"
 #include "local_server.h"
 #include "tao/debug.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "ace/Read_Buffer.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_fcntl.h"
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
index 9fd0d1af53a..36e81ffa7c3 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
@@ -22,6 +22,7 @@
 #include "ace/Read_Buffer.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_fcntl.h"
+#include "tao/Utils/ORB_Manager.h"
 
 ACE_RCSID(MT_Client_Test, local_server, "$Id$")
 
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
index 3fa1b452898..7596cb1be20 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
@@ -27,11 +27,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/ORB_Manager.h"
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 #include "ace/Log_Msg.h"
 
+class TAO_ORB_Manager;
+
 class MT_Server
 {
   // = TITLE
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.h b/TAO/tests/NestedUpcall/MT_Client_Test/server.h
index 0ae8e9d6633..8d57cc0d23e 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/server.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.h
@@ -28,7 +28,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Log_Msg.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "MT_Object_i.h"
 
 class MT_Object_Server
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc b/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc
index ab6152fbb8d..7480edb1f1c 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc
+++ b/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc
@@ -1,21 +1,21 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Nested Upcall Server_A): taoexe, portableserver {
+project(*Nested Upcall Server_A): taoexe, utils, portableserver {
   Source_Files {
     Object_A_i.cpp
     server_A.cpp
   }
 }
 
-project(*Nested Upcall Server_B): taoexe, portableserver {
+project(*Nested Upcall Server_B): taoexe, utils, portableserver {
   Source_Files {
     Object_B_i.cpp
     server_B.cpp
   }
 }
 
-project(*Nested Upcall Initiator): taoexe, portableserver {
+project(*Nested Upcall Initiator): taoexe, utils, portableserver {
   Source_Files {
     Initiator_i.cpp
     initiator.cpp
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
index 897729b0d41..137f31e0dc6 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
@@ -28,7 +28,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Log_Msg.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "Initiator_i.h"
 
 class Initiator_Server
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
index 289a0e9970a..842cae01b00 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
@@ -28,7 +28,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Log_Msg.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "Object_A_i.h"
 
 class Object_A_Server
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
index 5e445e3d39e..3661f99bd71 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
@@ -28,7 +28,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Log_Msg.h"
-#include "tao/PortableServer/ORB_Manager.h"
+#include "tao/Utils/ORB_Manager.h"
 #include "Object_B_i.h"
 
 class Object_B_Server
diff --git a/TAO/tests/ORT/ORT.mpc b/TAO/tests/ORT/ORT.mpc
index bce316fb85d..d29f792f22c 100644
--- a/TAO/tests/ORT/ORT.mpc
+++ b/TAO/tests/ORT/ORT.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(Test_ORT_Server): taoexe, portableserver, objreftemplate, iorinterceptor {
+project(Test_ORT_Server): taoserver, objreftemplate, iorinterceptor {
   requires += interceptors
 
   IDL_Files {
@@ -23,7 +23,7 @@ project(Test_ORT_Server): taoexe, portableserver, objreftemplate, iorinterceptor
 }
 
 
-project(Test_ORT_Client): taoexe {
+project(Test_ORT_Client): taoclient {
   requires += interceptors
   after += Test_ORT_Server
 
diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
index c627f27ca49..33ecd4d3399 100644
--- a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
+++ b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp
@@ -68,7 +68,7 @@ ORT_test_IORInterceptor::components_established (
                     ObjectReferenceFactory (old_orf.in ()),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/tests/ORT/ServerORBInitializer.cpp b/TAO/tests/ORT/ServerORBInitializer.cpp
index 49bfb52abb0..1058b2bd9ad 100644
--- a/TAO/tests/ORT/ServerORBInitializer.cpp
+++ b/TAO/tests/ORT/ServerORBInitializer.cpp
@@ -49,7 +49,7 @@ ServerORBInitializer::post_init (
                                               poa_current.in ()),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
@@ -68,7 +68,7 @@ ServerORBInitializer::post_init (
                     ORT_test_IORInterceptor,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/tests/ORT/ServerRequestInterceptor.h b/TAO/tests/ORT/ServerRequestInterceptor.h
index d0575cbd5e4..a501741d104 100644
--- a/TAO/tests/ORT/ServerRequestInterceptor.h
+++ b/TAO/tests/ORT/ServerRequestInterceptor.h
@@ -26,7 +26,8 @@
 #include "tao/LocalObject.h"
 #include "tao/CORBA_String.h"
 
-#include "tao/PortableServer/PortableServerC.h"
+#include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/PS_CurrentC.h"
 
 
 #if defined(_MSC_VER)
diff --git a/TAO/tests/POA/Current/Current.cpp b/TAO/tests/POA/Current/Current.cpp
index cfb3e541f38..d5364eef459 100644
--- a/TAO/tests/POA/Current/Current.cpp
+++ b/TAO/tests/POA/Current/Current.cpp
@@ -19,6 +19,7 @@
 
 #include "tao/ORB.h"
 #include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/PS_CurrentC.h"
 
 #include "ace/Log_Msg.h"
 
diff --git a/TAO/tests/POA/Default_Servant/Default_Servant.cpp b/TAO/tests/POA/Default_Servant/Default_Servant.cpp
index c6a5c9c13e1..3a4eda6a1dd 100644
--- a/TAO/tests/POA/Default_Servant/Default_Servant.cpp
+++ b/TAO/tests/POA/Default_Servant/Default_Servant.cpp
@@ -19,11 +19,102 @@
 
 #include "testS.h"
 #include "ace/SString.h"
+#include "tao/PortableServer/ServantManagerC.h"
 
 class test_i : public POA_test
 {
 };
 
+void
+test_get_servant_manager (PortableServer::POA_ptr poa)
+{
+  bool succeed = false;
+  ACE_TRY_NEW_ENV
+    {
+      // Getting the servant manager should give a wrong policy exception
+      // exception
+      PortableServer::ServantManager_ptr servant_manager =
+        poa->get_servant_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      ACE_UNUSED_ARG (servant_manager);
+    }
+  ACE_CATCH (PortableServer::POA::WrongPolicy, ex)
+    {
+      succeed = true;
+    }
+  ACE_CATCHANY
+    {
+    }
+  ACE_ENDTRY;
+  ACE_CHECK;
+
+  if (!succeed)
+  {
+    ACE_ERROR ((LM_ERROR,
+                "(%t) ERROR, get servant manager failed, should give an exception\n"));
+  }
+}
+
+void
+test_set_servant_manager (PortableServer::POA_ptr poa)
+{
+  bool succeed = false;
+  ACE_TRY_NEW_ENV
+    {
+      // Setting the servant manager should give a wrong policy exception
+      // exception
+      poa->set_servant_manager (PortableServer::ServantManager::_nil() ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCH (PortableServer::POA::WrongPolicy, ex)
+    {
+      succeed = true;
+    }
+  ACE_CATCHANY
+    {
+    }
+  ACE_ENDTRY;
+  ACE_CHECK;
+
+  if (!succeed)
+  {
+    ACE_ERROR ((LM_ERROR,
+                "(%t) ERROR, set servant manager failed, should give an exception\n"));
+  }
+}
+
+void
+test_get_servant_with_no_set (PortableServer::POA_ptr poa)
+{
+  bool succeed = false;
+  ACE_TRY_NEW_ENV
+    {
+      // Getting the default servant without one set whould give a NoServant
+      // exception
+      PortableServer::Servant servant =
+        poa->get_servant (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      ACE_UNUSED_ARG (servant);
+    }
+  ACE_CATCH (PortableServer::POA::NoServant, ex)
+    {
+      succeed = true;
+    }
+  ACE_CATCHANY
+    {
+    }
+  ACE_ENDTRY;
+  ACE_CHECK;
+
+  if (!succeed)
+  {
+    ACE_ERROR ((LM_ERROR,
+                "(%t) ERROR, get servant without one set failed\n"));
+  }
+}
+
 int
 main (int argc, char **argv)
 {
@@ -103,6 +194,12 @@ main (int argc, char **argv)
       // Test servant.
       test_i test;
 
+      (void) test_get_servant_with_no_set (default_servant_poa.in());
+
+      (void) test_get_servant_manager (default_servant_poa.in());
+
+      (void) test_set_servant_manager (default_servant_poa.in());
+
       // Register default servant.
       default_servant_poa->set_servant (&test
                                         ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/tests/POA/Etherealization/Etherealization.cpp b/TAO/tests/POA/Etherealization/Etherealization.cpp
index 032f8d296f4..83cc5e042d1 100644
--- a/TAO/tests/POA/Etherealization/Etherealization.cpp
+++ b/TAO/tests/POA/Etherealization/Etherealization.cpp
@@ -19,6 +19,7 @@
 
 #include "testS.h"
 #include "ace/OS_NS_string.h"
+#include "tao/PortableServer/ServantActivatorC.h"
 
 class test_i : public POA_test
 {
diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
index bbb7bf82c46..b934d5bb05c 100644
--- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
+++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
@@ -20,6 +20,7 @@
 #include "testS.h"
 #include "ace/Task.h"
 #include "ace/Auto_Event.h"
+#include "tao/PortableServer/ServantLocatorC.h"
 
 class test_i : public virtual PortableServer::RefCountServantBase,
                public virtual POA_test
@@ -175,6 +176,72 @@ Servant_Locator::postinvoke (const PortableServer::ObjectId &oid,
               name.in ()));
 }
 
+void
+set_nil_servant_manager (PortableServer::POA_ptr poa)
+{
+  bool succeed = false;
+  ACE_TRY_NEW_ENV
+    {
+      // Setting a nil servant manager should give an OBJ_Adapter exception with
+      // minor code 4
+      poa->set_servant_manager (PortableServer::ServantManager::_nil()
+                                ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCH (CORBA::OBJ_ADAPTER, ex)
+    {
+      if ((ex.minor() & 0xFFFU) == 4)
+        {
+          succeed = true;
+        }
+    }
+  ACE_CATCHANY
+    {
+    }
+  ACE_ENDTRY;
+  ACE_CHECK;
+
+  if (!succeed)
+  {
+    ACE_ERROR ((LM_ERROR,
+                "(%t) ERROR, set nil servant manager failed\n"));
+  }
+}
+
+void
+overwrite_servant_manager (PortableServer::POA_ptr poa)
+{
+  bool succeed = false;
+  ACE_TRY_NEW_ENV
+    {
+      Servant_Locator servant_locator (poa);
+
+      // Setting a servant manager after it is already set should give
+      // obj_adapter with minor code 6
+      poa->set_servant_manager (&servant_locator
+                                ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCH (CORBA::BAD_INV_ORDER, ex)
+    {
+      if ((ex.minor() & 0xFFFU) == 6)
+        {
+          succeed = true;
+        }
+    }
+  ACE_CATCHANY
+    {
+    }
+  ACE_ENDTRY;
+  ACE_CHECK;
+
+  if (!succeed)
+  {
+    ACE_ERROR ((LM_ERROR,
+                "(%t) ERROR, overwrite servant manager failed\n"));
+  }
+}
+
 int
 main (int argc, char **argv)
 {
@@ -232,11 +299,15 @@ main (int argc, char **argv)
                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
+      set_nil_servant_manager (child_poa.in());
+
       Servant_Locator servant_locator (child_poa.in ());
       child_poa->set_servant_manager (&servant_locator
                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
+      overwrite_servant_manager (child_poa.in());
+
       PortableServer::ObjectId_var first_oid =
         PortableServer::string_to_ObjectId ("first");
 
diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
index b002bf8bd81..7fc8aa22d9c 100644
--- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
+++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
@@ -20,6 +20,7 @@
 #include "testS.h"
 #include "ace/Task.h"
 #include "ace/Auto_Event.h"
+#include "tao/PortableServer/ServantActivatorC.h"
 
 class test_i : public virtual PortableServer::RefCountServantBase,
                public virtual POA_test
diff --git a/TAO/tests/POA/Persistent_ID/server.cpp b/TAO/tests/POA/Persistent_ID/server.cpp
index febe4a98a27..b972141b428 100644
--- a/TAO/tests/POA/Persistent_ID/server.cpp
+++ b/TAO/tests/POA/Persistent_ID/server.cpp
@@ -20,6 +20,7 @@
 #include "ace/SString.h"
 #include "testS.h"
 #include "ace/OS_NS_stdio.h"
+#include "tao/PortableServer/PS_CurrentC.h"
 
 ACE_RCSID(Explicit_Activation, server, "$Id$")
 
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc b/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc
index 47ea1f5f7c7..e53fd49cedf 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc
+++ b/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   requires += interceptors
   Source_Files {
     test_i.cpp
@@ -13,7 +13,7 @@ project(*Server): taoexe, portableserver {
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   requires += interceptors
   Source_Files {
     testC.cpp
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/interceptors.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/interceptors.cpp
index 31573b915ec..59850c5388c 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/interceptors.cpp
@@ -417,7 +417,7 @@ Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_lo
   if (CORBA::is_nil (forward_location))
     ACE_THROW (CORBA::INV_OBJREF (
                  CORBA::SystemException::_tao_minor_code (
-                   TAO_DEFAULT_MINOR_CODE,
+                   TAO::VMCID,
                    EINVAL),
                  CORBA::COMPLETED_NO));
   this->forward_location_ = CORBA::Object::_duplicate (forward_location);
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/PI_Dynamic.mpc b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/PI_Dynamic.mpc
index 9527ca701d5..7e113c65d9e 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/PI_Dynamic.mpc
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/PI_Dynamic.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Collocated): taoserver, taoclient {
+project(*Collocated): taoserver {
   exename = Collocated_Test
   requires += interceptors
   Source_Files {
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
index d6f3e94aad9..7e4c72e5f1a 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Collocated): taoserver, taoclient {
+project(*Collocated): taoserver {
   exename = collocated
   requires += interceptors
   Source_Files {
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc b/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc
index 91f3c11320e..91e2df8c2b7 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc
+++ b/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   requires += interceptors
   Source_Files {
     test_i.cpp
@@ -11,7 +11,7 @@ project(*Server): taoexe, portableserver {
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   requires += interceptors
   Source_Files {
     testC.cpp
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
index 3d1032fd8cb..830c28fa9ad 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_ORBInitializer.cpp
@@ -52,7 +52,7 @@ Client_ORBInitializer::post_init (
                                                 forward_str.in ()),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc b/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc
index 135870bd868..6222e910b50 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, valuetype {
+project(*Server): taoserver, valuetype {
   requires += interceptors
   idlflags += -DCORBA3 -I$(TAO_ROOT)
 
@@ -13,7 +13,7 @@ project(*Server): taoexe, portableserver, valuetype {
   }
 }
 
-project(*Client): taoexe, valuetype {
+project(*Client): taoclient, valuetype {
   requires += interceptors
   idlflags += -DCORBA3 -I$(TAO_ROOT)
 
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
index ecf93fc2733..af8304f1cbb 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp
@@ -37,7 +37,7 @@ Server_ORBInitializer::post_init (
                     Server_Request_Interceptor,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
index b042832f064..e1efd474dc8 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp
@@ -31,7 +31,7 @@ Server_Request_Interceptor::forward_references (
   if (CORBA::is_nil (obj1) || CORBA::is_nil (obj2))
     ACE_THROW (CORBA::INV_OBJREF (
                  CORBA::SystemException::_tao_minor_code (
-                   TAO_DEFAULT_MINOR_CODE,
+                   TAO::VMCID,
                    EINVAL),
                  CORBA::COMPLETED_NO));
 
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp
index ff0d4b88567..73d2625fff2 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_Client_ORBInitializer.cpp
@@ -44,7 +44,7 @@ FOO_Client_ORBInitializer::post_init (
                     FOO_ClientRequestInterceptor (codec.in ()),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp
index 2d1319afda2..297ddfd77b4 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor_ORBInitializer.cpp
@@ -45,7 +45,7 @@ FOO_IORInterceptor_ORBInitializer::post_init (
                     FOO_IORInterceptor (codec.in ()),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc b/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
index 5b93fd006af..2ac63846f75 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, iorinterceptor {
+project(*Server): taoserver, iorinterceptor {
   requires += interceptors
 
   Source_Files {
@@ -12,7 +12,7 @@ project(*Server): taoexe, portableserver, iorinterceptor {
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   requires += interceptors
 
   Source_Files {
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc b/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc
index 886f561eeba..f92e8424183 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc
@@ -2,7 +2,7 @@
 //
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   requires += interceptors
 
   Source_Files {
@@ -13,7 +13,7 @@ project(*Server): taoexe, portableserver {
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
 
   Source_Files {
     testC.cpp
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp
index 80a0b64acc8..04262d84180 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_ORBInitializer.cpp
@@ -36,7 +36,7 @@ Server_ORBInitializer::post_init (
                     Server_Request_Interceptor (this->destroy_called_),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp
index 255d5f47832..425c916436e 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientORBInitializer.cpp
@@ -56,7 +56,7 @@ ClientORBInitializer::post_init (
                                               pi_current.in ()),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc b/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc
index 9e00276f728..f2e35ca8300 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc
+++ b/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   requires += interceptors
   Source_Files {
     test_i.cpp
@@ -12,7 +12,7 @@ project(*Server): taoexe, portableserver {
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   requires += interceptors
   Source_Files {
     testC.cpp
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp
index c73c126257f..c2205ee7f2c 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerORBInitializer.cpp
@@ -53,7 +53,7 @@ ServerORBInitializer::post_init (
                                               pi_current.in ()),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
@@ -70,7 +70,7 @@ ServerORBInitializer::post_init (
                     ClientRequestInterceptor2 (::slot_id),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/PI_PolicyFactory.mpc b/TAO/tests/Portable_Interceptors/PolicyFactory/PI_PolicyFactory.mpc
index c2b9f291e3c..e1f7b3b4ca0 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/PI_PolicyFactory.mpc
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/PI_PolicyFactory.mpc
@@ -2,7 +2,7 @@
 //
 // $Id$
 
-project(*Server): taoexe, portableserver, iorinterceptor {
+project(*Server): taoserver, iorinterceptor {
   requires += interceptors
 
   Source_Files {
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp
index 129b787a1a0..e6369e699fa 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Server_ORBInitializer.cpp
@@ -34,7 +34,7 @@ Server_ORBInitializer::post_init (
                     PolicyFactory,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
@@ -51,7 +51,7 @@ Server_ORBInitializer::post_init (
                     IORInterceptor,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp
index 293fa885115..4eac70f7e16 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp
@@ -5,13 +5,12 @@
 #include "tao/ORBInitializer_Registry.h"
 #include "testC.h"
 
-#include "tao/PortableServer/PortableServerC.h"
+#include "tao/PortableServer/PortableServer.h"
 
 ACE_RCSID (PolicyFactory,
            server,
            "$Id$")
 
-
 int
 main (int argc, char *argv[])
 {
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp
index fdce993e65d..ceb1ab95ee1 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_ORBInitializer.cpp
@@ -33,7 +33,7 @@ Client_ORBInitializer::post_init (
                     Client_Request_Interceptor ("CLIENT A"),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
@@ -49,7 +49,7 @@ Client_ORBInitializer::post_init (
                     Client_Request_Interceptor ("CLIENT B"),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
@@ -64,7 +64,7 @@ Client_ORBInitializer::post_init (
                     Client_Request_Interceptor ("CLIENT C"),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc
index 9a8343c0511..100e3851199 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/PI_Request_Interceptor_Flow.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   requires += interceptors
   Source_Files {
     test_i.cpp
@@ -12,7 +12,7 @@ project(*Server): taoexe, portableserver {
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   requires += interceptors
   Source_Files {
     testC.cpp
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp
index 29db8bf4c45..eaf11509671 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_ORBInitializer.cpp
@@ -31,7 +31,7 @@ Server_ORBInitializer::post_init (
                     Server_Request_Interceptor ("SERVER A"),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
@@ -47,7 +47,7 @@ Server_ORBInitializer::post_init (
                     Server_Request_Interceptor ("SERVER B"),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
@@ -62,7 +62,7 @@ Server_ORBInitializer::post_init (
                     Server_Request_Interceptor ("SERVER C"),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
-                        TAO_DEFAULT_MINOR_CODE,
+                        TAO::VMCID,
                         ENOMEM),
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
index 80487f15977..5ce6241d3a0 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/PI_Svc_Context_Manip.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   requires += interceptors
   Source_Files {
     test_i.cpp
@@ -11,7 +11,7 @@ project(*Server): taoexe, portableserver {
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   requires += interceptors
   Source_Files {
     testC.cpp
diff --git a/TAO/tests/QtTests/QtTests.mpc b/TAO/tests/QtTests/QtTests.mpc
index a134df67dd0..ff027308cb8 100644
--- a/TAO/tests/QtTests/QtTests.mpc
+++ b/TAO/tests/QtTests/QtTests.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver, tao_qtresource  {
+project(*server): taoserver, tao_qtresource  {
 
   MOC_Files {
     test_i.h
@@ -14,7 +14,7 @@ project(*server): taoexe, portableserver, tao_qtresource  {
   }
 }
 
-project(*client): taoexe, tao_qtresource {
+project(*client): taoclient, tao_qtresource {
 
   MOC_Files {
     client.h
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.cpp b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
index 686d3f514cf..5ca5342d11e 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
@@ -7,7 +7,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/Policy_Set.h"
 #include "ace/Get_Opt.h"
-#include "tao/PortableServer/POA.h"
+#include "tao/PortableServer/Root_POA.h"
 
 class Test_i : public POA_Test
 {
@@ -93,8 +93,8 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/,
   // Users should never write code like below.
   // It is for testing purposes only! (Unfortunately, there
   // is no standard way to access POA policies).
-  TAO_POA &tao_poa =
-    dynamic_cast<TAO_POA &> (*poa);
+  TAO_Root_POA &tao_poa =
+    dynamic_cast<TAO_Root_POA &> (*poa);
 
   TAO_POA_Policy_Set &policies =
     tao_poa.policies ();
diff --git a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
index e43c39188e2..fa2b412b3f2 100644
--- a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
+++ b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     TestC.cpp
     TestS.cpp
diff --git a/TAO/tests/UNKNOWN_Exception/server.cpp b/TAO/tests/UNKNOWN_Exception/server.cpp
index 393d9291175..4041daf44d0 100644
--- a/TAO/tests/UNKNOWN_Exception/server.cpp
+++ b/TAO/tests/UNKNOWN_Exception/server.cpp
@@ -2,7 +2,7 @@
 
 #include "ace/Get_Opt.h"
 #include "testS.h"
-#include "tao/PortableServer/POA.h"
+#include "tao/PortableServer/Root_POA.h"
 #include "ace/OS_NS_stdio.h"
 
 ACE_RCSID (UNKNOWN_Exception, server, "$Id$")
@@ -231,8 +231,7 @@ main (int argc, char *argv[])
 
       poa_manager->activate ();
 
-      TAO_POA *tao_poa =
-        root_poa->_tao_poa_downcast();
+      TAO_Root_POA *tao_poa = dynamic_cast <TAO_Root_POA*> (root_poa.in ());
 
       while (!done)
         {
diff --git a/bin/MakeProjectCreator/config/imr_client.mpb b/bin/MakeProjectCreator/config/imr_client.mpb
new file mode 100644
index 00000000000..41f5d7eb480
--- /dev/null
+++ b/bin/MakeProjectCreator/config/imr_client.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id$
+
+project : taolib {
+  libs    += TAO_ImR_Client
+  after   += ImR_Client
+}